Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (fc10162c8ca2865271fbcb1e83778e84c29a13f3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (fc10162c8ca2865271fbcb1e83778e84c29a13f3)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (fc10162c8ca2865271fbcb1e83778e84c29a13f3)
  • Date: Tue, 24 Mar 2015 10:57:48 -0500
GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 3
FUNCTIONS | 13 +++
archive/xz-utils/CONFLICTS | 1
archive/xz-utils/HISTORY | 3
audio-libs/ladspa/BUILD | 2
audio-libs/ladspa/HISTORY | 3
audio-soft/meterbridge/HISTORY | 3
audio-soft/meterbridge/PRE_BUILD | 8 +-
audio-soft/sox/DEPENDS | 5 -
audio-soft/sox/DETAILS | 4 -
audio-soft/sox/HISTORY | 5 +
audio-soft/sox/PRE_BUILD | 11 --
audio-soft/sox/ffmpeg-0.11-arch.patch | 129
----------------------------------
crypto/libgcrypt/BUILD | 2
crypto/libgcrypt/HISTORY | 3
crypto/libssh2/DETAILS | 3
crypto/libssh2/HISTORY | 4 +
crypto/openssl/DETAILS | 8 +-
crypto/openssl/HISTORY | 4 +
crypto/p11-kit/DEPENDS | 8 ++
crypto/p11-kit/HISTORY | 6 +
database/virtuoso/DEPENDS | 7 +
database/virtuoso/HISTORY | 3
dev/null |binary
devel/git/DETAILS | 2
devel/git/HISTORY | 6 +
devel/git/INSTALL | 2
graphics-libs/poppler/DEPENDS | 11 ++
graphics-libs/poppler/HISTORY | 3
http/firefox/DETAILS | 6 -
http/firefox/HISTORY | 11 ++
http/firefox/Makefile.in-pgo.patch | 10 --
http/firefox/PRE_BUILD | 5 -
http/firefox/mozconfig | 1
http/seamonkey/DETAILS | 6 -
http/seamonkey/HISTORY | 3
http/webkitgtk3/DEPENDS | 2
http/webkitgtk3/HISTORY | 4 +
kde4/kdelibs4/DEPENDS | 1
kde4/kdelibs4/HISTORY | 3
kde4/kdepimlibs4/DEPENDS | 3
kde4/kdepimlibs4/HISTORY | 3
libs/libxml2/BUILD | 7 -
libs/libxml2/HISTORY | 3
libs/pyqt4/BUILD | 4 -
libs/pyqt4/HISTORY | 7 +
libs/sip/BUILD | 2
libs/sip/HISTORY | 3
net/wicd/DEPENDS | 1
net/wicd/HISTORY | 3
science/qtiplot/DETAILS | 40 +++++-----
science/qtiplot/HISTORY | 4 +
utils/dbus-c++/DETAILS | 15 +--
utils/dbus-c++/HISTORY | 5 +
utils/dbus-c++/PREPARE | 2
utils/dbus-c++/PRE_BUILD | 13 +--
utils/dbus/BUILD | 5 +
utils/dbus/HISTORY | 3
utils/ntp/DETAILS | 3
utils/ntp/HISTORY | 3
utils/strigi/BUILD | 3
utils/strigi/HISTORY | 3
x11-libs/libfakekey/BUILD | 2
x11-libs/libfakekey/HISTORY | 3
x11/slim/DETAILS | 6 -
x11/slim/HISTORY | 3
66 files changed, 230 insertions(+), 233 deletions(-)

New commits:
commit fc10162c8ca2865271fbcb1e83778e84c29a13f3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xz-utils: no conflict with lzip

(cherry picked from commit d555e13711c9f03ed755401c38078d70099002db)

Conflicts:
archive/xz-utils/HISTORY

commit 5a15f073f7abe8729b55644037031670b895b4ac
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libfakekey - fix build

(cherry picked from commit 73f1f7226cb2c6ea242aa0a10bdea8ea0b275c8e)

commit f28f74c8a9549d2152df038a5d878d017b15b115
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

seamonkey: => 2.33.1 [security]

(cherry picked from commit 6c0a7d1d0577888c7eac1e91156407bd79e85d50)

commit 6e1ef6b0c703149bbb4015ec61fe1c9a04f1ccf2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

http/firefox: downgrade sup dependency on nss to 3.17

(cherry picked from commit 6b414a0ca545cecc479d4ad401944222a40ca4fe)

commit 1ede1c828a8e1f5b23c44ceba45bfaf7ec15baee
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

meterbridge: more resolute autotools regeneration, fixing strange erratic
build failures

(cherry picked from commit ad4b98995189ab4f5430d299e1ffd195989bdd7e)

commit bcd76beb277a53fa024a7afbd059c52f89249624
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

http/firefox: version 36.0.4

(cherry picked from commit cffa5b03873240d906fc55389cc20d5f4e0a1f9c)

commit 7d715e254bb47fa2426975d7231b2207af21577b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

git: fixed resurrection

(cherry picked from commit 35bfc8fe201fa20fc0e3673af229061b4add2236)

Conflicts:
devel/git/HISTORY

commit 45fae4b22101abc99cb90a43bb4b263446e9a901
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

qtiplot: Fix SOURCE_URL[0]

(cherry picked from commit d40d32953536ef7ee6f8dbd5d005334ed27b2b45)

commit be9ad9cb196142cdeab75e8943fbf387301bfe5a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

qtiplot: Fix WEB_SITE and trim whitespace

(cherry picked from commit ef4841526c6d01b8e4461b3b1363292e7dc8bf58)

commit a4de8a4ec61c1ab5a8c44de066f8c4506db79cf1
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

virtuoso: enforce libiodbc if python (could that be PYTHON?)

(cherry picked from commit c69d08f64a427dfc967c4460c377b7980b541c2f)

commit 5362dcad4a5b2355d2a63a52374694dac36addc6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

kdepimlibs4: more dependencies

(cherry picked from commit ea63b050bccf120a40552284e5c97d5ae1471e66)

commit 7c985cde0d3a7dab2bfd9593481af70cbbbc7a39
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dbus: reduce attack surface by not picking up glib for tests during build

(cherry picked from commit 075b0ba9b92d0232e0dc2ad36e7245484fbc3316)

commit 44ce84d2a4a18ea808bb37199a3214463a9e2d16
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libxml2: unified $PYTHON

(cherry picked from commit 3cedb81d4e5b4bc0cf8e2a2b9dd7cfef029f6768)

commit 205b31ce0c6023d8942b80cb6ae6840e279342fe
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sip: today

(cherry picked from commit 3ad41e5624f25c907bbeff92ef3bf149fde9c15b)

commit 0f992d1220bf7e0564a1550989dba5ebdefa5dbc
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pyqt4: syntax fix

(cherry picked from commit b3706a713b732e7391c3cd9c20de8924c344a263)

commit 7f2e3e216f2898bf53bf3dcc9857fee9e93faccd
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sip: define $PYTHON to make it build

(cherry picked from commit cbf48d6826e8809b94f2cfcc89fa6390020a28bb)

commit 9845c5fc189ab1d24157f03285c3c6b9d30e1fff
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

net/ntp: remove dead SOURCE_URL

(cherry picked from commit 8c347a699bf892dd5d5910a1b44874528c8c1487)

commit 4e03db8d78b3d4bb9e16602e6d019ba41b8f3ac8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libssh2: => 1.5.0 SECURITY FIX

(cherry picked from commit 620311ae45cc0e4e404eb1b8c5e0ea66295c8b68)

commit 707a733127f5c39ebf4de656e03f62fff5ff29c8
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dbus-c++: switch to released version 0.9.0 (identical to most recent git
head)

(cherry picked from commit c22b07acf954dbbf8d30f0ac2849296ec82b2479)

commit d7756bf2a11d9d4bd7a473697da67a47b81c83a0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pyqt4: fix build

(cherry picked from commit 7079bad5c299fc79615ce68e04a4e3b55bd0acf3)

commit 91229f8d1aee2265d79c62c8ee2c6a89287472af
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

FUNCTIONS: added get_spell_provider_file

(cherry picked from commit d05f2932783549b602c120cfbb3372e3728dc1d7)

Conflicts:
ChangeLog

commit 7a8c27c7c60f241b2a581a972639c77f1b97ee82
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

p11-kit: depends on libffi, too

(cherry picked from commit 62b9d1e35fed545c392e66247be79a0f31bab192)

commit 8a24503ed01f70cd7e13ac88ef771cc7f7b2ec03
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

openssl 0.9.8zf, 1.0.1m, SECURITY_PATCH++

(cherry picked from commit 3957e6307e876d6902f6e3a3f52fe952c8cae0d9)

commit 3c0b7b4647a37091bc3ccaf666a259bcb3e2eeeb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wicd: added missing pytz dependency

(cherry picked from commit 960881ae591903c6f0c413ef1976f9f7077732de)

commit 656711e7218e2c747448b12241310d636ec0260c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

firefox: only disable tests if pgo is not enabled
mozconfig: remove --disable-tests, pgo requires it
Makefile.in-pgo.patch, bug999496_change1f10a8067853.patch: removed, no
longer applies

(cherry picked from commit 50ad1fd98591b9dc5ddead9f5e7d725f69dde833)

Conflicts:
http/firefox/PRE_BUILD

commit 0fab1efc2b4ab3a40a140af474dbfa51b726dfa3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sox: => 14.4.2

(cherry picked from commit 8f58803772f9832b834015f4216c7a3e83446f1b)

commit bc915d92212066297dfff2221453d1a037e58fc7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

slim: updated website & source url; added another mirror

(cherry picked from commit ead4f76ae63bae926b29cef55cf34474f674861a)

commit a4f1d07d071e9d37c8758e74119015e4e1293206
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

kdelibs4: add docbook-xsl depends (complains violently otherwise)

(cherry picked from commit 9350839c62db928d964ea7f6048b5efbd057bb1c)

commit efef854365362449f4d60cc56392d0e28eae82d3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

strigi: disable as-needed

(cherry picked from commit 7eeaa88b709d3788ab7b8f6c4281b9de669ad4c3)

commit 4df14c1e2ec8f075737b8ddbf2fd5446dce01c43
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

p11-kit: needs libtasn1

(cherry picked from commit 24a496c19bb4d0ef287e115977f3e359e4e40fd6)

commit 90f49e52c1aa2ecfbb02eb4af8893444572165af
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libgcrypt: enable static lib

(cherry picked from commit f6925bc06ffe2fd1c54eb0b5d2e1713e23a34103)

commit 1e589fe1f6b814d8ce7618da7a68f4c4145fee37
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ladspa: as-needed exception

(cherry picked from commit 66aec4e11862d1d438347277de0c9bec0ae544b0)

commit 9f156b4e54b9e2ffe1a584b34192abec1f0dca1f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

webkitgtk3: needs harfbuzz with ICU

(cherry picked from commit 6e3ce027e4c5eb36b91b1c61d1944dcd8edfadb8)

commit adafaf2d447db82b80a1c42a1564df823df482fc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

poppler: fixed dependencies

(cherry picked from commit fccb968997cdc1e561b9419739d99208f5e9c99d)

commit 59f227647f246b89418d66bf13b113f60147d3fb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "poppler: gtk+2 -> gtk+3"

This reverts commit 60d1defbb16c0bbcf9d5ef97d615c8d12b5c57b7.

(cherry picked from commit 1b075a515deb2a83e042fd8742cda97c1d37733d)

commit 95a1eb03c7b60e1d401001cde55d91916922cfec
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

poppler: gtk+2 -> gtk+3

(cherry picked from commit 60d1defbb16c0bbcf9d5ef97d615c8d12b5c57b7)

diff --git a/ChangeLog b/ChangeLog
index 3d0dca7..62decc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-03-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * FUNCTIONS: added get_spell_provider_file
+
2015-03-17 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/requests: new spell, Python HTTP for Humans
* volatiles: added fonts.dir/fonts.scale exceptions -- these files
diff --git a/FUNCTIONS b/FUNCTIONS
index eabb067..b991bae 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -727,6 +727,19 @@ if spell_ok $1 &&
fi
}

