Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (ba1b37f70ee807af981c558b684cbaff5abe8ee6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (ba1b37f70ee807af981c558b684cbaff5abe8ee6)
  • Date: Fri, 20 Apr 2012 16:36:14 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog | 6
archive/dar/DETAILS | 4
archive/dar/HISTORY | 3
audio-players/ripperx/DETAILS | 4
audio-players/ripperx/HISTORY | 3
audio-soft/rockbox-utility/DETAILS | 8 -
audio-soft/rockbox-utility/HISTORY | 3
chat-libs/libmsn/DETAILS | 6
chat-libs/libmsn/HISTORY | 5
chat-libs/libmsn/PRE_BUILD | 9 -
chat-libs/libmsn/fix-header.patch | 12 -
chat-libs/libmsn/openssl-1.0.0.patch | 12 -
crypto/cryptsetup-luks/DETAILS | 4
crypto/cryptsetup-luks/HISTORY | 3
crypto/libgcrypt/DETAILS | 2
crypto/libgcrypt/HISTORY | 3
crypto/openssl/DETAILS | 8 -
crypto/openssl/HISTORY | 4
crypto/pkcs11-helper/DETAILS | 6
crypto/pkcs11-helper/HISTORY | 3
dev/null |binary
devel/apiextractor/BUILD | 1
devel/apiextractor/DEPENDS | 9 -
devel/apiextractor/DETAILS | 26 ---
devel/apiextractor/HISTORY | 91 -----------
devel/apiextractor/PREPARE | 1
devel/apiextractor/PRE_BUILD | 4
devel/cmake/DETAILS | 4
devel/cmake/HISTORY | 3
devel/generatorrunner/BUILD | 1
devel/generatorrunner/CONFLICTS | 1
devel/generatorrunner/DEPENDS | 6
devel/generatorrunner/DETAILS | 22 --
devel/generatorrunner/HISTORY | 67 --------
devel/generatorrunner/PREPARE | 1
devel/generatorrunner/PRE_BUILD | 4
devel/pyside/DEPENDS | 1
devel/pyside/DETAILS | 4
devel/pyside/HISTORY | 4
devel/shiboken/CONFLICTS | 2
devel/shiboken/DEPENDS | 1
devel/shiboken/DETAILS | 4
devel/shiboken/HISTORY | 6
ftp-libs/rb-libtorrent/DEPENDS | 5
ftp-libs/rb-libtorrent/DETAILS | 4
ftp-libs/rb-libtorrent/HISTORY | 6
ftp/deluge/DEPENDS | 6
ftp/deluge/DETAILS | 4
ftp/deluge/HISTORY | 5
gnome2-apps/epiphany/DETAILS | 4
gnome2-apps/epiphany/HISTORY | 3
gnome2-apps/epiphany/epiphany-3.4.0.1.tar.xz.sig | 0
gnome2-apps/epiphany/epiphany-3.4.1.tar.xz.sig |binary
gnome2-apps/gcalctool/DETAILS | 4
gnome2-apps/gcalctool/HISTORY | 3
gnome2-apps/gcalctool/gcalctool-6.0.1.tar.gz.sig | 0
gnome2-apps/gcalctool/gcalctool-6.4.1.1.tar.xz.sig |binary
gnome2-libs/at-spi2-core/DETAILS | 2
gnome2-libs/at-spi2-core/HISTORY | 3
gnome2-libs/at-spi2-core/at-spi2-core-2.4.0.tar.xz.sig | 0
gnome2-libs/at-spi2-core/at-spi2-core-2.4.1.tar.xz.sig |binary
gnome2-libs/gdm2/DETAILS | 2
gnome2-libs/gdm2/HISTORY | 3
gnome2-libs/gdm2/gdm-3.4.0.1.tar.xz.sig | 0
gnome2-libs/gdm2/gdm-3.4.1.tar.xz.sig |binary
libs/boost/BUILD | 12 +
libs/boost/HISTORY | 6
libs/boost/boost_1_48_0.tar.bz2.sig | 0
libs/libvdpau/HISTORY | 3
libs/libvdpau/TRIGGERS | 1
python-pypi/distribute/DETAILS | 2
python-pypi/distribute/HISTORY | 3
python-pypi/distribute/distribute-0.6.24.tar.gz.sig | 0
python-pypi/distribute/distribute-0.6.26.tar.gz.sig |binary
utils/aide/DEPENDS | 1
utils/aide/DETAILS | 6
utils/aide/HISTORY | 5
utils/hal/HISTORY | 4
utils/hal/PRE_BUILD | 6
utils/hal/glib232.patch | 129
+++++++++++++++++
80 files changed, 284 insertions(+), 319 deletions(-)

New commits:
commit 54b1ccbffc2cec4c4929a7cdded7bc4bec8c3673
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

hal: fixed build with glib2 >= 2.32

commit 42b0614c6664a52e1b0769ec2064fbabd88d7cf5
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

pkcs11-helper: updated version to 1.10, fixed SOURCE_URL

commit 0cac0ab473d3be45d8da6e1747419e748e6c907a
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

libgcrypt: fixed WEB_SITE

commit ef1c3d27849a2e892b8fd9f1fd3a7fd926ce8064
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

cryptsetup-luks: updated version to 1.4.2

commit 16f421a1c0388866710019ada7d79d3a06698a1e
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

libmsn: updated version to 4.2.1
removed openssl and header for kdenetwork4 patches, included upstream

commit 6d56ad6b24a346bff86383463cbdb05ff83eacc8
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

rockbox-utility: updated version to 1.2.13, fixed SOURCE and
SOURCE_DIRECTORY

commit 5b6b0d67a37854e461dc9594dbb45400bb28bb1e
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

ripperx: updated version to 2.7.3

commit c15a661ba2db289adb18a6f9a84052ffe58f41e3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

deprecate devel/apiextractor

commit af5bc2e84cef225fc43a651816ddb4977a3fcb0d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

deprecate devel/generatorrunner

commit 23056e461b9d37682072d410030d0523dff91565
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pyside: => qt4.8+1.1.1

commit 6d96ed19b8d5c1a94bee29dc6a29b47d30e4ce6e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

shiboken: => 1.1.1

commit f078e2a8b889d0c75cee3429f44500c4c7da3d57
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

dar: updated version to 2.4.5

commit 94cbd476b11e507a126bc76a31afdf6ad1f73363
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

openssl 0.9.8v, 1.0.0i, SECURITY_PATCH=17

commit 864759ee26d7e27f4e5370b96a52c023bca000ee
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

libvdpau: added TRIGGERS file to recast self when nvidia_driver is cast

commit fc8b82e48164aef43f97549578385cfb4b7bd1e3
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

deluge: => 1.3.5
-change pygtk2 & librsvg2 to optional_depends
-added optional_depends notify-python for libnotify support

commit 2e79245fd211563c62a8310acf2d2cf6663a26aa
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

rb-libtorrent: => 0.16.0
removed depends zlib, no longer needed
removed openssl flags, still optional but flags are not valid anymore

commit 89bf4c343ca88231bab8654224b81482b1565ea4
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

distribute: => 0.6.26

commit 6836e0ac574f81bcc8995659e01090f1420ae935
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cmake: => 2.8.8

commit 449814751013affc56309c5fe7667b413f944467
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gdm2 3.4.1

commit 189f8a6759c5974f3d0890bb3646d06405d26f4f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

at-spi2-core 2.4.1

commit 2979616bef56e681ba7fc144c40b2c225cecb7ee
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gcalctool 6.4.1.1

commit bd2ff07c5fda715759ffbab1bc7d84d32e7c3e98
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

epiphany 3.4.1

commit 3b4f1fc59df17e79bd718f1852890c683b4d0c57
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

boost: Dont build with --with-libraries specified when you don't select
which libraries to build, so all libs are built

commit 37824d370513c0cd9d1ac0b829bdf405147e4f13
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Spell Update: aide

The DEPENDS file was updated to include one more requirement that
seems to have been added based upon the documentation available on
the vendors website.

Of further note, zlib does not appear as a dependency (required or
optional) in the vendor documentation. Additionally, aide also
seems to have an optional dependency for PostgreSQL. However, I
have not yet had a chance to test this particular piece of the
functionality.

Aside from the usual items that get updated in DETAILS, there was
only one change that was made which was in regards to the vendor
website. All the references that I have seen have pointed to the
link currently in the updated DETAILS file.

diff --git a/ChangeLog b/ChangeLog
index 1196606..af9bc88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * devel/apiextractor: spell deprecated
+
+2012-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * devel/generatorrunner: spell deprecated
+
2012-04-16 Pol Vinogradov <vin.public AT gmail.com>
* wm-addons/mbaerts.gpg: added CFD74EDE pub key
(Matthieu Baerts <matttbe AT gmail.com>)
diff --git a/archive/dar/DETAILS b/archive/dar/DETAILS
index 54c9d9f..b95af2e 100755
--- a/archive/dar/DETAILS
+++ b/archive/dar/DETAILS
@@ -1,6 +1,6 @@
SPELL=dar
- VERSION=2.4.2
-
SOURCE_HASH=sha512:9c5c1dd7b562571744f3ebdf13d951053b9122679b9f82b5c424d6978cc45993d23304fb79a044063e3d711a4db46c804873cc3d92702c542fbe804d246cb896
+ VERSION=2.4.5
+
SOURCE_HASH=sha512:68503cf14b43e5bc773ff6bafb5c44b746f66e64694a2fff1dc3e19b93086aae5a111581ffadac9713912deddfa120a4ca5681556d425c1c3223fa5900c1bf30
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/archive/dar/HISTORY b/archive/dar/HISTORY
index dcd587f..e1430ac 100644
--- a/archive/dar/HISTORY
+++ b/archive/dar/HISTORY
@@ -1,3 +1,6 @@
+2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.4.5
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/audio-players/ripperx/DETAILS b/audio-players/ripperx/DETAILS
index 9e4c895..7b202cf 100755
--- a/audio-players/ripperx/DETAILS
+++ b/audio-players/ripperx/DETAILS
@@ -1,9 +1,9 @@
SPELL=ripperx
- VERSION=2.7.2
+ VERSION=2.7.3
SOURCE=ripperX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ripperX-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/ripperx/$SOURCE
-
SOURCE_HASH=sha512:148224e7509024ca8e31fd21ff127fb56831095163eae478d0bded064b5e6b9f76db31e99c6982fda23137e231f8ba2eab3c7163811306885a745fc004321bfe
+
SOURCE_HASH=sha512:fad4d8ee5e7ea37608b827230446f213c871d425920d0ffae5b0151e2270b36ca67156a78a530a3267141f8c5d0577a17647e4342468662472ea0f88bda69cea
WEB_SITE=http://sourceforge.net/projects/ripperx/
ENTERED=20020116
UPDATED=20030330
diff --git a/audio-players/ripperx/HISTORY b/audio-players/ripperx/HISTORY
index 170fcd6..4ff6ea9 100644
--- a/audio-players/ripperx/HISTORY
+++ b/audio-players/ripperx/HISTORY
@@ -1,3 +1,6 @@
+2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.7.3
+
2008-08-28 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.7.2
* DEPENDS: switched from gtk+ to gtk+2, added dependency on glib2,
diff --git a/audio-soft/rockbox-utility/DETAILS
b/audio-soft/rockbox-utility/DETAILS
index f517e75..20ca05e 100755
--- a/audio-soft/rockbox-utility/DETAILS
+++ b/audio-soft/rockbox-utility/DETAILS
@@ -1,9 +1,9 @@
SPELL=rockbox-utility
- VERSION=1.2.10
- SOURCE="rbutil_${VERSION}-src.tar.bz2"
+ VERSION=1.2.13
+ SOURCE="RockboxUtility-v${VERSION}-src.tar.bz2"
SOURCE_URL[0]=http://download.rockbox.org/rbutil/source/${SOURCE}
-
SOURCE_HASH=sha512:6b6f92c4b9d3abacc9b53b1c72be968f6c2d74267d5b4920346a96e52e4f7dcfeb7a801f81e44a97fedf6d545c10e13db0ca0873f6745ffd3cfb69489477de60
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/rbutil_${VERSION}"
+
SOURCE_HASH=sha512:bf456f85114ee87ced58465014b2d881c0c7f98294ff7ad6bc8edbbaafb0420b44b7231af040bc2d9128736fd3e16ea2712924b5a97c2ca68aee728bd9b56459
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/RockboxUtility-v${VERSION}"
WEB_SITE="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility";
LICENSE[0]=GPL
ENTERED=20090529
diff --git a/audio-soft/rockbox-utility/HISTORY
b/audio-soft/rockbox-utility/HISTORY
index 718a949..660eb0d 100644
--- a/audio-soft/rockbox-utility/HISTORY
+++ b/audio-soft/rockbox-utility/HISTORY
@@ -1,3 +1,6 @@
+2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.2.13, fixed SOURCE and
SOURCE_DIRECTORY
+
2011-08-18 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.2.10
* BUILD: source is now in one more subdirectory
diff --git a/chat-libs/libmsn/DETAILS b/chat-libs/libmsn/DETAILS
index c9ab8c8..139aad0 100755
--- a/chat-libs/libmsn/DETAILS
+++ b/chat-libs/libmsn/DETAILS
@@ -1,7 +1,7 @@
SPELL=libmsn
- VERSION=4.2
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:8bdb25c08f36e0f3b10d190cdef703fecba419fcd5e4cd9d56c94ddff2e5f21b033204511b15d091302aa8ef41f7dff46996d2497f98570c0fc337427a7084d0
+ VERSION=4.2.1
+ PATCHLEVEL=0
+
SOURCE_HASH=sha512:e657f6c18ee608c6b3c028896544fc61d54e5f7dd0abe670d1e1b218c7210933c57086466f86d667d42d26358b6ad579a13a7a108882e9c5d7768fb97fd83ce6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-libs/libmsn/HISTORY b/chat-libs/libmsn/HISTORY
index 184d221..563b9a1 100644
--- a/chat-libs/libmsn/HISTORY
+++ b/chat-libs/libmsn/HISTORY
@@ -1,3 +1,8 @@
+2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 4.2.1
+ * PRE_BUILD, fix-header.patch, openssl-1.0.0.patch: removed patches,
+ included upstream
+
2011-11-23 Bor Kraljič <pyrobor AT ver.si>
* fix-header.patch: added patch (fixes compile of kdenetwork4)
patch was taken from Arch Linux
diff --git a/chat-libs/libmsn/PRE_BUILD b/chat-libs/libmsn/PRE_BUILD
deleted file mode 100755
index 1f16044..0000000
--- a/chat-libs/libmsn/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-# Only apply with OpenSSL 1.0.0+
-if [[ "$(installed_version openssl|sed 's:[a-z]::g'|sed 's:\.::g'|sed
's:^0::')" -ge "100" ]]; then
- message "${MESSAGE_COLOR}Applying OpenSSL 1.0.0+ patch...${DEFAULT_COLOR}"
&&
- patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch
-fi &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/fix-header.patch
diff --git a/chat-libs/libmsn/fix-header.patch
b/chat-libs/libmsn/fix-header.patch
deleted file mode 100644
index 82fae6f..0000000
--- a/chat-libs/libmsn/fix-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libmsn-4.2/msn/CMakeLists.txt.xmlParser_h
libmsn-4.2/msn/CMakeLists.txt
---- libmsn-4.2/msn/CMakeLists.txt.xmlParser_h 2010-01-05 06:07:08.000000000
-0600
-+++ libmsn-4.2/msn/CMakeLists.txt 2011-11-18 17:00:37.758298054 -0600
-@@ -37,7 +37,7 @@ set(msn_HEADERS
- buddy.h
- passport.h
- sstream_fix.h
-- soap.h
-+ soap.h xmlParser.h
- p2p.h
- msnobject.h
- libmsn_export.h)
diff --git a/chat-libs/libmsn/openssl-1.0.0.patch
b/chat-libs/libmsn/openssl-1.0.0.patch
deleted file mode 100644
index 73d7ba9..0000000
--- a/chat-libs/libmsn/openssl-1.0.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libmsn-4.1.orig/msntest/msntest.cpp libmsn-4.1/msntest/msntest.cpp
---- libmsn-4.1.orig/msntest/msntest.cpp 2010-01-05 13:07:08.000000000
+0100
-+++ libmsn-4.1/msntest/msntest.cpp 2010-12-29 10:37:11.000000000 +0100
-@@ -259,7 +259,7 @@
- if(mySocketsSsl[i].isSSL &&
!mySocketsSsl[i].isConnected)
- {
- BIO *bio_socket_new;
-- SSL_METHOD *meth=NULL;
-+ const SSL_METHOD *meth=NULL;
- meth=SSLv23_client_method();
- SSLeay_add_ssl_algorithms();
- mySocketsSsl[i].ctx = SSL_CTX_new(meth);
diff --git a/crypto/cryptsetup-luks/DETAILS b/crypto/cryptsetup-luks/DETAILS
index 83174e1..e933868 100755
--- a/crypto/cryptsetup-luks/DETAILS
+++ b/crypto/cryptsetup-luks/DETAILS
@@ -1,9 +1,9 @@
SPELL=cryptsetup-luks
- VERSION=1.4.1
+ VERSION=1.4.2
SOURCE=cryptsetup-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/cryptsetup-$VERSION
SOURCE_URL[0]=http://cryptsetup.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:663e6d90a19ff64e2b37e4b7b14bfb3f6ccdbabf0598b3a7c4a79409c0075884dbc9e3d6f93a4298254fee2f47be98b040d2eced6890c5575db96aaee2d13e8d
+
SOURCE_HASH=sha512:00927efa1cddfd43113c3fab3b21a9877810328fe162c55e8a5f946268a039ed2b556d9932d4afb2b4a62d4268fed7726b3e21ab2583320a259b21351b1cd961
WEB_SITE=http://code.google.com/p/cryptsetup/
ENTERED=20060117
LICENSE[0]=GPL
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index 41bfead..a8d9128 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,6 @@
+2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.4.2
+
2011-12-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.1

diff --git a/crypto/libgcrypt/DETAILS b/crypto/libgcrypt/DETAILS
index 65b3d2e..386ce46 100755
--- a/crypto/libgcrypt/DETAILS
+++ b/crypto/libgcrypt/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE2_IGNORE=signature

- WEB_SITE=http://www.gnu.org/directory/security/libgcrypt.html
+ WEB_SITE=http://directory.fsf.org/wiki/Libgcrypt
ENTERED=20020212
PATCHLEVEL=0
LICENSE[0]=GPL
diff --git a/crypto/libgcrypt/HISTORY b/crypto/libgcrypt/HISTORY
index c252bc0..d8d4ebf 100644
--- a/crypto/libgcrypt/HISTORY
+++ b/crypto/libgcrypt/HISTORY
@@ -1,3 +1,6 @@
+2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: fixed WEB_SITE
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 1563ad8..0f3854f 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi

case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8u
- SECURITY_PATCH=16
+ VERSION=0.9.8v
+ SECURITY_PATCH=17
;;
1.0)
- VERSION=1.0.0h
- SECURITY_PATCH=16
+ VERSION=1.0.0i
+ SECURITY_PATCH=17
PATCHLEVEL=0
;;
esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 2125561..2a9816e 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2012-04-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.8v, 1.0.0i, SECURITY_PATCH=17
+ http://www.openssl.org/news/secadv_20120419.txt
+
2012-03-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8u, 1.0.0h, SECURITY_PATCH=16
http://www.openssl.org/news/secadv_20120312.txt
diff --git a/crypto/pkcs11-helper/DETAILS b/crypto/pkcs11-helper/DETAILS
index 91e1cec..a652f53 100755
--- a/crypto/pkcs11-helper/DETAILS
+++ b/crypto/pkcs11-helper/DETAILS
@@ -1,9 +1,9 @@
SPELL=pkcs11-helper
- VERSION=1.09
+ VERSION=1.10
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.opensc-project.org/files/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:e5a93d291bdbd6e93a276acba5853e873ed967a1a39983927d7c6fb7cc7137f89b68d10c7cafd4e8b1847e344cccbb9117f2216ab7bbebddf80b2348a7fdb2b2
+ SOURCE_URL[0]=https://github.com/downloads/alonbl/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:7d1614cec8586779fe6c1fb15f66f1e33281675d1274677730b91a3188f07ec5809f043a597be2cea40113545d336a67ccbb2f7368556dab7173e33a01455287
LICENSE[0]=BSD
WEB_SITE=http://www.opensc-project.org/opensc/wiki/pkcs11-helper
ENTERED=20090103
diff --git a/crypto/pkcs11-helper/HISTORY b/crypto/pkcs11-helper/HISTORY
index 4c17742..80dee44 100644
--- a/crypto/pkcs11-helper/HISTORY
+++ b/crypto/pkcs11-helper/HISTORY
@@ -1,3 +1,6 @@
+2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.10, fixed SOURCE_URL
+
2011-08-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.09

diff --git a/devel/apiextractor/BUILD b/devel/apiextractor/BUILD
deleted file mode 100755
index 2113434..0000000
--- a/devel/apiextractor/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-qt4_cmake_build
diff --git a/devel/apiextractor/DEPENDS b/devel/apiextractor/DEPENDS
deleted file mode 100755
index b3f4795..0000000
--- a/devel/apiextractor/DEPENDS
+++ /dev/null
@@ -1,9 +0,0 @@
-depends -sub CXX gcc &&
-depends qt4 &&
-depends cmake &&
-depends openssl &&
-depends libxml2 &&
-depends libxslt &&
-if [[ $PYSIDE == git ]];then
- depends git
-fi
diff --git a/devel/apiextractor/DETAILS b/devel/apiextractor/DETAILS
deleted file mode 100755
index 4e4e1d7..0000000
--- a/devel/apiextractor/DETAILS
+++ /dev/null
@@ -1,26 +0,0 @@
- SPELL=apiextractor
- WEB_SITE=http://www.pyside.org/
-if [[ $PYSIDE == git ]];then
- VERSION=git
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=git://gitorious.org/pyside/$SPELL.git:$SPELL-git
- FORCE_DOWNLOAD=on
- SOURCE_IGNORE=volatile
-else
- VERSION=0.10.10
-
SOURCE_HASH=sha512:8279ba89b78d54bda6499405c9c6e9870407f01a498e5f15a41ab83a5f77fcf02ccdc925f6c93e257bcc1768a2c627f3c06ecfcd7624132b460abe2b935d1a98
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
-fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- ENTERED=20080921
- LICENSE[0]=LGPL
- KEYWORDS="libs"
- SHORT="extract API information for a library"
-cat << EOF
-API Extractor collects information about libraries from its header files
-and merges it with user
-written files (typesystem) describing how the library should be exposed as
-a binding on the target
-language.
-EOF
diff --git a/devel/apiextractor/HISTORY b/devel/apiextractor/HISTORY
deleted file mode 100644
index 2821cfc..0000000
--- a/devel/apiextractor/HISTORY
+++ /dev/null
@@ -1,91 +0,0 @@
-2012-01-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.10.10
-
-2011-11-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.10.9
-
-2011-10-22 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.10.8
-
-2011-10-14 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: fixed long description wrap (scripted)
-
-2011-09-22 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.10.7
-
-2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: changed dependency on g++ to dependency on gcc with
- sub-depends on CXX (scripted)
-
-2011-06-23 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.10.4
-
-2011-05-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.10.3
-
-2011-04-30 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.10.2
-
-2011-04-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.10.1
-
-2011-02-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.10.0
-
-2011-02-05 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.9.4
-
-2011-01-08 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.9.2
-
-2010-12-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.9.1
-
-2010-11-26 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.9.0
-
-2010-10-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.8.1
- * HISTORY: fix previous typo
-
-2010-09-17 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.8.0
-
-2010-09-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.7.0
-
-2010-04-01 Treeve Jelbert <treeve AT sourcemage.org>
- * TRIGGERS: delete obsolete trigger
-
-2010-03-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.4.0
- * DEPENDS: remove boost
-
-2010-01-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.3
- * PRE_BUILD: update sed
-
-2009-12-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.2
-
-2009-11-07 Treeve Jelbert <treeve AT sourcemage.org>
- * PRE_BUILD: fix location for cmake modules
- better fix
-
-2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.1
-
-2009-09-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3
-
-2009-08-27 Treeve Jelbert <treeve AT sourcemage.org>
- * TRIGGERS: added
-
-2009-08-25 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.2
- * PREPARE: added
- * DEPENDS: git only for git version
-
-2009-08-21 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version git
- spell created
diff --git a/devel/apiextractor/PREPARE b/devel/apiextractor/PREPARE
deleted file mode 100755
index b5f9bde..0000000
--- a/devel/apiextractor/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_list PYSIDE 'which version to build?' stable git
diff --git a/devel/apiextractor/PRE_BUILD b/devel/apiextractor/PRE_BUILD
deleted file mode 100755
index 3dc25df..0000000
--- a/devel/apiextractor/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# fix location of cmake modules
-sed -i
's|share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}|${CMAKE_ROOT}|'
CMakeLists.txt
diff --git a/devel/cmake/DETAILS b/devel/cmake/DETAILS
index 926c3bb..9268d91 100755
--- a/devel/cmake/DETAILS
+++ b/devel/cmake/DETAILS
@@ -1,6 +1,6 @@
SPELL=cmake
- VERSION=2.8.7
-
SOURCE_HASH=sha512:2b48bd922a2fcd7569e610c823cbaa061178b112e045de2c97da5fd9591224ebb211e2e8688af0eb140d9762e87fa5e41d1324a80c57a933870a801914ba6431
+ VERSION=2.8.8
+
SOURCE_HASH=sha512:db31b1335c9964504a080a665c9e23010e081e973ba948b2d55a5adff76183271677c94830f2b604b06337df110eec29a8e8749795576c662c0b2f50fe69c882
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.cmake.org/files/v${VERSION%.*}/$SOURCE
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index 4d59f05..ba94688 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,6 @@
+2012-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.8.8
+
2012-02-28 Ladislav Hagara <hgr AT vabo.cz>
* CONFLICTS: removed, colormake now install colormake not cmake

diff --git a/devel/generatorrunner/BUILD b/devel/generatorrunner/BUILD
deleted file mode 100755
index 2113434..0000000
--- a/devel/generatorrunner/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-qt4_cmake_build
diff --git a/devel/generatorrunner/CONFLICTS b/devel/generatorrunner/CONFLICTS
deleted file mode 100755
index 818c563..0000000
--- a/devel/generatorrunner/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts boostpythongenerator y
diff --git a/devel/generatorrunner/DEPENDS b/devel/generatorrunner/DEPENDS
deleted file mode 100755
index d417274..0000000
--- a/devel/generatorrunner/DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-depends qt4 &&
-depends cmake &&
-depends apiextractor &&
-if [[ $PYSIDE == git ]];then
- depends git
-fi
diff --git a/devel/generatorrunner/DETAILS b/devel/generatorrunner/DETAILS
deleted file mode 100755
index 262e131..0000000
--- a/devel/generatorrunner/DETAILS
+++ /dev/null
@@ -1,22 +0,0 @@
- SPELL=generatorrunner
- WEB_SITE=http://www.pyside.org/
-if [[ $PYSIDE == git ]];then
- VERSION=git
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=git://gitorious.org/pyside/$SPELL.git:$SPELL-git
- FORCE_DOWNLOAD=on
- SOURCE_IGNORE=volatile
-else
- VERSION=0.6.16
-
SOURCE_HASH=sha512:b75685f99108ccab9774637ec1d37d40df6eb16db4c6cb144b65226f4ccdb369d3b55cfa8ff34eeef6f177b6990a2dd0b2184bfd3361e6cb7a3912ebe698d0d0
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
-fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- ENTERED=20091006
- LICENSE[0]=LGPL
- KEYWORDS="python libs"
- SHORT="Python bindings generator"
-cat << EOF
-Python binding generator based on Boost.Python
-EOF
diff --git a/devel/generatorrunner/HISTORY b/devel/generatorrunner/HISTORY
deleted file mode 100644
index 931efbf..0000000
--- a/devel/generatorrunner/HISTORY
+++ /dev/null
@@ -1,67 +0,0 @@
-2012-01-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.16
-
-2011-11-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.15
-
-2011-10-22 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.14
-
-2011-09-22 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.13
-
-2011-06-23 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.11
-
-2011-05-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.10
-
-2011-04-30 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.9
-
-2011-04-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.8
-
-2011-03-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.7
-
-2011-02-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.6
-
-2011-02-05 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.5
-
-2010-11-26 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.3
-
-2010-10-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.2
-
-2010-09-17 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.1
-
-2010-09-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6.0
-
-2010-03-30 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.4.0
-
-2010-01-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.3
- * PRE_BUILD: update sed
-
-2009-12-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.2
-
-2009-11-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: delete boost, python
- * TRIGGERS: deleted
- * PRE_BUILD: fix location for cmake modules
-
-2009-10-10 Treeve Jelbert <treeve AT sourcemage.org>
- * PRE_BUILD: added
- remove version from cmake directory
-
-2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.1
- spell created
diff --git a/devel/generatorrunner/PREPARE b/devel/generatorrunner/PREPARE
deleted file mode 100755
index b5f9bde..0000000
--- a/devel/generatorrunner/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_list PYSIDE 'which version to build?' stable git
diff --git a/devel/generatorrunner/PRE_BUILD b/devel/generatorrunner/PRE_BUILD
deleted file mode 100755
index 3dc25df..0000000
--- a/devel/generatorrunner/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# fix location of cmake modules
-sed -i
's|share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}|${CMAKE_ROOT}|'
CMakeLists.txt
diff --git a/devel/pyside/DEPENDS b/devel/pyside/DEPENDS
index c923f5a..df40cde 100755
--- a/devel/pyside/DEPENDS
+++ b/devel/pyside/DEPENDS
@@ -2,7 +2,6 @@ depends cmake &&
depends qt4 &&
depends python &&
depends shiboken &&
-depends generatorrunner &&
# use this rather than qt's supplied phonon
depends phonon "-DQT_PHONON_INCLUDE_DIR=$INSTALL_ROOT/usr/include/phonon" &&
if [[ $PYSIDE == git ]];then
diff --git a/devel/pyside/DETAILS b/devel/pyside/DETAILS
index dfde705..3a6302a 100755
--- a/devel/pyside/DETAILS
+++ b/devel/pyside/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
else
- VERSION=qt4.7+1.1.0
-
SOURCE_HASH=sha512:0a80035a77d2e0d0a1da2f2294ba0370cfd9b5628479dbbfb9c6abc4b37dbd653c56a5051b5e840b9e2d45d647f9709a4954cda69faff6ae0e6049b9e8c2955f
+ VERSION=qt4.8+1.1.1
+
SOURCE_HASH=sha512:0738713da41fd0e3d59c01f1196cf6405e1982f446ec8d6594d4c3b9b3431b45eab1219b024755554612d625542bbe3d36d3f1a3215d7b8379549d89809e117b
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
fi
diff --git a/devel/pyside/HISTORY b/devel/pyside/HISTORY
index d5e19e8..549c63d 100644
--- a/devel/pyside/HISTORY
+++ b/devel/pyside/HISTORY
@@ -1,3 +1,7 @@
+2012-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version qt4.8+1.1.1
+ * DEPENDS: remove generatorrunner
+
2012-01-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version qt4.7+1.1.0

diff --git a/devel/shiboken/CONFLICTS b/devel/shiboken/CONFLICTS
new file mode 100755
index 0000000..360b793
--- /dev/null
+++ b/devel/shiboken/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts apiextractor y
+conflicts generatorrunner y
diff --git a/devel/shiboken/DEPENDS b/devel/shiboken/DEPENDS
index 93dc4bc..afe5fcd 100755
--- a/devel/shiboken/DEPENDS
+++ b/devel/shiboken/DEPENDS
@@ -1,7 +1,6 @@
depends qt4 &&
depends cmake &&
depends python &&
-depends apiextractor &&
if [[ $PYSIDE == git ]];then
depends git
fi
diff --git a/devel/shiboken/DETAILS b/devel/shiboken/DETAILS
index 8bfcf2e..6e735c5 100755
--- a/devel/shiboken/DETAILS
+++ b/devel/shiboken/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
else
- VERSION=1.1.0
-
SOURCE_HASH=sha512:92a31148832b347dea349548001f610cbf1345652cfb12bb6a4f72444067df15d509deefd2f1fec1a78f0848cb278559b3a20aa21e011be9b05c5ecb724b560a
+ VERSION=1.1.1
+
SOURCE_HASH=sha512:0bf76f82ae22a1ee42329ea08b4c4386cd949363e053e5e8575033ddd01e4a1277911c55f84bb6689caafc9dd5d1eb57a2806164b39522d9e62c19b2906e3147
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
fi
diff --git a/devel/shiboken/HISTORY b/devel/shiboken/HISTORY
index 2ac5c36..6ba72da 100644
--- a/devel/shiboken/HISTORY
+++ b/devel/shiboken/HISTORY
@@ -1,3 +1,9 @@
+2012-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.1
+ * DEPENDS: remove apiextractor
+ * CONFLICTS: added, apiextractor and generatorrunner
+ these are now included in shiboken
+
2012-01-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.o

diff --git a/ftp-libs/rb-libtorrent/DEPENDS b/ftp-libs/rb-libtorrent/DEPENDS
index a1c8af2..a21b62a 100755
--- a/ftp-libs/rb-libtorrent/DEPENDS
+++ b/ftp-libs/rb-libtorrent/DEPENDS
@@ -1,4 +1,3 @@
-depends zlib "--with-zlib=system" &&
depends -sub CXX gcc &&
depends boost &&
sub_depends boost THREAD &&
@@ -12,8 +11,8 @@ if list_find "$RB_LIBTORRENT_OPTS"
"--enable-python-binding"; then
fi &&

optional_depends openssl \
- "--with-ssl" \
- "--without-ssl" \
+ "" \
+ "" \
"for SSL support" &&

optional_depends geoip \
diff --git a/ftp-libs/rb-libtorrent/DETAILS b/ftp-libs/rb-libtorrent/DETAILS
index b623d76..4a86fe6 100755
--- a/ftp-libs/rb-libtorrent/DETAILS
+++ b/ftp-libs/rb-libtorrent/DETAILS
@@ -1,8 +1,8 @@
SPELL=rb-libtorrent
- VERSION=0.15.10
+ VERSION=0.16.0
SOURCE=libtorrent-rasterbar-$VERSION.tar.gz
SOURCE_URL[0]=http://libtorrent.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:b66791a62dc3478dcfd8d7045891bccb660af51a313feb795140353c249b00794cc031d6ad6c47020c0e29601c5da5a2f0f2dc646148c7e616285af8ef44bc70
+
SOURCE_HASH=sha512:1ad4ee0ce698a7ad8912031df18ef2d351424f171c8bdd584e2077595f05d001d9b19a7f3123ea7aade7ff1b582059d6ba504b821868f5dc87b9f2436985b048
SOURCE_DIRECTORY="$BUILD_DIRECTORY/libtorrent-rasterbar-$VERSION"
WEB_SITE=http://www.rasterbar.com/products/libtorrent/
LICENSE=BSD
diff --git a/ftp-libs/rb-libtorrent/HISTORY b/ftp-libs/rb-libtorrent/HISTORY
index aa7011d..097aced 100644
--- a/ftp-libs/rb-libtorrent/HISTORY
+++ b/ftp-libs/rb-libtorrent/HISTORY
@@ -1,3 +1,9 @@
+2012-04-19 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.16.0
+ * DEPENDS: removed zlib dependency, no longer needed
+ removed openssl flags, still optional, but flags no
+ longer valid
+
2012-02-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.15.10

diff --git a/ftp/deluge/DEPENDS b/ftp/deluge/DEPENDS
index 25b164b..818eff0 100755
--- a/ftp/deluge/DEPENDS
+++ b/ftp/deluge/DEPENDS
@@ -1,6 +1,4 @@
-depends pygtk2 &&
depends dbus-python &&
-depends librsvg2 &&
depends openssl &&
depends pyxdg &&
depends zlib &&
@@ -10,6 +8,10 @@ depends SETUPTOOLS &&
depends chardet &&
depends rb-libtorrent &&

+optional_depends pygtk2 "" "" "For gtk ui" &&
+optional_depends librsvg2 "" "" "For gtk ui" &&
+optional_depends notify-python "" "" "For libnotify notifications" &&
+
optional_depends mako \
'' \
'' \
diff --git a/ftp/deluge/DETAILS b/ftp/deluge/DETAILS
index 7be993d..261574a 100755
--- a/ftp/deluge/DETAILS
+++ b/ftp/deluge/DETAILS
@@ -1,9 +1,9 @@
SPELL=deluge
- VERSION=1.3.1
+ VERSION=1.3.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.deluge-torrent.org/source/$SOURCE
-
SOURCE_HASH=sha512:38f7922132d52fb2793a793f5a75ae03b90c4741a3e61b507217a8530e2669eb5fff523190378161220f12b436ff19eb07984160e27ffc5c3d78fbb5a891ebe2
+
SOURCE_HASH=sha512:1f976322f143375961189fdbb508b075904090e6797986499eee7865e7545b97b17871527a579e37e51b1273477f5d4f1a5468fbc6fee6cd5b6ff8f38ff9a686
LICENSE[0]=GPL
KEYWORDS="bittorrent client p2p"
WEB_SITE=http://www.deluge-torrent.org
diff --git a/ftp/deluge/HISTORY b/ftp/deluge/HISTORY
index cab3e5d..a7aa453 100644
--- a/ftp/deluge/HISTORY
+++ b/ftp/deluge/HISTORY
@@ -1,3 +1,8 @@
+2012-04-19 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.5
+ * DEPENDS: pygtk2 & librsvg2 should really be optional
+ added optional_depends notify-python for libnotify support
+
2011-05-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider

diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index d3df125..6d080d1 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,8 +1,8 @@
SPELL=epiphany
if [[ "$EPIPHANY_DEVEL" == "y" ]]; then
- VERSION=3.4.0.1
+ VERSION=3.4.1
else
- VERSION=3.4.0.1
+ VERSION=3.4.1
fi
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index d077177..c3e8102 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,6 @@
+2012-04-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.4.1
+
2012-04-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.0.1
* DEPENDS: gir-repository removed
diff --git a/gnome2-apps/epiphany/epiphany-3.4.0.1.tar.xz.sig
b/gnome2-apps/epiphany/epiphany-3.4.0.1.tar.xz.sig
deleted file mode 100644
index ba5c4af..0000000
Binary files a/gnome2-apps/epiphany/epiphany-3.4.0.1.tar.xz.sig and /dev/null
differ
diff --git a/gnome2-apps/epiphany/epiphany-3.4.1.tar.xz.sig
b/gnome2-apps/epiphany/epiphany-3.4.1.tar.xz.sig
new file mode 100644
index 0000000..cf29469
Binary files /dev/null and b/gnome2-apps/epiphany/epiphany-3.4.1.tar.xz.sig
differ
diff --git a/gnome2-apps/gcalctool/DETAILS b/gnome2-apps/gcalctool/DETAILS
index b363a11..d5dd205 100755
--- a/gnome2-apps/gcalctool/DETAILS
+++ b/gnome2-apps/gcalctool/DETAILS
@@ -1,7 +1,7 @@
SPELL=gcalctool
- VERSION=6.0.1
+ VERSION=6.4.1.1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-apps/gcalctool/HISTORY b/gnome2-apps/gcalctool/HISTORY
index 41044fd..8b2b6c9 100644
--- a/gnome2-apps/gcalctool/HISTORY
+++ b/gnome2-apps/gcalctool/HISTORY
@@ -1,3 +1,6 @@
+2012-04-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6.4.1.1
+
2012-03-12 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: made rarian optional and allow to choose between
gtk+2 and gtk+3
diff --git a/gnome2-apps/gcalctool/gcalctool-6.0.1.tar.gz.sig
b/gnome2-apps/gcalctool/gcalctool-6.0.1.tar.gz.sig
deleted file mode 100644
index 9ffd33e..0000000
Binary files a/gnome2-apps/gcalctool/gcalctool-6.0.1.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-apps/gcalctool/gcalctool-6.4.1.1.tar.xz.sig
b/gnome2-apps/gcalctool/gcalctool-6.4.1.1.tar.xz.sig
new file mode 100644
index 0000000..5198021
Binary files /dev/null and
b/gnome2-apps/gcalctool/gcalctool-6.4.1.1.tar.xz.sig differ
diff --git a/gnome2-libs/at-spi2-core/DETAILS
b/gnome2-libs/at-spi2-core/DETAILS
index 08d7b5c..8c7355e 100755
--- a/gnome2-libs/at-spi2-core/DETAILS
+++ b/gnome2-libs/at-spi2-core/DETAILS
@@ -1,5 +1,5 @@
SPELL=at-spi2-core
- VERSION=2.4.0
+ VERSION=2.4.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/at-spi2-core/HISTORY
b/gnome2-libs/at-spi2-core/HISTORY
index 5ddad84..e3612b5 100644
--- a/gnome2-libs/at-spi2-core/HISTORY
+++ b/gnome2-libs/at-spi2-core/HISTORY
@@ -1,3 +1,6 @@
+2012-04-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.1
+
2012-04-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.0

diff --git a/gnome2-libs/at-spi2-core/at-spi2-core-2.4.0.tar.xz.sig
b/gnome2-libs/at-spi2-core/at-spi2-core-2.4.0.tar.xz.sig
deleted file mode 100644
index 3a5c718..0000000
Binary files a/gnome2-libs/at-spi2-core/at-spi2-core-2.4.0.tar.xz.sig and
/dev/null differ
diff --git a/gnome2-libs/at-spi2-core/at-spi2-core-2.4.1.tar.xz.sig
b/gnome2-libs/at-spi2-core/at-spi2-core-2.4.1.tar.xz.sig
new file mode 100644
index 0000000..4c678f7
Binary files /dev/null and
b/gnome2-libs/at-spi2-core/at-spi2-core-2.4.1.tar.xz.sig differ
diff --git a/gnome2-libs/gdm2/DETAILS b/gnome2-libs/gdm2/DETAILS
index 3b3b066..70081e4 100755
--- a/gnome2-libs/gdm2/DETAILS
+++ b/gnome2-libs/gdm2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gdm2
- VERSION=3.4.0.1
+ VERSION=3.4.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gdm-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gdm-$VERSION
diff --git a/gnome2-libs/gdm2/HISTORY b/gnome2-libs/gdm2/HISTORY
index 29276c4..c83cd01 100644
--- a/gnome2-libs/gdm2/HISTORY
+++ b/gnome2-libs/gdm2/HISTORY
@@ -1,3 +1,6 @@
+2012-04-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.4.1
+
2012-04-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.0.1

diff --git a/gnome2-libs/gdm2/gdm-3.4.0.1.tar.xz.sig
b/gnome2-libs/gdm2/gdm-3.4.0.1.tar.xz.sig
deleted file mode 100644
index f68bd57..0000000
Binary files a/gnome2-libs/gdm2/gdm-3.4.0.1.tar.xz.sig and /dev/null differ
diff --git a/gnome2-libs/gdm2/gdm-3.4.1.tar.xz.sig
b/gnome2-libs/gdm2/gdm-3.4.1.tar.xz.sig
new file mode 100644
index 0000000..2aea489
Binary files /dev/null and b/gnome2-libs/gdm2/gdm-3.4.1.tar.xz.sig differ
diff --git a/libs/boost/BUILD b/libs/boost/BUILD
index ddb1dc5..761c61d 100755
--- a/libs/boost/BUILD
+++ b/libs/boost/BUILD
@@ -20,9 +20,15 @@ if list_find "${BOOST_LIBS}" "graph" ||
local EXPAT_INCLUDE=/usr/lib
local EXPAT_LIBPATH=/usr/include
fi &&
-./bootstrap.sh --with-toolset=gcc \
- -prefix=${INSTALL_ROOT}/usr \
- --with-libraries=${BOOST_LIBS} &&
+
+BOOTSTRAP_FLAGS="--with-toolset=gcc -prefix=${INSTALL_ROOT}/usr" &&
+
+# Don't specify with-libraries when you don't select them so it builds them
all
+if [[ $BOOST_SELECT_LIBS == "y" ]]; then
+ BOOTSTRAP_FLAGS="${BOOTSTRAP_FLAGS} --with-libraries=${BOOST_LIBS}"
+fi &&
+./bootstrap.sh $BOOTSTRAP_FLAGS &&
+
OPTS="$OPTS $BLIST" &&
CXXFLAGS="$CXXFLAGS" \
EXPAT_INCLUDE=$EXPAT_INCLUDE \
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 8c29dfa..6b37f31 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,5 +1,9 @@
+2012-04-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: Dont build with --with-libraries specified
+ when you don't select them, so all libs are built
+
2012-04-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS, BUILD: fixed selectable libraries, this fixes bug #385
+ * DEPENDS, BUILD: fixed selectable libraries, this fixes bug #385

2012-04-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, CONFIGURE, DEPENDS, PRE_SUB_DEPENDS,
REPAIR^all^PRE_SUB_DEPENDS,
diff --git a/libs/boost/boost_1_48_0.tar.bz2.sig
b/libs/boost/boost_1_48_0.tar.bz2.sig
deleted file mode 100644
index 13ceca5..0000000
Binary files a/libs/boost/boost_1_48_0.tar.bz2.sig and /dev/null differ
diff --git a/libs/libvdpau/HISTORY b/libs/libvdpau/HISTORY
index 46cd8f3..2cf9a57 100644
--- a/libs/libvdpau/HISTORY
+++ b/libs/libvdpau/HISTORY
@@ -1,3 +1,6 @@
+2012-04-19 Sukneet Basuta <sukneet AT sourcemage.org>
+ * TRIGGERS: added, needs to be recast when nvidia_driver is
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/libs/libvdpau/TRIGGERS b/libs/libvdpau/TRIGGERS
new file mode 100755
index 0000000..ce7bb5a
--- /dev/null
+++ b/libs/libvdpau/TRIGGERS
@@ -0,0 +1 @@
+on_cast nvidia_driver cast_self
diff --git a/python-pypi/distribute/DETAILS b/python-pypi/distribute/DETAILS
index 1f8d093..e56951d 100755
--- a/python-pypi/distribute/DETAILS
+++ b/python-pypi/distribute/DETAILS
@@ -1,5 +1,5 @@
SPELL=distribute
- VERSION=0.6.24
+ VERSION=0.6.26
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 b3c1937..b6e90c8 100644
--- a/python-pypi/distribute/HISTORY
+++ b/python-pypi/distribute/HISTORY
@@ -1,3 +1,6 @@
+2012-04-19 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.6.26
+
2011-11-18 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.6.24
switched to guru signed verification
diff --git a/python-pypi/distribute/distribute-0.6.24.tar.gz.sig
b/python-pypi/distribute/distribute-0.6.24.tar.gz.sig
deleted file mode 100644
index 4bff251..0000000
Binary files a/python-pypi/distribute/distribute-0.6.24.tar.gz.sig and
/dev/null differ
diff --git a/python-pypi/distribute/distribute-0.6.26.tar.gz.sig
b/python-pypi/distribute/distribute-0.6.26.tar.gz.sig
new file mode 100644
index 0000000..1198efc
Binary files /dev/null and
b/python-pypi/distribute/distribute-0.6.26.tar.gz.sig differ
diff --git a/utils/aide/DEPENDS b/utils/aide/DEPENDS
index 0cd1436..3ebb275 100755
--- a/utils/aide/DEPENDS
+++ b/utils/aide/DEPENDS
@@ -1,3 +1,4 @@
+depends flex &&
depends bison &&
depends mhash &&

diff --git a/utils/aide/DETAILS b/utils/aide/DETAILS
index 86e33e4..ed596b7 100755
--- a/utils/aide/DETAILS
+++ b/utils/aide/DETAILS
@@ -1,10 +1,10 @@
SPELL=aide
- VERSION=0.13.1
+ VERSION=0.15.1
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:ac0e49c49d1a4229cf473a60e9acd8e7dc7c3ee7c2d436a3b3d486131753fd914a73695675de6e7f9bb5cdadb2ed64760a9e834c935fb1a5c65bae0d7efa2946
+
SOURCE_HASH=sha512:6afe327474858c697ba017b02bd40717c33874e69b801c171c2496ff9042b557e840bef4a151bda0e4d835ddb0d972b88790237a72f250525dc1fc6b8fa673e7
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- WEB_SITE=http://www.cs.tut.fi/~rammer/aide.html
+ WEB_SITE=http://aide.sourceforge.net
ENTERED=20011207
KEYWORDS="utils"
SHORT="Advanced Intrusion Detection Environment"
diff --git a/utils/aide/HISTORY b/utils/aide/HISTORY
index 0ae8e89..1c3ccb7 100644
--- a/utils/aide/HISTORY
+++ b/utils/aide/HISTORY
@@ -1,3 +1,8 @@
+2012-04-18 David Haley <khoralin AT gmail.com>
+ * DETAILS: updated to 0.15.1
+ website has been updated
+ * DEPENDS: added flex
+
2009-12-18 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: updated to 0.13.1, reworded short
* INSTALL: added, to install an example config file
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index fb0fe58..e6514fc 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,7 @@
+2012-04-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply the patch; use is_version_less()
+ * glib232.patch: added, to fix build with glib2 >= 2.32
+
2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: use ACPI provider

diff --git a/utils/hal/PRE_BUILD b/utils/hal/PRE_BUILD
index bf0c4dc..375a0fa 100755
--- a/utils/hal/PRE_BUILD
+++ b/utils/hal/PRE_BUILD
@@ -1,9 +1,15 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

message "${MESSAGE_COLOR}Apply Linux 2.6.38+ headers
patch...${DEFAULT_COLOR}" &&
patch -p1 < "${SPELL_DIRECTORY}"/linux-2.6.38-v4l.patch &&

+if spell_ok glib2 && ! is_version_less $(installed_version glib2) 2.32; then
+ patch -p0 < "$SPELL_DIRECTORY/glib232.patch"
+fi &&
+
if [[ $HAL_VER == devel ]]; then
NOCONFIGURE=1 ./autogen.sh
fi
diff --git a/utils/hal/glib232.patch b/utils/hal/glib232.patch
new file mode 100644
index 0000000..9f821b3
--- /dev/null
+++ b/utils/hal/glib232.patch
@@ -0,0 +1,129 @@
+--- hald/linux/addons/addon-acpi-buttons-toshiba.c.orig
++++ hald/linux/addons/addon-acpi-buttons-toshiba.c
+@@ -40,7 +40,7 @@
+ #include <string.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+
+ #include "libhal/libhal.h"
+ #include "../../logger.h"
+--- hald/linux/addons/addon-dell-backlight.cpp.orig
++++ hald/linux/addons/addon-dell-backlight.cpp
+@@ -29,7 +29,7 @@
+
+ #include <string.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-generic-backlight.c.orig
++++ hald/linux/addons/addon-generic-backlight.c
+@@ -35,7 +35,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-imac-backlight.c.orig
++++ hald/linux/addons/addon-imac-backlight.c
+@@ -29,7 +29,7 @@
+ #include <stdlib.h>
+ #include <sys/io.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-input.c.orig
++++ hald/linux/addons/addon-input.c
+@@ -41,7 +41,7 @@
+ #else
+ #include <linux/input.h>
+ #endif
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <glib/gprintf.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-ipw-killswitch.c.orig
++++ hald/linux/addons/addon-ipw-killswitch.c
+@@ -36,7 +36,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/gmain.h>
+ #include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+--- hald/linux/addons/addon-leds.c.orig
++++ hald/linux/addons/addon-leds.c
+@@ -36,7 +36,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/gmain.h>
+ #include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+--- hald/linux/addons/addon-macbookpro-backlight.c.orig
++++ hald/linux/addons/addon-macbookpro-backlight.c
+@@ -39,7 +39,7 @@
+ #include <pci/pci.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-omap-backlight.c.orig
++++ hald/linux/addons/addon-omap-backlight.c
+@@ -41,7 +41,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-rfkill-killswitch.c.orig
++++ hald/linux/addons/addon-rfkill-killswitch.c
+@@ -36,7 +36,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/gmain.h>
+ #include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+--- hald/linux/addons/addon-storage.c.orig
++++ hald/linux/addons/addon-storage.c
+@@ -39,7 +39,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-usb-csr.c.orig
++++ hald/linux/addons/addon-usb-csr.c
+@@ -29,7 +29,7 @@
+ #include <string.h>
+ #include <usb.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (ba1b37f70ee807af981c558b684cbaff5abe8ee6), Vlad Glagolev, 04/20/2012

Archive powered by MHonArc 2.6.24.

Top of Page