sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (d44f16ec00bd243dd9c3dc1fbbe949e98aec0161)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (d44f16ec00bd243dd9c3dc1fbbe949e98aec0161)
- Date: Wed, 25 Jul 2012 03:05:06 -0500
GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:
ChangeLog | 3
dev/null |binary
disk/fuse/HISTORY | 3
disk/fuse/PRE_BUILD | 16 -
disk/libburn/DETAILS | 2
disk/libburn/HISTORY | 3
disk/libisoburn/DETAILS | 2
disk/libisoburn/HISTORY | 3
disk/libisofs/DETAILS | 2
disk/libisofs/HISTORY | 3
kde4-apps/digikam4/DEPENDS | 7
kde4-apps/digikam4/HISTORY | 3
kde4-support/soprano/DEPENDS | 10
kde4-support/soprano/HISTORY | 6
libs/clucene/BUILD | 8
libs/clucene/DEPENDS | 3
libs/clucene/DETAILS | 7
libs/clucene/HISTORY | 13 +
libs/clucene/PREPARE | 2
libs/clucene/PRE_SUB_DEPENDS | 4
libs/clucene/REPAIR^all^PRE_SUB_DEPENDS | 4
libs/clucene/SUB_DEPENDS | 5
libs/libmpc/DETAILS | 5
libs/libmpc/HISTORY | 6
libs/libmpc/INSTALL | 2
libs/libmpc/PRE_BUILD | 5
libs/libmpc/automake-1.12.patch | 11
libs/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch | 63 -----
python-pypi/distribute/DEPENDS | 6
python-pypi/distribute/DETAILS | 2
python-pypi/distribute/HISTORY | 5
python-pypi/distribute/PREPARE | 1
python-pypi/distribute/distribute-0.6.27.tar.gz.sig | 0
python-pypi/distribute/distribute-0.6.28.tar.gz.sig |binary
security/wireshark/DETAILS | 6
security/wireshark/HISTORY | 3
utils/dbus/DETAILS | 4
utils/dbus/HISTORY | 3
utils/ponysay/BUILD | 1
utils/ponysay/DEPENDS | 1
utils/ponysay/DETAILS | 13 +
utils/ponysay/HISTORY | 2
utils/strigi/0001-fix-build-for-disabled-qt4-option.patch | 26 --
utils/strigi/DEPENDS | 18 -
utils/strigi/DETAILS | 12 -
utils/strigi/HISTORY | 18 +
utils/strigi/PRE_BUILD | 11
utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch | 155
++++++++++++++
utils/strigi/strigi-0.7.7-gcc47.patch | 20 +
wm-addons/xxkb/DEPENDS | 1
wm-addons/xxkb/HISTORY | 3
x11-libs/cairo/DEPENDS | 11
x11-libs/cairo/HISTORY | 5
x11-libs/cairo/PRE_SUB_DEPENDS | 1
x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS | 1
x11-libs/cairo/SUB_DEPENDS | 4
x11-toolkits/gtk+3/DEPENDS | 4
x11-toolkits/gtk+3/HISTORY | 3
x11/easystroke/HISTORY | 3
x11/easystroke/TRIGGERS | 1
x11/gtk-chtheme/HISTORY | 4
x11/gtk-chtheme/PRE_BUILD | 4
x11/gtk-chtheme/gtk224.patch | 22 +
63 files changed, 411 insertions(+), 164 deletions(-)
New commits:
commit 072a31b790791ef66b6fa79048aaf71f6e9f0a03
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
utils/ponysay: new spell, cowsay wrapper with ponies
commit 0a069bf1079014f623244f151e78071de2d1ee77
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
dbus 1.6.4
commit 68f542d2f1a98f00125acefcb12f6e08e209254d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gtk-chtheme: fixed build with gtk+2 >= 2.24
commit 3d38e24b570307f8346d3fb8d099ea37a349257c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gtk+3: fixed compilation when cairo had been installed earlier than glib2
commit b33a7e8a324c3056c7c8a5cf999554a10ac5e5da
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cairo: added glib2 subdependency
commit e2df88bb892561073cedb1b4068da5e6657d3a44
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xxkb: added missing imake dependency
commit b89cf872e65a4679b23974912c9dec92487a4832
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
wireshark 1.8.1, SECURITY_PATCH=37
commit 03ac7de855e8d16e0efaf22e3e93b98c067bb21d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>
soprano: added sub_depends stable to clucene to ensure proper
functionality, as 2.x of clucene is not supported
suggested_depends virtuosso -> optional_depends since it is the default
backend.
commit 2ce48d2434e815f7cfc7691894d96c0bd9b1254d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>
strigi: changed depends clucene to optional_depends, with sub_depends
stable
commit 02a237b365819e933912195c62aafd93eb1894cd
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>
clucene: re-add stable branch (0.9.21b)
* PREPARE: added, to select branch
* DEPENDS: if branch is 2.x depend on boost and cmake
* BUILD: use default_build if stable branch, cmake_build otherwise
* SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^ALL^PRE_SUB_DEPENDS: added,
to force stable branch
commit fa931aae0d6438fa74a0cb0cc7cda604a8b81674
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>
digikam4: added depends marble
commit 141f99429a5cc093158c19cd6c1b47b86ec560fb
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>
distribute: => 0.6.28
* DEPENDS: depend on PYTHON, rather than selecting with PREPARE
* PREPARE: removed, no longer needed
commit af6c676be550f2ced7c3ac21cacbbafacce46d92
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>
easystroke: added TRIGGERS to check_self when boost is cast
commit 9f99e86f03a20089dfe81f9fd6142eb502a46286
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libmpc: => 1.0
commit 2fec9b4fd5b02806c1b3d55741e582a76a953e31
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libisoburn: => 1.2.4
commit e22a4b0408f8e7ba0ff0e0e953826193a7ac23f9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libisofs: => 1.2.4
commit f8e1e0f73abaee9c924e99f70390f488b9f28931
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libburn: => 1.2.4
commit 844722344193f0357dc5b020832099259fe29d5f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
clucene: => 2.3.3.4
commit 2f78636d21727218c74284b662fad5ff481b9aa7
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>
disk/fuse: unlock.patch now applies to stable branch only
commit 32325e0fc868397b1c254058a1a18368d6820d8d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>
strigi: => 0.7.7
changed SOURCE_URL to debian since 0.7.7 is no longer available from
official sources
DEPENDS: added depends boost
removed optional depends sqlite since it no longer works
re-enabled optional depends ffmpeg, but changed to LIBAVCODEC
PRE_BUILD: removed patch for disabled qt4 build, no longer needed
added patch to fix building on gcc 4.7
if ffmpeg >= 0.11 is enabled, apply patch to fix build with it
* 0001-fix-build-for-disabled-qt4-option.patch: removed, no longer needed
* strigi-0.7.7-gcc47.patch: added, fixes build with gcc 4.7
* strigi-0.7.7-ffmpeg-0.11.patch: added, fixes build with ffmpeg >= 0.11
diff --git a/ChangeLog b/ChangeLog
index d257313..5dd9bcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-07-24 Ladislav Hagara <hgr AT vabo.cz>
+ * utils/ponysay: new spell, cowsay wrapper with ponies
+
2012-07-21 Thomas Orgis <sobukus AT sourcemage.org>
* perl-cpan/config-param: new spell, cmdline program configuration
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 4abdced..86811ba 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,6 @@
+2012-07-23 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: unlock.patch now applies to stable branch only
+
2012-05-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply the patch
diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index c677cfb..dc1471d 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -2,17 +2,15 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-# part of revert of official commit 3743f3fe
-# that brakes our castfs staging system
-patch -p1 < "$SPELL_DIRECTORY/unlock.patch" &&
-
-if [ "$FUSE_BRANCH" != "scm" ]; then
- patch -p0 < "$SPELL_DIRECTORY/init.patch"
-fi &&
-
# glibc-2.14 fix
sed -i "/sched/s|<|<linux/|" util/fusermount.c &&
-if [ "$FUSE_BRANCH" = "scm" ]; then
+if [ "$FUSE_BRANCH" != "scm" ]; then
+ # part of revert of official commit 3743f3fe
+ # that brakes our castfs staging system
+ patch -p1 < "$SPELL_DIRECTORY/unlock.patch"
+ # prevent installing fuse initscript into the wrong place
+ patch -p0 < "$SPELL_DIRECTORY/init.patch"
+else
./makeconf.sh
fi
diff --git a/disk/libburn/DETAILS b/disk/libburn/DETAILS
index 9103d7d..f9501b6 100755
--- a/disk/libburn/DETAILS
+++ b/disk/libburn/DETAILS
@@ -12,7 +12,7 @@ if [[ $LIBBURN_BRANCH == scm ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
else
- VERSION=1.2.2
+ VERSION=1.2.4
SOURCE2_IGNORE=signature
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/disk/libburn/HISTORY b/disk/libburn/HISTORY
index 31a0fb7..3d50058 100644
--- a/disk/libburn/HISTORY
+++ b/disk/libburn/HISTORY
@@ -1,3 +1,6 @@
+2012-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.4
+
2012-04-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.2
diff --git a/disk/libisoburn/DETAILS b/disk/libisoburn/DETAILS
index 7f3fb64..c6aabec 100755
--- a/disk/libisoburn/DETAILS
+++ b/disk/libisoburn/DETAILS
@@ -12,7 +12,7 @@ if [[ $LIBISOBURN_BRANCH == scm ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
else
- VERSION=1.2.2
+ VERSION=1.2.4
SOURCE2_IGNORE=signature
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/disk/libisoburn/HISTORY b/disk/libisoburn/HISTORY
index b213d0c..d9d4b3c 100644
--- a/disk/libisoburn/HISTORY
+++ b/disk/libisoburn/HISTORY
@@ -1,3 +1,6 @@
+2012-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.4
+
2012-04-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.2
diff --git a/disk/libisofs/DETAILS b/disk/libisofs/DETAILS
index 07d504b..afef25a 100755
--- a/disk/libisofs/DETAILS
+++ b/disk/libisofs/DETAILS
@@ -12,7 +12,7 @@ if [[ $LIBISOFS_BRANCH == scm ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
else
- VERSION=1.2.2
+ VERSION=1.2.4
SOURCE2_IGNORE=signature
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/disk/libisofs/HISTORY b/disk/libisofs/HISTORY
index 59a359d..e6e7d6b 100644
--- a/disk/libisofs/HISTORY
+++ b/disk/libisofs/HISTORY
@@ -1,3 +1,6 @@
+2012-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.4
+
2012-04-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.2
diff --git a/kde4-apps/digikam4/DEPENDS b/kde4-apps/digikam4/DEPENDS
index e5eb77d..d9784cf 100755
--- a/kde4-apps/digikam4/DEPENDS
+++ b/kde4-apps/digikam4/DEPENDS
@@ -1,14 +1,15 @@
source "$SECTION_DIRECTORY/KDE_DEPENDS" &&
sub_depends qt4 SQLITE &&
-depends sqlite &&
+depends sqlite &&
depends lcms &&
depends libkdcraw4 &&
depends libkexiv24 &&
depends libkipi4 &&
-depends jasper &&
-depends JPEG &&
+depends jasper &&
+depends JPEG &&
depends opencv &&
depends qjson &&
+depends marble &&
optional_depends kdepimlibs4 '' '' 'PIM support' &&
# added optional dependencies from kipi-plugins4
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index e094d89..9f8b402 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: added depends marble
+
2012-07-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.7.0
diff --git a/kde4-support/soprano/DEPENDS b/kde4-support/soprano/DEPENDS
index 3b9c186..9b5451d 100755
--- a/kde4-support/soprano/DEPENDS
+++ b/kde4-support/soprano/DEPENDS
@@ -1,10 +1,10 @@
depends qt4 &&
depends cmake &&
-optional_depends redland '' '-DSOPRANO_DISABLE_REDLAND_BACKEND=1' 'Redland
backend' &&
-optional_depends raptor '' '-DSOPRANO_DISABLE_RAPTOR_PARSER=1' 'raptor
parser and serializer plugins' &&
-suggest_depends virtuoso '' '-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=1'
'full-text search database' &&
-optional_depends dbus '' '-DSOPRANO_DISABLE_DBUS=1' 'dbus integration'
+optional_depends redland '' '-DSOPRANO_DISABLE_REDLAND_BACKEND=1' 'for
Redland backend' &&
+optional_depends raptor '' '-DSOPRANO_DISABLE_RAPTOR_PARSER=1' 'for raptor
parser and serializer plugins' &&
+optional_depends virtuoso '' '-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=1' 'for
full-text search database (default soprano backend)' &&
+optional_depends dbus '' '-DSOPRANO_DISABLE_DBUS=1' 'for dbus integration'
if is_depends_enabled $SPELL dbus;then
sub_depends qt4 DBUS
@@ -13,4 +13,4 @@ fi &&
if is_depends_enabled $SPELL virtuoso;then
depends libiodbc
fi &&
-optional_depends clucene '' '-DSOPRANO_DISABLE_CLUCENE_INDEX=1' 'full-text
search index'
+optional_depends -sub stable clucene '' '-DSOPRANO_DISABLE_CLUCENE_INDEX=1'
'to use standalone version (not required if only used with KDE)'
diff --git a/kde4-support/soprano/HISTORY b/kde4-support/soprano/HISTORY
index 542b24b..2ead6ae 100644
--- a/kde4-support/soprano/HISTORY
+++ b/kde4-support/soprano/HISTORY
@@ -1,3 +1,9 @@
+2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: suggested_depends virtuosso -> optional_depends since it
is the
+ default backend.
+ added sub_depends stable to clucene to ensure proper functionality,
as
+ 2.x of clucene is not supported
+
2012-05-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.7.6
diff --git a/libs/clucene/BUILD b/libs/clucene/BUILD
index 185b1ea..f52df82 100755
--- a/libs/clucene/BUILD
+++ b/libs/clucene/BUILD
@@ -1,6 +1,6 @@
-if [[ -n $CLUC_VER && $CLUC_VER != stable ]];then
- cmake_build
+if [[ $CLUCENE_BRANCH == "stable" ]]; then
+ OPTS="--disable-static $OPTS" &&
+ default_build
else
-OPTS="--disable-static $OPTS" &&
-default_build
+ cmake_build
fi
diff --git a/libs/clucene/DEPENDS b/libs/clucene/DEPENDS
index 7161d17..fad9e2f 100755
--- a/libs/clucene/DEPENDS
+++ b/libs/clucene/DEPENDS
@@ -1,4 +1,5 @@
depends -sub CXX gcc &&
-if [[ -n $CLUC_VER && $CLUC_VER != stable ]];then
+if [[ $CLUCENE_BRANCH == "2.x" ]]; then
+ depends boost &&
depends cmake
fi
diff --git a/libs/clucene/DETAILS b/libs/clucene/DETAILS
index c8973d2..9f98fb7 100755
--- a/libs/clucene/DETAILS
+++ b/libs/clucene/DETAILS
@@ -1,8 +1,15 @@
SPELL=clucene
+if [[ $CLUCENE_BRANCH == "2.x" ]];then
+ VERSION=2.3.3.4
+
SOURCE_HASH=sha512:1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
+ SPELLX=$SPELL-core-$VERSION
+ SOURCE=$SPELLX.tar.gz
+else
VERSION=0.9.21b
SOURCE_HASH=sha512:706e8ad1fc944ffe12f0b0057169bca63131ae2263a3e46dd9750bfe2e7401870dac8dc494e0159f9302afb285473d89b5bd62f9c2339a1a1954e4cb98391ee3
SPELLX=$SPELL-core-$VERSION
SOURCE=$SPELLX.tar.bz2
+fi
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
WEB_SITE=http://sourceforge.net/projects/clucene/
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index b62fef0..f32643e 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,16 @@
+2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: re-add stable branch (0.9.21b)
+ * PREPARE: added, to select branch
+ * DEPENDS: if branch is 2.x depend on boost and cmake
+ * BUILD: use default_build if stable branch, cmake_build otherwise
+ * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^ALL^PRE_SUB_DEPENDS: added,
+ to force stable branch
+
+2012-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.3.3.4
+ * DEPENDS: always depends cmake
+ * BUILD: use cmake_build
+
2011-08-16 Julien "_kaze_" ROZO <julien AT rozo.org>
* BUILD, DEPENDS: CLUC_VER may be unset, if first casted after scm
support has been removed. This fixes compilation issue with stable
diff --git a/libs/clucene/PREPARE b/libs/clucene/PREPARE
new file mode 100755
index 0000000..d6a0f92
--- /dev/null
+++ b/libs/clucene/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable 2.x
diff --git a/libs/clucene/PRE_SUB_DEPENDS b/libs/clucene/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..efc181b
--- /dev/null
+++ b/libs/clucene/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ stable) [[ $CLUCENE_BRANCH == "stable" ]] && return 0;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
b/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..efc181b
--- /dev/null
+++ b/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ stable) [[ $CLUCENE_BRANCH == "stable" ]] && return 0;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/libs/clucene/SUB_DEPENDS b/libs/clucene/SUB_DEPENDS
new file mode 100755
index 0000000..cd14da7
--- /dev/null
+++ b/libs/clucene/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ stable) message "clucene stable branch (0.9.21b) needed, forcing it." &&
+ CLUCENE_BRANCH="stable";;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/libs/libmpc/DETAILS b/libs/libmpc/DETAILS
index 4f413b3..66c48b3 100755
--- a/libs/libmpc/DETAILS
+++ b/libs/libmpc/DETAILS
@@ -1,9 +1,8 @@
SPELL=libmpc
- VERSION=0.9
- PATCHLEVEL=1
+ VERSION=1.0
+
SOURCE_HASH=sha512:f621a8334a12c09ef40c9a7e668027c79277e26bb57991d6d451db053d772e2db9f958ec7f81bd1e5b8674a17f8f291461bd5d918d84c2aedc758a2cad431641
SOURCE="mpc-$VERSION.tar.gz"
SOURCE_URL[0]=http://www.multiprecision.org/mpc/download/$SOURCE
-
SOURCE_HASH=sha512:84daf8e6f63c876ba4c58bd1f25aea2766dd42d6e020aa02e93682e7a1d03da6c30d02c09ac006a507feedb46ea18de415e2affa1cdb71d37d63f3130bb7dfc4
SOURCE_DIRECTORY="$BUILD_DIRECTORY/mpc-$VERSION"
WEB_SITE="http://www.multiprecision.org/index.php?prog=mpc";
LICENSE[0]="LGPL"
diff --git a/libs/libmpc/HISTORY b/libs/libmpc/HISTORY
index 631fdcd..1355872 100644
--- a/libs/libmpc/HISTORY
+++ b/libs/libmpc/HISTORY
@@ -1,3 +1,9 @@
+2012-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0
+ * PRE_BUILD, *.patch: deleted
+ * INSTALL: create symlik for old limbpc, as gcc links to it
+ and would be broken without it
+
2012-06-15 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: fixed build when automake < 1.12 is installed
diff --git a/libs/libmpc/INSTALL b/libs/libmpc/INSTALL
index 7edfbb9..7443a11 100755
--- a/libs/libmpc/INSTALL
+++ b/libs/libmpc/INSTALL
@@ -1,2 +1,4 @@
default_install &&
+# gcc needs previous libmpc
+ln -s $TRACK_ROOT/usr/lib/libmpc.so $INSTALL_ROOT/usr/lib/libmpc.so.2 &&
rm -r doc # remove the remaining build system cruft
diff --git a/libs/libmpc/PRE_BUILD b/libs/libmpc/PRE_BUILD
deleted file mode 100755
index 174ac59..0000000
--- a/libs/libmpc/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/libmpc-0.9-configure_cflags_egrep_issue.patch &&
-patch -p1 < $SPELL_DIRECTORY/automake-1.12.patch &&
-autoreconf
diff --git a/libs/libmpc/automake-1.12.patch b/libs/libmpc/automake-1.12.patch
deleted file mode 100644
index ca31185..0000000
--- a/libs/libmpc/automake-1.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mpc-0.9.old/configure.ac 2012-05-10 00:00:31.430625679 -0400
-+++ mpc-0.9/configure.ac 2012-05-09 23:58:17.121621041 -0400
-@@ -27,7 +27,7 @@
- AC_CONFIG_SRCDIR([src/mpc-impl.h])
- AC_CONFIG_HEADER([config.h])
-
--AM_INIT_AUTOMAKE([1.9 -Wall -Werror])
-+AM_INIT_AUTOMAKE([1.9 -Wall -Werror -Wno-extra-portability])
- AM_MAINTAINER_MODE
-
- AC_CANONICAL_HOST
diff --git a/libs/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
b/libs/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
deleted file mode 100644
index 3bf3247..0000000
--- a/libs/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- trunk/configure.ac 2011/02/21 12:18:31 932
-+++ trunk/configure.ac 2011/02/21 16:41:09 936
-@@ -33,7 +33,7 @@
- AC_CANONICAL_HOST
- AC_CONFIG_MACRO_DIR([m4])
-
--dnl Extra arguments to configure
-+# Extra arguments to configure
- AC_ARG_WITH([mpfr_include],
- [AC_HELP_STRING([--with-mpfr-include=DIR],
- [MPFR include directory])],
-@@ -85,18 +85,19 @@
- )
-
-
--dnl Setup CC and CFLAGS
-+# Setup CC and CFLAGS
-+AC_PROG_CC
-+AC_LANG(C)
-
--dnl Check for user specification of CC or CFLAGS
-+# Set up LibTool
-+AC_PROG_LIBTOOL
-+
-+# Check for user specification of CC or CFLAGS
- if test -n "$CFLAGS" || test -n "$CC" ; then
- user_redefine_cc=yes
- fi
-
--# Check for programs
--AC_PROG_CC
--AC_LANG(C)
--
--dnl Check GMP Header
-+# Check GMP Header
- AC_MSG_CHECKING(for gmp.h)
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #include "gmp.h"
-@@ -105,22 +106,19 @@
- AC_MSG_ERROR([gmp.h can't be found, or is unusable.])
- ])
-
--dnl Check for GMP CFLAGS in gmp.h
-+# Check for GMP CFLAGS in gmp.h
- if test -z "$user_redefine_cc" ; then
- MPC_GMP_CC_CFLAGS
- fi
-
-
--dnl Configs for Windows DLLs
-+# Configs for Windows DLLs
- case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
- MPC_WINDOWS
- esac
-
-
--dnl Finally set up LibTool
--AC_PROG_LIBTOOL
--
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h
sys/time.h])
diff --git a/python-pypi/distribute/DEPENDS b/python-pypi/distribute/DEPENDS
index 1f268b4..e4ea57a 100755
--- a/python-pypi/distribute/DEPENDS
+++ b/python-pypi/distribute/DEPENDS
@@ -1,5 +1 @@
-if [[ ${PYTHON_VERSION} == python ]]; then
- depends python
-else
- depends python3
-fi
+depends PYTHON
diff --git a/python-pypi/distribute/DETAILS b/python-pypi/distribute/DETAILS
index 8c77267..4eb5e7f 100755
--- a/python-pypi/distribute/DETAILS
+++ b/python-pypi/distribute/DETAILS
@@ -1,5 +1,5 @@
SPELL=distribute
- VERSION=0.6.27
+ VERSION=0.6.28
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://pypi.python.org/packages/source/d/${SPELL}/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/python-pypi/distribute/HISTORY b/python-pypi/distribute/HISTORY
index 09a81e0..bbfe961 100644
--- a/python-pypi/distribute/HISTORY
+++ b/python-pypi/distribute/HISTORY
@@ -1,3 +1,8 @@
+2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.6.28
+ * DEPENDS: depend on PYTHON, rather than selecting with PREPARE
+ * PREPARE: removed, no longer needed
+
2012-05-18 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.6.27
diff --git a/python-pypi/distribute/PREPARE b/python-pypi/distribute/PREPARE
deleted file mode 100755
index 54a80dc..0000000
--- a/python-pypi/distribute/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_list PYTHON_VERSION "Which python verion would you like to
use?" python python3
diff --git a/python-pypi/distribute/distribute-0.6.27.tar.gz.sig
b/python-pypi/distribute/distribute-0.6.27.tar.gz.sig
deleted file mode 100644
index d64e703..0000000
Binary files a/python-pypi/distribute/distribute-0.6.27.tar.gz.sig and
/dev/null differ
diff --git a/python-pypi/distribute/distribute-0.6.28.tar.gz.sig
b/python-pypi/distribute/distribute-0.6.28.tar.gz.sig
new file mode 100644
index 0000000..bc23c71
Binary files /dev/null and
b/python-pypi/distribute/distribute-0.6.28.tar.gz.sig differ
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 32855b8..609eba4 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.8.0
- SECURITY_PATCH=36
+ VERSION=1.8.1
+ SECURITY_PATCH=37
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:bd2b476dda089d27aba73ae5d5974757ec0fd1f6047adecad9966366cacd6e0565a313be1f14f59e38011cd18331f7cf4aaca69228d9af1201866c5174bf41d4
+
SOURCE_HASH=sha512:fec2212ca6c0b50b84f0642160b4685c5aa9e06677b68fa1103dbbd7dd684bfdc00330b2444a8805169e9fc88866707cf2b0dee45207e7f91ac40f7bcefb6faa
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index da34d21..c676800 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2012-07-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.1, SECURITY_PATCH=37
+
2012-06-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.0
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index e9b90a9..97ba73c 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbus
- VERSION=1.6.2
-
SOURCE_HASH=sha512:c53b3cc2251ccf88918f8080a922a10d6cb755900a78978df8ba5c19e100c94adafb8e0790d9a753c20d81e1fb5fda5d02b52653acedc5dddb60d8f65c061d7c
+ VERSION=1.6.4
+
SOURCE_HASH=sha512:eaa9098e3cbbbf3b5cb7abd0906819f27b633afe1376213f2ffd6edd8ddfa0250678f0d9cf161846696a08ed1e9479a42ba4e1a6f0b6b934f7a4f4c0ff3ff8f6
SECURITY_PATCH=7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 0c2f8c5..9996ebd 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2012-07-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.4
+
2012-07-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.2
diff --git a/utils/ponysay/BUILD b/utils/ponysay/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/utils/ponysay/BUILD
@@ -0,0 +1 @@
+make
diff --git a/utils/ponysay/DEPENDS b/utils/ponysay/DEPENDS
new file mode 100755
index 0000000..c2a01e7
--- /dev/null
+++ b/utils/ponysay/DEPENDS
@@ -0,0 +1 @@
+depends cowsay
diff --git a/utils/ponysay/DETAILS b/utils/ponysay/DETAILS
new file mode 100755
index 0000000..997b509
--- /dev/null
+++ b/utils/ponysay/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=ponysay
+ VERSION=1.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=https://github.com/erkin/ponysay/tarball/$VERSION
+
SOURCE_HASH=sha512:d1118334a34f2a81e87ab5c9f2f14f992eda07850b8d14a1853f2794b3d0d081994246a562c7704faa32ca636e3b7d4769bdcd19c7179d2d8140fae1f2fa3e38
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/erkin-ponysay-a8cad12
+ WEB_SITE=https://github.com/erkin/ponysay
+ LICENSE[0]=WTFPL
+ ENTERED=20120724
+ SHORT="cowsay wrapper with ponies"
+cat << EOF
+A cowsay wrapper with ponies.
+EOF
diff --git a/utils/ponysay/HISTORY b/utils/ponysay/HISTORY
new file mode 100644
index 0000000..3f3e60c
--- /dev/null
+++ b/utils/ponysay/HISTORY
@@ -0,0 +1,2 @@
+2012-07-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, BUILD: spell created, version 1.1
diff --git a/utils/strigi/0001-fix-build-for-disabled-qt4-option.patch
b/utils/strigi/0001-fix-build-for-disabled-qt4-option.patch
deleted file mode 100644
index f94e0bc..0000000
--- a/utils/strigi/0001-fix-build-for-disabled-qt4-option.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e92b260635e4fe542c0c606f2a2484334e8240ca Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu AT gmx.de>
-Date: Wed, 13 Jul 2011 18:32:16 +0200
-Subject: [PATCH] fix build for disabled qt4 option
-
----
- lib/CMakeLists.txt | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index ba07497..5c6ae79 100644
---- a/strigiclient/lib/CMakeLists.txt
-+++ b/strigiclient/lib/CMakeLists.txt
-@@ -1,4 +1,7 @@
- if(NOT WIN32)
- add_subdirectory(htmlgui)
- endif(NOT WIN32)
--add_subdirectory(searchclient)
-+
-+if(QT4_FOUND)
-+ add_subdirectory(searchclient)
-+endif(QT4_FOUND)
---
-1.7.3.4
-
-
diff --git a/utils/strigi/DEPENDS b/utils/strigi/DEPENDS
index 7f200c9..2ee1f71 100755
--- a/utils/strigi/DEPENDS
+++ b/utils/strigi/DEPENDS
@@ -1,13 +1,17 @@
-depends -sub CXX gcc &&
+depends -sub CXX gcc &&
depends cmake &&
depends bzip2 &&
depends pkgconfig &&
depends openssl &&
-depends clucene &&
depends libxml2 &&
-optional_depends dbus '-DENABLE_DBUS=on' '-DENABLE_DBUS=off' 'message
based indexing' &&
+depends boost &&
+
+optional_depends -sub stable clucene \
+ '-DENABLE_CLUCENE=on' \
+ '-DENABLE_CLUCENE=OFF -DENABLE_CLUCENE_NG=OFF' \
+ 'to use standalone version (not required if only used with
KDE)' &&
+optional_depends dbus '-DENABLE_DBUS=on' '-DENABLE_DBUS=off' 'for message
based indexing' &&
optional_depends -sub DBUS qt4 '-DENABLE_QT4=on' '-DENABLE_QT4=off' 'for qt4
gui' &&
-optional_depends FAM '-DENABLE_FAM=on' '' 'file change monitoring' &&
-optional_depends sqlite '-DENABLE_SQLITE=off' '' 'sqlite3 backend (broken)'
&&
-optional_depends exiv2 '-DENABLE_EXIV2=on' '' 'picure indexing' &&
-optional_depends ffmpeg '-DENABLE_FFMPEG=off' '-DENABLE_FFMPEG=off' 'ffmpeg
indexing (broken)'
+optional_depends FAM '-DENABLE_FAM=on' '' 'for file change
monitoring' &&
+optional_depends exiv2 '-DENABLE_EXIV2=on' '' 'for picture indexing' &&
+optional_depends LIBAVCODEC '-DENABLE_FFMPEG=on' '-DENABLE_FFMPEG=off' 'for
video indexing'
diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS
index d3f2177..3693696 100755
--- a/utils/strigi/DETAILS
+++ b/utils/strigi/DETAILS
@@ -1,9 +1,11 @@
SPELL=strigi
- VERSION=0.7.5
-
SOURCE_HASH=sha512:9c6f46475095996927153b9e8ee07d92c4cba0793772792c3a9b40229bdbd2b503fe07bcd3c8d73f235474326b8a601dea20bc77bc64c090248ea414d393c240
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_URL[0]=http://www.vandenoever.info/software/strigi/$SOURCE
+ VERSION=0.7.7
+
SOURCE_HASH=sha512:5bc60a1f3cdcbede20d858e3437647aea5e4e76f2850db6b116983f073294e1f06e595e756889700ac2039e720c53273960a0036791864871e552716685b3dc5
+ SOURCE=$SPELL\_$VERSION.orig.tar.bz2
+# SOURCE=$SPELL-$VERSION.tar.bz2
+# SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+# SOURCE_URL[0]=http://www.vandenoever.info/software/strigi/$SOURCE
+ SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/s/strigi/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.vandenoever.info/software/strigi/
LICENSE[0]=LGPL
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index 3ee1460..e0daa0e 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,21 @@
+2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: changed depends clucene to optional_depends, with
sub_depends
+ stable
+
+2012-07-22 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.7
+ changed SOURCE_URL to debian since 0.7.7 is no longer available from
+ official sources
+ * DEPENDS: added depends boost
+ removed optional depends sqlite since it no longer works
+ re-enabled optional depends ffmpeg, but changed to LIBAVCODEC
+ * PRE_BUILD: removed patch for disabled qt4 build, no longer needed
+ added patch to fix building on gcc 4.7
+ if ffmpeg >= 0.11 is enabled, apply patch to fix build with it
+ * 0001-fix-build-for-disabled-qt4-option.patch: removed, no longer
needed
+ * strigi-0.7.7-gcc47.patch: added, fixes build with gcc 4.7
+ * strigi-0.7.7-ffmpeg-0.11.patch: added, fixes build with ffmpeg >=
0.11
+
2012-02-08 Tommy Boatman <tboatman AT sourcemage.org>
* DEPENDS: ffmpeg optional but currently broken, so option is
disabled either way
diff --git a/utils/strigi/PRE_BUILD b/utils/strigi/PRE_BUILD
index 4f1c189..ee8c21a 100755
--- a/utils/strigi/PRE_BUILD
+++ b/utils/strigi/PRE_BUILD
@@ -1,3 +1,12 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/0001-fix-build-for-disabled-qt4-option.patch
+
+patch -p1 < $SPELL_DIRECTORY/strigi-0.7.7-gcc47.patch &&
+
+FFMPEG_VER=0
+if is_depends_enabled $SPELL ffmpeg; then
+ FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2)
+fi
+if (( $FFMPEG_VER >= 11 )) || is_depends_enabled $SPELL ffmpeg-svn; then
+ patch -p1 < $SPELL_DIRECTORY/strigi-0.7.7-ffmpeg-0.11.patch
+fi
diff --git a/utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch
b/utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch
new file mode 100644
index 0000000..465eda4
--- /dev/null
+++ b/utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch
@@ -0,0 +1,155 @@
+Source: Mandriva patch
+Upstream: No bug report on bugs.kde.org
+Reason: libstreamanalyzer uses deprecated symbols from ffmpeg removed in 0.11
+---
strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.bero
2012-06-08 16:49:40.846877030 +0200
++++ strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
2012-06-08 17:27:40.416888115 +0200
+@@ -305,13 +305,6 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ uint8_t pDataBuffer[32768];//65536];
+ long lSize = 32768;
+
+- ByteIOContext ByteIOCtx;
+- if(init_put_byte(&ByteIOCtx, pDataBuffer, lSize, 0, in, read_data, NULL,
seek_data) < 0)
+- return -1;
+-
+- //pAVInputFormat->flags |= AVFMT_NOFILE;
+- ByteIOCtx.is_streamed = 0;
+-
+ AVProbeData pd;
+ const char *buf;
+ pd.filename ="";
+@@ -324,14 +317,27 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ if(fmt == NULL)
+ return 1;
+
+- AVFormatContext *fc = NULL;
+- if(av_open_input_stream(&fc, &ByteIOCtx, "", fmt, NULL) < 0)
++ AVFormatContext *fc = avformat_alloc_context();
++ if(!fc)
++ return -1;
++
++ AVIOContext *pb = avio_alloc_context(pDataBuffer, lSize, 0, in,
read_data, NULL, seek_data);
++ if(!fc->pb) {
++ av_free(fc);
+ return -1;
++ }
++
++ fc->pb = pb;
++
++ if(avformat_open_input(&fc, "", fmt, NULL) < 0) {
++ av_free(fc);
++ return -1;
++ }
+
+- av_find_stream_info(fc);
++ avformat_find_stream_info(fc, NULL);
+
+ // Dump information about file onto standard error
+- dump_format(fc, 0, ar.path().c_str(), false);
++ av_dump_format(fc, 0, ar.path().c_str(), false);
+
+ if(fc->bit_rate)
+ ar.addValue(factory->bitrateProperty, fc->bit_rate);
+@@ -372,10 +378,10 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ ar.addTriplet(streamuri, durationPropertyName,outs.str());
+ }
+
+- //FIXME we must stop using the deprecated fuction av_metadata_get and
use
++ //FIXME we must stop using the deprecated fuction av_dict_get and use
+ // av_dict_get once we are able to detect the version of FFMpeg being
used
+ // using version macros. same goes for all occurences of this
function.
+- AVMetadataTag *entry = av_metadata_get(stream.metadata, "language",
NULL, 0);
++ AVDictionaryEntry *entry = av_dict_get(stream.metadata, "language",
NULL, 0);
+ if (entry != NULL) {
+ const char *languageValue = entry->value;
+ if (size_t len = strlen(languageValue)) {
+@@ -430,7 +436,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ outs << codec.sample_rate;
+ ar.addTriplet(streamuri, sampleratePropertyName, outs.str());
+ }
+- if (codec.sample_fmt != SAMPLE_FMT_NONE) {}//FIXME sample format
++ if (codec.sample_fmt != AV_SAMPLE_FMT_NONE) {}//FIXME sample format
+
+ } else { // video stream
+
+@@ -469,7 +475,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+
+ // Tags
+
+- AVMetadataTag *entry = av_metadata_get(fc->metadata, "title", NULL, 0);
++ AVDictionaryEntry *entry = av_dict_get(fc->metadata, "title", NULL, 0);
+ if (entry != NULL)
+ {
+ const char *titleValue = entry->value;
+@@ -478,7 +484,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ }
+ }
+
+- entry = av_metadata_get(fc->metadata, "author", NULL, 0);
++ entry = av_dict_get(fc->metadata, "author", NULL, 0);
+ if (entry != NULL)
+ {
+ const char *authorValue = entry->value;
+@@ -490,7 +496,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ }
+ }
+
+- entry = av_metadata_get(fc->metadata, "copyright", NULL, 0);
++ entry = av_dict_get(fc->metadata, "copyright", NULL, 0);
+ if (entry != NULL)
+ {
+ const char *copyrightValue = entry->value;
+@@ -499,7 +505,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ }
+ }
+
+- entry = av_metadata_get(fc->metadata, "comment", NULL, 0);
++ entry = av_dict_get(fc->metadata, "comment", NULL, 0);
+ if (entry != NULL)
+ {
+ const char *commentValue = entry->value;
+@@ -508,7 +514,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ }
+ }
+
+- entry = av_metadata_get(fc->metadata, "album", NULL, 0);
++ entry = av_dict_get(fc->metadata, "album", NULL, 0);
+ if (entry != NULL)
+ {
+ const char *albumValue = entry->value;
+@@ -520,7 +526,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ }
+ }
+
+- entry = av_metadata_get(fc->metadata, "genre", NULL, 0);
++ entry = av_dict_get(fc->metadata, "genre", NULL, 0);
+ if (entry != NULL)
+ {
+ const char *genreValue = entry->value;
+@@ -529,7 +535,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ }
+ }
+
+- entry = av_metadata_get(fc->metadata, "track", NULL, 0);
++ entry = av_dict_get(fc->metadata, "track", NULL, 0);
+ if (entry != NULL)
+ {
+ const char *trackValue = entry->value;
+@@ -538,7 +544,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ }
+ }
+
+- entry = av_metadata_get(fc->metadata, "year", NULL, 0);
++ entry = av_dict_get(fc->metadata, "year", NULL, 0);
+ if (entry != NULL)
+ {
+ const char *yearValue = entry->value;
+@@ -547,7 +553,8 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ }
+ }
+
+- av_close_input_stream(fc);
++ avformat_close_input(&fc);
++ av_free(pb);
+ //url_fclose(&ByteIOCtx);
+
+ return 0;
diff --git a/utils/strigi/strigi-0.7.7-gcc47.patch
b/utils/strigi/strigi-0.7.7-gcc47.patch
new file mode 100644
index 0000000..3e3d318
--- /dev/null
+++ b/utils/strigi/strigi-0.7.7-gcc47.patch
@@ -0,0 +1,20 @@
+commit a8e97f672325557b3fbc84b987299350ec5ac10b
+Author: Rex Dieter <rdieter AT fedoraproject.org>
+Date: Mon Jan 9 11:13:25 2012 -0600
+
+ gcc47 fix, unistd.h header required unconditionally for 'sleep'
+
+diff --git a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
+index 9fcdcb1..1e97599 100644
+--- a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
++++ b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
+@@ -27,9 +27,7 @@
+ #include <iostream>
+ #include <stdio.h>
+
+-#if defined(__SUNPRO_CC)
+ #include <unistd.h>
+-#endif
+
+ using namespace std;
+
diff --git a/wm-addons/xxkb/DEPENDS b/wm-addons/xxkb/DEPENDS
index 6c4c81d..1abe20c 100755
--- a/wm-addons/xxkb/DEPENDS
+++ b/wm-addons/xxkb/DEPENDS
@@ -1,5 +1,6 @@
depends libx11 &&
depends libxpm &&
+depends imake &&
optional_depends librsvg2 \
"-DWITH_SVG_SUPPORT" "" \
diff --git a/wm-addons/xxkb/HISTORY b/wm-addons/xxkb/HISTORY
index 109255d..16c8154 100644
--- a/wm-addons/xxkb/HISTORY
+++ b/wm-addons/xxkb/HISTORY
@@ -1,3 +1,6 @@
+2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing imake dependency
+
2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* INSTALL: install manual page, too
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index d8b295c..c889f44 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -19,10 +19,15 @@ optional_depends libxcb \
"--disable-xcb" \
"for XCB surface backend feature" &&
+optional_depends glib2 \
+ "--enable-gobject" \
+ "--disable-gobject" \
+ "for gobject functions feature" &&
+
optional_depends libx11 \
- "--enable-xlib" \
- "--disable-xlib" \
- "for Xlib surface backend feature" &&
+ "--enable-xlib" \
+ "--disable-xlib" \
+ "for Xlib surface backend feature" &&
if is_depends_enabled $SPELL libx11; then
optional_depends libxrender \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 3d18c37..f293030 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,8 @@
+2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * SUB_DEPENDS: corrected XCB comment, added GOBJ subdep
+ * {REPAIR^all^,}PRE_SUB_DEPENDS: added GOBJ subdep
+ * DEPENDS: added glib2 optional dep; fixed aligning for libx11
+
2012-05-13 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: added xz-utils, it's not part of basesystem...
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index fd530b1..15cc31b 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -2,6 +2,7 @@ case $THIS_SUB_DEPENDS in
CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
+ GOBJ) is_depends_enabled $SPELL glib2;;
PNG) is_depends_enabled $SPELL libpng;;
PS) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-ps.h" ]];;
SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index fd530b1..15cc31b 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -2,6 +2,7 @@ case $THIS_SUB_DEPENDS in
CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
+ GOBJ) is_depends_enabled $SPELL glib2;;
PNG) is_depends_enabled $SPELL libpng;;
PS) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-ps.h" ]];;
SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 3286867..1a1e7d7 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -2,8 +2,10 @@ case $THIS_SUB_DEPENDS in
CAIRO_DEVEL) echo "Devel release needed, forcing it." &&
CAIRO_DEVEL="y" ;;
PDF) return 0;;
- XCB) message "Cairo with XCB support requested, forcing xcb-util
dependency" &&
+ XCB) message "Cairo with XCB support requested, forcing libxcb dependency"
&&
depends libxcb "--enable-xcb";;
+ GOBJ) message "Cairo with gobject functions feature requested, forcing
glib2 dependency" &&
+ depends glib2 "--enable-gobject";;
PNG) message "Cairo with PNG support requested, forcing libpng dependency"
&&
depends libpng "--enable-png --enable-svg";;
PS) return 0;;
diff --git a/x11-toolkits/gtk+3/DEPENDS b/x11-toolkits/gtk+3/DEPENDS
index 76ce35e..edce7d3 100755
--- a/x11-toolkits/gtk+3/DEPENDS
+++ b/x11-toolkits/gtk+3/DEPENDS
@@ -2,14 +2,14 @@
if [[ "$GTK_VER" == "devel" ]]; then
depends -sub GLIB_DEVEL glib2 &&
- depends -sub "CAIRO_DEVEL PDF PS SVG X" cairo &&
+ depends -sub "CAIRO_DEVEL PDF PS SVG X GOBJ" cairo &&
optional_depends -sub GOBJ_DEVEL gobject-introspection \
"--enable-introspection=yes" \
"--enable-introspection=no" \
"to enable introspection support"
else
depends glib2 &&
- depends -sub "PDF PS SVG X" cairo &&
+ depends -sub "PDF PS SVG X GOBJ" cairo &&
optional_depends gobject-introspection \
"--enable-introspection=yes" \
"--enable-introspection=no" \
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index d7cc424..6bdc631 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,6 @@
+2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: strictly requires cairo with glib2 dep enabled
+
2012-07-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.4
diff --git a/x11/easystroke/HISTORY b/x11/easystroke/HISTORY
index c97f72d..df2de8e 100644
--- a/x11/easystroke/HISTORY
+++ b/x11/easystroke/HISTORY
@@ -1,3 +1,6 @@
+2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
+ * TRIGGERS: added, to check_self when boost is cast
+
2011-11-05 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.5.5.1
converted to guru signed spell
diff --git a/x11/easystroke/TRIGGERS b/x11/easystroke/TRIGGERS
new file mode 100755
index 0000000..1696e74
--- /dev/null
+++ b/x11/easystroke/TRIGGERS
@@ -0,0 +1 @@
+on_cast boost check_self
diff --git a/x11/gtk-chtheme/HISTORY b/x11/gtk-chtheme/HISTORY
index b0be2b9..a430b4f 100644
--- a/x11/gtk-chtheme/HISTORY
+++ b/x11/gtk-chtheme/HISTORY
@@ -1,3 +1,7 @@
+2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * gtk224.patch: added, to fix build with gtk+2 >= 2.24
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/x11/gtk-chtheme/PRE_BUILD b/x11/gtk-chtheme/PRE_BUILD
new file mode 100755
index 0000000..65fca46
--- /dev/null
+++ b/x11/gtk-chtheme/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/gtk224.patch"
diff --git a/x11/gtk-chtheme/gtk224.patch b/x11/gtk-chtheme/gtk224.patch
new file mode 100644
index 0000000..4fad5b4
--- /dev/null
+++ b/x11/gtk-chtheme/gtk224.patch
@@ -0,0 +1,22 @@
+--- util.c.orig 2004-02-08 17:42:33.000000000 +0400
++++ util.c 2012-07-24 19:32:31.725182191 +0400
+@@ -19,7 +19,7 @@
+
+ GtkWidget* unfocussable(GtkWidget *w)
+ {
+- GTK_WIDGET_UNSET_FLAGS(w, GTK_CAN_FOCUS);
++ gtk_widget_set_can_focus(w, TRUE);
+ return w;
+ }
+
+--- theme_sel.c.orig 2004-02-09 06:20:28.000000000 +0400
++++ theme_sel.c 2012-07-24 19:37:24.000000000 +0400
+@@ -110,7 +110,7 @@
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_container_add(GTK_CONTAINER(sw), theme_list);
+
+- gtk_timeout_add(0, (GtkFunction)theme_list_focus, theme_list);
++ gtk_timeout_add(0, (GSourceFunc)theme_list_focus, theme_list);
+
+ return sw;
+ }
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (d44f16ec00bd243dd9c3dc1fbbe949e98aec0161), Treeve Jelbert, 07/25/2012
Archive powered by MHonArc 2.6.24.