+#---
+## Find a file matching some pattern(s) as installed by the chosen
+## provider, e.g. /usr/bin/python3 for python3 providing PYTHON.
+## @params $1 - spell at hand
+## @params $2 - provider name (PYTHON)
+## @params $3 - expression for grep
+#---
+function get_spell_provider_file(){
+ gaze install $(get_spell_provider "$1" "$2") \
+ | grep "$3" | sort | head -n 1
+}
+
+
. $GRIMOIRE/glselect.function
. $GRIMOIRE/bzr_download.function
. $GRIMOIRE/hg_download.function
diff --git a/archive/xz-utils/CONFLICTS b/archive/xz-utils/CONFLICTS
index 98f127b..2040ae7 100755
--- a/archive/xz-utils/CONFLICTS
+++ b/archive/xz-utils/CONFLICTS
@@ -1,2 +1 @@
conflicts lzma-utils
-conflicts lzip
diff --git a/archive/xz-utils/HISTORY b/archive/xz-utils/HISTORY
index 3ec8226..4dcefb2 100644
--- a/archive/xz-utils/HISTORY
+++ b/archive/xz-utils/HISTORY
@@ -1,3 +1,6 @@
+2015-03-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: There is no conflict with lzip.
+
2014-12-22 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 5.2.0

diff --git a/audio-libs/ladspa/BUILD b/audio-libs/ladspa/BUILD
index 454495e..db3fcb6 100755
--- a/audio-libs/ladspa/BUILD
+++ b/audio-libs/ladspa/BUILD
@@ -1,6 +1,6 @@
if [ "$LADSPA_SDK" == "y" ]; then
cd $SOURCE_DIRECTORY/src &&
- make CFLAGS="\$(INCLUDES) $CFLAGS"
+ make CFLAGS="\$(INCLUDES) $CFLAGS" LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
else
true
fi
diff --git a/audio-libs/ladspa/HISTORY b/audio-libs/ladspa/HISTORY
index 8dd7f41..f0a995f 100644
--- a/audio-libs/ladspa/HISTORY
+++ b/audio-libs/ladspa/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: -Wl,--no-as-needed since filter misses libm otherwise
+
2012-09-22 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: added, to apply patch.
* ladspa-1.13-properbuild.patch: added, to apply proper
diff --git a/audio-soft/meterbridge/HISTORY b/audio-soft/meterbridge/HISTORY
index 8b04fb8..20ac8b6 100644
--- a/audio-soft/meterbridge/HISTORY
+++ b/audio-soft/meterbridge/HISTORY
@@ -1,3 +1,6 @@
+2015-03-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: use autoreconf -if, fixing erratic failures
+
2014-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, PRE_BUILD: run autoconf and friends to fix linker error
* binutils_gold.patch, PRE_BUILD: fix linker error
diff --git a/audio-soft/meterbridge/PRE_BUILD
b/audio-soft/meterbridge/PRE_BUILD
index 52337c1..686809e 100755
--- a/audio-soft/meterbridge/PRE_BUILD
+++ b/audio-soft/meterbridge/PRE_BUILD
@@ -5,6 +5,8 @@ patch -p1 < $SPELL_DIRECTORY/main.h.patch &&
patch -p1 < $SPELL_DIRECTORY/binutils_gold.patch &&
patch -p1 < $SPELL_DIRECTORY/meterbridge_0.9.2_iec_fix.patch &&

-autoconf -f &&
-aclocal --force &&
-automake -f --add-missing
+#Magically seems to fix strange erratic build errors (indicated
+# by missing run of
+# ./config.status --recheck
+# in configure and subsequent failure to find .deps/*.Po files).
+autoreconf -if
diff --git a/audio-soft/sox/DEPENDS b/audio-soft/sox/DEPENDS
index 1307a05..6f80f52 100755
--- a/audio-soft/sox/DEPENDS
+++ b/audio-soft/sox/DEPENDS
@@ -33,11 +33,6 @@ optional_depends flac \
"--without-flac" \
"for FLAC usage" &&

-optional_depends LIBAVCODEC \
- "--with-ffmpeg" \
- "--without-ffmpeg" \
- "for ffmpeg usage" &&
-
optional_depends libmad \
"--with-mad" \
"--without-mad" \
diff --git a/audio-soft/sox/DETAILS b/audio-soft/sox/DETAILS
index c9df8b2..00941d6 100755
--- a/audio-soft/sox/DETAILS
+++ b/audio-soft/sox/DETAILS
@@ -1,9 +1,9 @@
SPELL=sox
- VERSION=14.4.1
+ VERSION=14.4.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://downloads.sourceforge.net/project/sox/sox/$VERSION/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
WEB_SITE=http://sox.sourceforge.net/
ENTERED=20010922
LICENSE[0]=LGPL
diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY
index c56965f..ca0e101 100644
--- a/audio-soft/sox/HISTORY
+++ b/audio-soft/sox/HISTORY
@@ -1,3 +1,8 @@
+2015-03-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 14.4.2; gpg -> sha512
+ * DEPENDS: removed deprecated ffmpeg optional dependency
+ * PRE_BUILD: removed obsolete patching
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: add a define missing from current ffmpeg

diff --git a/audio-soft/sox/PRE_BUILD b/audio-soft/sox/PRE_BUILD
index 6784dae..555ee8b 100755
--- a/audio-soft/sox/PRE_BUILD
+++ b/audio-soft/sox/PRE_BUILD
@@ -3,13 +3,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch" &&
-
-if spell_ok ffmpeg && is_version_less 0.10 $(installed_version ffmpeg); then
- patch -p1 < "${SPELL_DIRECTORY}/ffmpeg-0.11-arch.patch"
-fi
-# New ffmpeg misses that define for some reason.
-echo "#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-#endif" >> src/ffmpeg.h
-
+patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch"
diff --git a/audio-soft/sox/ffmpeg-0.11-arch.patch
b/audio-soft/sox/ffmpeg-0.11-arch.patch
deleted file mode 100644
index acefce6..0000000
--- a/audio-soft/sox/ffmpeg-0.11-arch.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure
---- sox-14.4.0-orig/configure 2012-06-12 00:35:53.462360803 -0400
-+++ sox-14.4.0/configure 2012-06-12 00:36:08.572361294 -0400
-@@ -15781,9 +15781,9 @@
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file
in -lavformat" >&5
--$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }
--if ${ac_cv_lib_avformat_av_open_input_file+:} false; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input
in -lavformat" >&5
-+$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; }
-+if ${ac_cv_lib_avformat_avformat_open_input+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -15797,27 +15797,27 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char av_open_input_file ();
-+char avformat_open_input ();
- int
- main ()
- {
--return av_open_input_file ();
-+return avformat_open_input ();
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_avformat_av_open_input_file=yes
-+ ac_cv_lib_avformat_avformat_open_input=yes
- else
-- ac_cv_lib_avformat_av_open_input_file=no
-+ ac_cv_lib_avformat_avformat_open_input=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_avformat_av_open_input_file" >&5
--$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; }
--if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_avformat_avformat_open_input" >&5
-+$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; }
-+if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then :
- for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c
---- sox-14.4.0-orig/src/ffmpeg.c 2012-06-12 00:35:53.459027469 -0400
-+++ sox-14.4.0/src/ffmpeg.c 2012-06-12 00:36:26.539028545 -0400
-@@ -93,7 +93,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- enc->error_resilience = 1;
- #else
-- enc->error_recognition = 1;
-+ enc->err_recognition = 1;
- #endif
-
- if (!codec || avcodec_open(enc, codec) < 0)
-@@ -157,7 +157,7 @@
- static int startread(sox_format_t * ft)
- {
- priv_t * ffmpeg = (priv_t *)ft->priv;
-- AVFormatParameters params;
-+ AVDictionary *params;
- int ret;
- int i;
-
-@@ -172,7 +172,7 @@
-
- /* Open file and get format */
- memset(&params, 0, sizeof(params));
-- if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0,
&params)) < 0) {
-+ if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL,
&params)) < 0) {
- lsx_fail("ffmpeg cannot open file for reading: %s (code %d)",
ft->filename, ret);
- return SOX_EOF;
- }
-@@ -231,7 +231,7 @@
- /* If input buffer empty, read more data */
- if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) {
- if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 &&
-- (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb)))
-+ (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error))
- break;
- ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg,
ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE);
- ffmpeg->audio_buf_index = 0;
-@@ -373,13 +373,6 @@
- return SOX_EOF;
- }
-
-- /* set the output parameters (must be done even if no
-- parameters). */
-- if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) {
-- lsx_fail("ffmpeg invalid output format parameters");
-- return SOX_EOF;
-- }
--
- /* Next line for debugging */
- /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */
-
-@@ -391,14 +384,14 @@
-
- /* open the output file, if needed */
- if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
-- if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) {
-+ if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) {
- lsx_fail("ffmpeg could not open `%s'", ft->filename);
- return SOX_EOF;
- }
- }
-
- /* write the stream header, if any */
-- av_write_header(ffmpeg->ctxt);
-+ avformat_write_header(ffmpeg->ctxt, NULL);
-
- return SOX_SUCCESS;
- }
-@@ -478,7 +471,7 @@
- #if (LIBAVFORMAT_VERSION_INT < 0x340000)
- url_fclose(&ffmpeg->ctxt->pb);
- #else
-- url_fclose(ffmpeg->ctxt->pb);
-+ avio_close(ffmpeg->ctxt->pb);
- #endif
- }
diff --git a/audio-soft/sox/sox-14.4.1.tar.gz.sig
b/audio-soft/sox/sox-14.4.1.tar.gz.sig
deleted file mode 100644
index 78825a8..0000000
Binary files a/audio-soft/sox/sox-14.4.1.tar.gz.sig and /dev/null differ
diff --git a/crypto/libgcrypt/BUILD b/crypto/libgcrypt/BUILD
index a178854..0398d32 100755
--- a/crypto/libgcrypt/BUILD
+++ b/crypto/libgcrypt/BUILD
@@ -1,4 +1,6 @@
#
# Disable -O compiler flags; see HISTORY entry from 2008-01-07
#
+# cryptsetup wants the static lib
+OPTS="$OPTS --enable-static" &&
CFLAGS="${CFLAGS//-O?/}" default_build
diff --git a/crypto/libgcrypt/HISTORY b/crypto/libgcrypt/HISTORY
index 76de4c9..2df841c 100644
--- a/crypto/libgcrypt/HISTORY
+++ b/crypto/libgcrypt/HISTORY
@@ -2,6 +2,9 @@
* DETAILS: updated spell to 1.6.3; SECURITY_PATCH++ (CVE-2014-3591,
CVE-2015-0837); added missing key identifier

+2014-08-31 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: enable static lib (cryptsetup-luks needs it)
+
2014-08-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.2

diff --git a/crypto/libssh2/DETAILS b/crypto/libssh2/DETAILS
index aba7133..a0c9d6b 100755
--- a/crypto/libssh2/DETAILS
+++ b/crypto/libssh2/DETAILS
@@ -1,5 +1,6 @@
SPELL=libssh2
- VERSION=1.4.3
+ VERSION=1.5.0
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/crypto/libssh2/HISTORY b/crypto/libssh2/HISTORY
index 08bd800..21c5cab 100644
--- a/crypto/libssh2/HISTORY
+++ b/crypto/libssh2/HISTORY
@@ -1,3 +1,7 @@
+2015-03-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.0
+ SECURITY_PATCH=1, fixes CVE-2015-1782
+
2014-08-23 Ismael Luceno <ismael AT sourcemage.org>
* CONFIGURE, DEPENDS: Allow the use of libressl

diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index fcb79b5..278833f 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi

case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8ze
- SECURITY_PATCH=24
+ VERSION=0.9.8zf
+ SECURITY_PATCH=25
;;
1.0)
- VERSION=1.0.1l
- SECURITY_PATCH=26
+ VERSION=1.0.1m
+ SECURITY_PATCH=27
;;
esac

diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 1e19e22..b652fed 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2015-03-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.8zf, 1.0.1m, SECURITY_PATCH++
+ https://www.openssl.org/news/secadv_20150319.txt
+
2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
* PROVIDES: changed mode to 755
* PREPARE: move triggering to UP_TRIGGERS
diff --git a/crypto/p11-kit/DEPENDS b/crypto/p11-kit/DEPENDS
new file mode 100755
index 0000000..bba423f
--- /dev/null
+++ b/crypto/p11-kit/DEPENDS
@@ -0,0 +1,8 @@
+# Not strictly necessary, but important enough that the configure script
+# by default aborts unless dependency forcibly disabled. I'm not testing
+# the disabled case. -- ThOr
+depends libtasn1 &&
+optional_depends libffi \
+ "--with-ffi" \
+ "--without-ffi" \
+ "to build closures"
diff --git a/crypto/p11-kit/HISTORY b/crypto/p11-kit/HISTORY
index 36fbe16..3ff8ffb 100644
--- a/crypto/p11-kit/HISTORY
+++ b/crypto/p11-kit/HISTORY
@@ -1,3 +1,9 @@
+2015-03-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: libffi
+
+2014-10-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: libtasn1
+
2014-07-12 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.20.3

diff --git a/database/virtuoso/DEPENDS b/database/virtuoso/DEPENDS
index 75d6a00..6c11765 100755
--- a/database/virtuoso/DEPENDS
+++ b/database/virtuoso/DEPENDS
@@ -10,7 +10,12 @@ optional_depends php '--enable-php5'
'--disable-php5' 'PHP
optional_depends imagemagick '--enable-imagemagick' '--disable-imagemagick'
'ImageMagick support' &&
optional_depends python '--enable-python' '--disable-python'
'Python support' &&
optional_depends RUBY '--enable-ruby' '--disable-ruby'
'Ruby support' &&
-optional_depends libiodbc '--with-iodbc=/usr' '--without-iodbc'
'IOdbc connector' &&
+if is_depends_enabled $SPELL python; then
+ message "${MESSAGE_COLOR}Enforcing libiodbc dependency due to python
dependency.${DEFAULT_COLOR}" &&
+ depends libiodbc
+else
+ optional_depends libiodbc '--with-iodbc=/usr' '--without-iodbc'
'IOdbc connector'
+fi &&
optional_depends zlib '--without-internal-zlib'
'--with-internal-zlib' 'System zlib' &&
optional_depends JDK "--with-jdk4=$INSTALL_ROOT/usr/lib/j2sdk"
'--without-jdk4' 'Java support' &&
optional_depends readline '--with-readline' '--without-readline'
'line editing' &&
diff --git a/database/virtuoso/HISTORY b/database/virtuoso/HISTORY
index 82fbb91..e708ba4 100644
--- a/database/virtuoso/HISTORY
+++ b/database/virtuoso/HISTORY
@@ -1,3 +1,6 @@
+2015-03-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: enforce libiodbc if python
+
2015-01-06 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: SSL and libxml2 are hard optional

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index c5ca480..f9a4af7 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -2,6 +2,7 @@
VERSION=2.3.0

SOURCE_HASH=sha512:4be85d3ba3ffac6c55cce648ab6c0a6fe89164e9657480aeee0def79289dbcba486722756b1729d0cedda6012cd582b88129d483ce916bfe06cde5a423f05bc7
SECURITY_PATCH=2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
@@ -29,7 +30,6 @@ fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
WEB_SITE=http://git-scm.com/
- STAGED_INSTALL=off
KEYWORDS="scm devel"
ENTERED=20050506
SHORT="SCM used by the kernel developers"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 1bfe4e7..5363759 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,7 @@
+2015-03-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: re-enabled staged install; PATCHLEVEL=1
+ * INSTALL: do not use hardlinks -- fixes resurrection process
+
2015-02-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 2.3.0

@@ -14,7 +18,7 @@
2014-11-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1;3

-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

2014-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
diff --git a/devel/git/INSTALL b/devel/git/INSTALL
index a5f928f..2e5df5e 100755
--- a/devel/git/INSTALL
+++ b/devel/git/INSTALL
@@ -14,7 +14,7 @@ function git_install_htmldocs() {
install -vm 644 howto/* $GIT_HTML/howto
}

-default_install &&
+make NO_INSTALL_HARDLINKS=1 install &&

case $GIT_DOC in
manpages)
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 5111668..de31f0c 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -36,11 +36,20 @@ optional_depends zlib \
"--disable-zlib" \
"for compressed file support" &&

-optional_depends gtk+2 \
+optional_depends glib2 \
"--enable-poppler-glib" \
"--disable-poppler-glib" \
"for glib wrapper" &&

+if is_depends_enabled $SPELL glib2; then
+ optional_depends gtk+3 \
+ "--enable-gtk-test" \
+ "--disable-gtk-test" \
+ "to compile GTK+ test program"
+else
+ list_add "POPPLER_OPTS" "--disable-gtk-test"
+fi &&
+
optional_depends gobject-introspection \
"--enable-introspection" \
"--disable-introspection" \
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index ec809ef..63a5e1c 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2015-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: corrected glib2/gtk+3 dependencies
+
2014-10-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.26.5

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 6892cfd..2e18d49 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,11 +1,11 @@
SPELL=firefox
- VERSION=36.0.1
+ VERSION=36.0.4
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:163cb97cd126c3a3da7197c74f3f1409ef77d2ceb799f5c02b431cfa99b474645825e4794450be86c5b584a9c869663a55a1355ca0243f9264327b6709abb5ed
+
SOURCE_HASH=sha512:3539f1f609318bb7000d8f15d5309064523d838ec894865cfd5aedc7fe6a9695a3d68f33e58c1a559ed8cf8b024bb2f7ced84b640c8a89ad0751d925136a2443

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
- SECURITY_PATCH=80
+ SECURITY_PATCH=81
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index d737694..2efe9b8 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,14 @@
+2015-03-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: downgrade sub dependency on nss to 3.17
+
+2015-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 36.0.4, SECURITY_PATCH++
+
+2015-03-19 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: only disable tests if pgo is not enabled
+ * mozconfig: remove --disable-tests, pgo requires it
+ * Makefile.in-pgo.patch, bug999496_change1f10a8067853.patch: removed,
no longer applies
+
2015-03-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 36.0.1, SECURITY_PATCH++
* BUILD: yet another fix of LDFLAGS
diff --git a/http/firefox/Makefile.in-pgo.patch
b/http/firefox/Makefile.in-pgo.patch
deleted file mode 100644
index 3679dd9..0000000
--- a/http/firefox/Makefile.in-pgo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.old 2014-01-27 08:45:10.795890277 +1300
-+++ Makefile.in 2014-01-27 08:51:22.170242862 +1300
-@@ -205,3 +205,7 @@
- $(call SUBMAKE,$@,js/src)
- endif
- endif
-+
-+
-+pgo-profile-run:
-+ $(PYTHON) $(topsrcdir)/build/pgo/profileserver.py $(EXTRA_TEST_ARGS)
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index db7ca75..4c4555a 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -25,6 +25,7 @@ if [[ $FIREFOX_OFFICIAL == y ]]; then
fi &&

if [[ $FIREFOX_PGO == y ]]; then
- echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON)
\$(OBJDIR)/_profile/pgo/profileserver.py'" >> .mozconfig &&
- patch -p0 < ${SPELL_DIRECTORY}/Makefile.in-pgo.patch
+ echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON)
\$(OBJDIR)/_profile/pgo/profileserver.py'" >> .mozconfig
+else
+ echo "ac_add_options --disable-tests" >> .mozconfig
fi
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
index 2fea2e9..a9929e4 100644
--- a/http/firefox/mozconfig
+++ b/http/firefox/mozconfig
@@ -13,7 +13,6 @@ ac_add_options --with-pthreads
ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-crashreporter
-ac_add_options --disable-tests
ac_add_options --prefix=$INSTALL_ROOT/usr
ac_add_options --mandir=$INSTALL_ROOT/usr
ac_add_options --enable-optimize="$CFLAGS -fno-fast-math"
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index ed87b16..01dda20 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,11 +1,11 @@
SPELL=seamonkey
- VERSION=2.33
- SECURITY_PATCH=61
+ VERSION=2.33.1
+ SECURITY_PATCH=62
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE_URL[1]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
-
SOURCE_HASH=sha512:1c3e37468dd02f1f85e4605b0c429b466043172adabadd95789d85f8799992e26acb962a43b01b98e2e52c710bfb8f78b5b163cf1a8c6e7d844e9d00587c032b
+
SOURCE_HASH=sha512:2fcd2833c140504a176da145b3fd519a22135c273ce8ea87d39e45a6255533e59dccb24367e3fc9b0575cfc7a7fe2b777296a067edafc83a3397d6916d9e3803
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.seamonkey-project.org/
TMPFS=off
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 3a717f2..be4b6d3 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,6 @@
+2015-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.33.1; SECURITY_PATCH++
+
2015-03-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.33; SECURITY_PATCH++
* DEPENDS: updated requirements -- nss (>=3.17.4), sqlite (>=3.8.7.4)
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index eddaa40..77dc876 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -16,7 +16,7 @@ depends MESALIB &&
depends glib2 &&
depends fontconfig &&
depends freetype2 &&
-depends harfbuzz &&
+depends -sub ICU harfbuzz &&
depends cairo &&
depends pango &&
depends gtk+3 -DPORT=GTK &&
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 217c02f..67067a4 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,6 +1,10 @@
2014-10-23 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 2.6.2

+2014-10-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: tarball version 2.5.1a, the non-a vanished
+ * DEPENDS: sub on harfbuzz with ICU
+
2014-10-07 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 2.6.0

diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index c005d77..9bcb215 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -17,6 +17,7 @@ depends perl &&
depends libpng &&
depends libxml2 &&
depends libxslt &&
+depends docbook-xsl &&
depends GIFLIB &&
depends JPEG &&
depends attica &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 4cc0f64..44c7d3d 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,6 @@
+2015-03-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: docbook-xsl
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL
* SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
diff --git a/kde4/kdepimlibs4/DEPENDS b/kde4/kdepimlibs4/DEPENDS
index 6e5f263..a9f83bc 100755
--- a/kde4/kdepimlibs4/DEPENDS
+++ b/kde4/kdepimlibs4/DEPENDS
@@ -8,5 +8,6 @@ depends shared-mime-info &&
depends shared-desktop-ontologies &&
depends soprano &&
depends libxslt &&
-
+depends nepomuk-core &&
+depends qjson &&
optional_depends openldap '' '' 'for LDAP functionality'
diff --git a/kde4/kdepimlibs4/HISTORY b/kde4/kdepimlibs4/HISTORY
index 56cd73c..92ffc9c 100644
--- a/kde4/kdepimlibs4/HISTORY
+++ b/kde4/kdepimlibs4/HISTORY
@@ -1,3 +1,6 @@
+2015-03-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: Yay, more dependencies (nepomuk-core, qjson)!
+
2013-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.10.5

diff --git a/libs/libxml2/BUILD b/libs/libxml2/BUILD
index 10eb6b8..cc05257 100755
--- a/libs/libxml2/BUILD
+++ b/libs/libxml2/BUILD
@@ -1,7 +1,2 @@
-if is_depends_enabled $SPELL python3;then
- export PYTHON=/usr/bin/python3
-fi &&
-if is_depends_enabled $SPELL python;then
- export PYTHON=/usr/bin/python2.7
-fi &&
+export PYTHON=$(get_spell_provider_file $SPELL PYTHON
'/usr/bin/python[0-9\.]*$') &&
default_build
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index d0a1e12..3a8499a 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,6 @@
+2015-03-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: unified $PYTHON selection
+
2013-07-25 Treeve Jelbert <treeve AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS: adjust to python3
* BUILD: added, fix detection of python3
diff --git a/libs/pyqt4/BUILD b/libs/pyqt4/BUILD
index 23a40ec..93d5954 100755
--- a/libs/pyqt4/BUILD
+++ b/libs/pyqt4/BUILD
@@ -3,5 +3,7 @@ if [ $PYQT_BIG == y ];then
fi &&
export QTDIR=/usr &&
PATH=$QTDIR/bin/qt4:$PATH &&
-$PYTHON ./configure.py --confirm-license $VBIG -j $MAKE_NJOBS &&
+# Need to use the proper selected python.
+PYTHON=$(get_spell_provider_file $SPELL PYTHON '/usr/bin/python[0-9\.]*$') &&
+$PYTHON ./configure-ng.py --confirm-license $VBIG -j $MAKE_NJOBS &&
make
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index d65b654..eceed90 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,10 @@
+2015-03-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: missing &&
+
+2015-03-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: actually look for the correct python, use correct
+ build script
+
2014-03-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.10.4

diff --git a/libs/sip/BUILD b/libs/sip/BUILD
index a1db27a..1154ebb 100755
--- a/libs/sip/BUILD
+++ b/libs/sip/BUILD
@@ -1,3 +1,5 @@
sed -i "s/-O2//" specs/linux-g++ &&
+# Need to use the proper selected python.
+PYTHON=$(get_spell_provider_file $SPELL PYTHON '/usr/bin/python[0-9\.]*$') &&
$PYTHON ./configure.py CFLAGS_EXCEPTIONS_OFF=1 &&
make
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index eb9b2c9..8e53e35 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2015-03-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix build by defining $PYHTON
+
2014-12-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.16.5

diff --git a/net/wicd/DEPENDS b/net/wicd/DEPENDS
index 02f9b06..53d68e0 100755
--- a/net/wicd/DEPENDS
+++ b/net/wicd/DEPENDS
@@ -3,6 +3,7 @@ depends dbus &&
depends dbus-python &&
depends babel &&
depends gettext &&
+depends pytz &&

optional_depends pygtk2 \
"" "--no-install-gtk" \
diff --git a/net/wicd/HISTORY b/net/wicd/HISTORY
index 17005ae..070becc 100644
--- a/net/wicd/HISTORY
+++ b/net/wicd/HISTORY
@@ -1,3 +1,6 @@
+2015-03-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing pytz dependency
+
2012-07-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: added, to apply the patch
diff --git a/science/qtiplot/DETAILS b/science/qtiplot/DETAILS
index 23f2f49..e91a3fb 100755
--- a/science/qtiplot/DETAILS
+++ b/science/qtiplot/DETAILS
@@ -1,10 +1,10 @@
SPELL=qtiplot
VERSION=0.9.8.9

SOURCE_HASH=sha512:3a0cb7b49c508f56228e8e3a259b4fd34c872410ad14ef1d8656372e3e8ab9f92e59094a9cc1a75680099a8832f7472ad31462b3ae8a9e132ac7056d5245cf2a
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_URL[0]=http://soft.proindependent.com/src/${SOURCE}
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://soft.proindependent.com/qtiplot.html "
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+
SOURCE_URL[0]="http://downloads.sourceforge.net/project/$SPELL.berlios/$SOURCE";
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="http://www.qtiplot.com";
LICENSE[0]=GPL
ENTERED=20070421
SHORT="A clone of Origin for data analysis and scientific
plotting."
@@ -16,26 +16,26 @@ is not free, of course. The purpose of this project is to
develop a free
far from this goal, but there's a "wish to" list we are constantly working
on. All suggestions and contributions are most welcome!

-Features:
-* 3D Plots
+Features:
+* 3D Plots
* Publication quality 2D plots: Error Bars, Multilayer
- Plots, Bar Plots, Pie Plots, Vector Plots, Contour and Image Plots
-* Statistical Plots: Box/Whiskers Diagramms, Histograms
-* Easy export of plots to vector formats (EPS, PS, PDF) and to other various
- image formats (BMP, JPG, PNG, TIFF etc ...)
-* Powerful and versatile spreadsheets and calculations in column-logic
-* Easy ASCII-Import/Export of single or multiple files
+ Plots, Bar Plots, Pie Plots, Vector Plots, Contour and Image Plots
+* Statistical Plots: Box/Whiskers Diagramms, Histograms
+* Easy export of plots to vector formats (EPS, PS, PDF) and to other various
+ image formats (BMP, JPG, PNG, TIFF etc ...)
+* Powerful and versatile spreadsheets and calculations in column-logic
+* Easy ASCII-Import/Export of single or multiple files
* Linear and non-linear curve fitting with weighting and estimation of
statistical errors of the fit-parameters, using Levenberg-Marquardt
- Least-Squares Algorithm or Nelder-Mead simplex minimization algorithm.
-* Multi-peak fitting with Gaussian and Lorentzian peak profiles
-* Data analysis: statistics, sorting, FFT, data smoothing (Savitzky-Golay,
- FFT smoothing, and moving window average), data filtering (low/high/band
pass
- and band block filters), convolution/deconvolution, correlation,
- interpolation, numerical integration/differentiation, etc...
-* Matrices optimized for 3D plotting
+ Least-Squares Algorithm or Nelder-Mead simplex minimization algorithm.
+* Multi-peak fitting with Gaussian and Lorentzian peak profiles
+* Data analysis: statistics, sorting, FFT, data smoothing (Savitzky-Golay,
+ FFT smoothing, and moving window average), data filtering (low/high/band
pass
+ and band block filters), convolution/deconvolution, correlation,
+ interpolation, numerical integration/differentiation, etc...
+* Matrices optimized for 3D plotting
* Templates support: all the settings for plots (2D/3D), tables and matrixes
can
- be saved to ASCII files and restored later on for a fast editing process
+ be saved to ASCII files and restored later on for a fast editing process
* Project files based on folders, a powerful project explorer with extensive
built-in features: drag and drop, searching facilities, etc...
EOF
diff --git a/science/qtiplot/HISTORY b/science/qtiplot/HISTORY
index 814bbad..d016dcb 100644
--- a/science/qtiplot/HISTORY
+++ b/science/qtiplot/HISTORY
@@ -1,3 +1,7 @@
+2015-03-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed WEB_SITE and trim whitespace
+ * DETAILS: Fixed SOURCE_URL[0]
+
2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.8.9
* BUILD: use qt4_build
diff --git a/utils/dbus-c++/DETAILS b/utils/dbus-c++/DETAILS
index dee703e..51640a0 100755
--- a/utils/dbus-c++/DETAILS
+++ b/utils/dbus-c++/DETAILS
@@ -1,13 +1,10 @@
-. "$GRIMOIRE/FUNCTIONS"
SPELL=dbus-c++
- VERSION=$(get_scm_version)
- SOURCE=$SPELL-git.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
- SOURCE_URL[0]=git://gitorious.org/dbus-cplusplus/mainline.git
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=1
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-
WEB_SITE=http://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page
+ VERSION=0.9.0
+ SOURCE=lib$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/lib$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/dbus-cplusplus/$SOURCE
+
SOURCE_HASH=sha512:7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319
+ WEB_SITE=http://dbus-cplusplus.sourceforge.net/
ENTERED=20100702
LICENSE[0]=GPL
KEYWORDS="utils"
diff --git a/utils/dbus-c++/HISTORY b/utils/dbus-c++/HISTORY
index e687104..fcef747 100644
--- a/utils/dbus-c++/HISTORY
+++ b/utils/dbus-c++/HISTORY
@@ -1,3 +1,8 @@
+2015-03-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: switch to release 0.9.0 (identical to current git head)
+ * PRE_BUILD: cleanup and clarification
+ * PREPARE: removed
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* unistd.patch, PRE_BUILD: gimme standard headers, proper bootstrap

diff --git a/utils/dbus-c++/PREPARE b/utils/dbus-c++/PREPARE
deleted file mode 100755
index 86a5079..0000000
--- a/utils/dbus-c++/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-prepare_select_branch
diff --git a/utils/dbus-c++/PRE_BUILD b/utils/dbus-c++/PRE_BUILD
index 74f9121..d4274ed 100755
--- a/utils/dbus-c++/PRE_BUILD
+++ b/utils/dbus-c++/PRE_BUILD
@@ -1,10 +1,7 @@
default_pre_build &&
-
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SPELL_DIRECTORY/configure.patch &&
-patch -p1 < $SPELL_DIRECTORY/unistd.patch &&
-
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SCRIPT_DIRECTORY/unistd.patch"
+patch -p1 < "$SCRIPT_DIRECTORY/configure.patch"
+# This is needed to fix up libtool stuff, too!
+# Otherwise we'd get linking errors with as-needed (missing -lexpat, p.ex.).
./bootstrap
-
-
diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD
index 8e356ac..5210a48 100755
--- a/utils/dbus/BUILD
+++ b/utils/dbus/BUILD
@@ -5,6 +5,11 @@ fi &&
if [ "$DBUS_SELINUX" == "y" ]; then
OPTS="--enable-selinux $OPTS"
fi &&
+# Glib2 is used for regression tests and can cause unnecessary build failure
+# when we're in a chain where libffi just has been updated and glib2 not yet.
+# Other solution would be to unnecessarily depend on glib2, or even
+# dbus-glib, which just smells too circular.
+OPTS="--without-dbus-glib --disable-modular-tests $OPTS" &&

create_account messagebus &&
default_build &&
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 84184fc..543f9d0 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2015-03-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: avoid picking up of glib2 for tests
+
2015-02-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.16, SECURITY_PATCH=15

diff --git a/utils/ntp/DETAILS b/utils/ntp/DETAILS
index 95d47a5..308e7ba 100755
--- a/utils/ntp/DETAILS
+++ b/utils/ntp/DETAILS
@@ -3,8 +3,7 @@
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.udel.edu/pub/ntp/ntp4/$SOURCE
-
SOURCE_URL[1]=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$SOURCE
+
SOURCE_URL[0]=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$SOURCE

SOURCE_HASH="sha512:4075260dc8817c5b1ed04ec8a60316f938b2c188d95419eb1c3808a5b2854c91d40c62f36b8d3be30ea40cc92415e1b7326a9362a4c61c53c33abcca781b3f4f"
WEB_SITE=http://www.ntp.org/
ENTERED=20011004
diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index 7095ef0..5f89502 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,6 @@
+2015-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: remove dead SOURCE_URL
+
2015-03-14 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: bump to 4.2.8p1, fixing multiple security issues
(see https://ics-cert.us-cert.gov/advisories/ICSA-14-353-01C),
diff --git a/utils/strigi/BUILD b/utils/strigi/BUILD
index afb5930..2d8d96b 100755
--- a/utils/strigi/BUILD
+++ b/utils/strigi/BUILD
@@ -1,3 +1,6 @@
+# Build is broken with as-needed, as of version 0.7.8.
+# Patches floating around don't fix all issues we encounter.
+LDFLAGS="$LDFLAGS -Wl,--no-as-needed" &&
if is_depends_enabled $SPELL qt4 ; then
qt4_cmake_build
else
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index 342053f..994df86 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,6 @@
+2015-03-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: disable as-needed, insane breakage
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/x11-libs/libfakekey/BUILD b/x11-libs/libfakekey/BUILD
new file mode 100755
index 0000000..5a34e5a
--- /dev/null
+++ b/x11-libs/libfakekey/BUILD
@@ -0,0 +1,2 @@
+LDFLAGS+=" -lX11"
+default_build
diff --git a/x11-libs/libfakekey/HISTORY b/x11-libs/libfakekey/HISTORY
index 5dfe79e..6e69b6f 100644
--- a/x11-libs/libfakekey/HISTORY
+++ b/x11-libs/libfakekey/HISTORY
@@ -1,3 +1,6 @@
+2015-03-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: added, to fix build
+
2009-08-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, DEPENDS: Created

diff --git a/x11/slim/DETAILS b/x11/slim/DETAILS
index a6d5976..4725c44 100755
--- a/x11/slim/DETAILS
+++ b/x11/slim/DETAILS
@@ -3,10 +3,10 @@
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://download.berlios.de/slim/$SOURCE
- SOURCE_URL[1]=http://slim.berlios.de/releases/$SOURCE
+
SOURCE_URL[0]=http://downloads.sourceforge.net/project/slim.berlios/$SOURCE
+ SOURCE_URL[1]=http://sourcemage.ru/mirror/$SOURCE

SOURCE_HASH=sha512:345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
- WEB_SITE=http://slim.berlios.de/
+ WEB_SITE=http://sourceforge.net/projects/slim.berlios/
KEYWORDS="x11"
ENTERED=20050518
SHORT="desktop-independent graphical login manager for X11"
diff --git a/x11/slim/HISTORY b/x11/slim/HISTORY
index 1a36376..2cd2ae5 100644
--- a/x11/slim/HISTORY
+++ b/x11/slim/HISTORY
@@ -1,3 +1,6 @@
+2015-03-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated website & source url; added another mirror
+
2014-04-17 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: fixed build with recent freetype2/cmake



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (fc10162c8ca2865271fbcb1e83778e84c29a13f3), Vlad Glagolev, 03/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page