Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (f43078e051b07f1e3df59cca3fbd09dc80fa0bfd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (f43078e051b07f1e3df59cca3fbd09dc80fa0bfd)
  • Date: Mon, 9 Apr 2012 16:21:31 -0500

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

audio-creation/rakarrack/DETAILS | 2
audio-creation/rakarrack/HISTORY | 6
audio-creation/rakarrack/PRE_BUILD | 4
audio-creation/rakarrack/rakarrack-0.6.1.flinclude.patch | 25
crypto/ccid/DETAILS | 6
crypto/ccid/HISTORY | 3
crypto/pcsc-lite/DETAILS | 6
crypto/pcsc-lite/HISTORY | 3
dev/null |binary
e-16/e16/DETAILS | 4
e-16/e16/HISTORY | 3
gnome2-apps/pan/DETAILS | 8
gnome2-apps/pan/HISTORY | 3
gnome2-libs/mx/DETAILS | 2
gnome2-libs/mx/HISTORY | 3
gnome2-libs/mx/mx-1.4.2.tar.bz2.sig | 0
gnome2-libs/mx/mx-1.4.5.tar.bz2.sig |binary
gnustep-libs/gnustep-base/DEPENDS | 6
gnustep-libs/gnustep-base/DETAILS | 2
gnustep-libs/gnustep-base/HISTORY | 7
gnustep-libs/gnustep-gui/DEPENDS | 4
gnustep-libs/gnustep-gui/DETAILS | 2
gnustep-libs/gnustep-gui/HISTORY | 4
gnustep-libs/gnustep-make/DETAILS | 2
gnustep-libs/gnustep-make/HISTORY | 3
graphics/vym/DETAILS | 4
graphics/vym/HISTORY | 3
libs/icu/DETAILS | 8
libs/icu/HISTORY | 3
mail/dovecot/DETAILS | 6
mail/dovecot/HISTORY | 3
python-pypi/alembic/DETAILS | 4
python-pypi/alembic/HISTORY | 3
x11-toolkits/qt4/HISTORY | 7
x11-toolkits/qt4/PRE_BUILD | 4
x11-toolkits/qt4/qt-4.8-glib-2.32.patch | 28
x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch | 33
x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch | 345
++++++++++
38 files changed, 497 insertions(+), 62 deletions(-)

New commits:
commit 3bb796b97ae5531555103a757cd78426779986ca
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnustep-libs/gnustep-gui: version 0.22.0

commit bad71158ea49bbccac6dbfb6a0212dac92360c06
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnustep-libs/gnustep-base: version 1.24.0

commit ca68e16c616a4dc3081dd289719bdd65e86287c7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

Revert "gnustep-libs/gnustep-base: version 1.24.0"

This reverts commit 566bb59d3369aa4a537293e12d25cd1d00512bd2.

commit 566bb59d3369aa4a537293e12d25cd1d00512bd2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnustep-libs/gnustep-base: version 1.24.0

commit b83534b21175a6b6e53f2f1b4c3563fa3de298eb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnustep-libs/gnustep-make: version 2.6.2

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

vym 2.0.10

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

qt4 now works with gcc 4.7

commit 5d2abb0fe4d224f01084be166d17632e95e6250f
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

dovecot: update to 2.0.20, pigeonhole to 0.2.26

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

e16 1.0.10

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

ccid 1.4.6

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

pcsc-lite 1.8.3

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

alembic: => 0.3.1

commit ec50c5d2e3267b9f037aac694d1b46497096a773
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

rakarrack: fix build with current fltk

commit f58dac1175d1f82f60699d380a4a9a3fada5ff18
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

rakarrack: fix website

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

mx 1.4.5

commit 476d853824d0f768e6b478e84ef33e834322c24a
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

Are all the problems with this version really solved so soon?
At least on my box this version breaks a *lot*

Revert "libs/icu: version 49.1"

This reverts commit a558a4646b6705955c0b6d909c02eb4d08577e1e.

commit c826b670864f529984fb417f6567fca93f497721
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

pan: Updated to version 0.136

diff --git a/audio-creation/rakarrack/DETAILS
b/audio-creation/rakarrack/DETAILS
index 16cf6ba..36bb71d 100755
--- a/audio-creation/rakarrack/DETAILS
+++ b/audio-creation/rakarrack/DETAILS
@@ -4,7 +4,7 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE_HASH=sha512:ac71e3915b44fc57904640662ebf4f1b40d2ef520b048b1586cc465964984896b236dae259c70f3f0a185396747ae73729a1cc2c490568f1c4e9238b7c1e9ce5
- WEB_SITE=http://jack-rack.sourceforge.net/
+ WEB_SITE=http://rakarrack.sourceforge.net/
ENTERED=20031208
LICENSE[0]=GPL
KEYWORDS="jack audio guitar"
diff --git a/audio-creation/rakarrack/HISTORY
b/audio-creation/rakarrack/HISTORY
index 47cb8c4..6ac95f5 100644
--- a/audio-creation/rakarrack/HISTORY
+++ b/audio-creation/rakarrack/HISTORY
@@ -1,3 +1,7 @@
+2012-04-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: fix website
+ * rakarrack-0.6.1.flinclude.patch, PRE_BUILD:
+ fix wrong fltk include path (fltk-1.3)
+
2010-11-16 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS, DETAILS: Created
-
diff --git a/audio-creation/rakarrack/PRE_BUILD
b/audio-creation/rakarrack/PRE_BUILD
new file mode 100755
index 0000000..cdcbf20
--- /dev/null
+++ b/audio-creation/rakarrack/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -Np1 < "$SCRIPT_DIRECTORY/rakarrack-0.6.1.flinclude.patch"
+
diff --git a/audio-creation/rakarrack/rakarrack-0.6.1.flinclude.patch
b/audio-creation/rakarrack/rakarrack-0.6.1.flinclude.patch
new file mode 100644
index 0000000..791e2ba
--- /dev/null
+++ b/audio-creation/rakarrack/rakarrack-0.6.1.flinclude.patch
@@ -0,0 +1,25 @@
+Only in rakarrack-0.6.1/src: config.h
+diff -ru rakarrack-0.6.1/src/global.h rakarrack-0.6.1.flinclude/src/global.h
+--- rakarrack-0.6.1/src/global.h 2010-10-01 03:44:53.000000000 +0200
++++ rakarrack-0.6.1.flinclude/src/global.h 2012-04-09 10:52:58.000000000
+0200
+@@ -99,7 +99,7 @@
+ #include <X11/xpm.h>
+ #include <jack/jack.h>
+ #include <jack/midiport.h>
+-#include <Fl/Fl_Preferences.H>
++#include <FL/Fl_Preferences.H>
+ #include "FPreset.h"
+ #include "Reverb.h"
+ #include "Chorus.h"
+diff -ru rakarrack-0.6.1/src/process.C
rakarrack-0.6.1.flinclude/src/process.C
+--- rakarrack-0.6.1/src/process.C 2010-10-01 03:45:12.000000000 +0200
++++ rakarrack-0.6.1.flinclude/src/process.C 2012-04-09 10:52:56.000000000
+0200
+@@ -28,7 +28,7 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <Fl/Fl_Preferences.H>
++#include <FL/Fl_Preferences.H>
+ #include "global.h"
+
+ int Pexitprogram, preset;
diff --git a/crypto/ccid/DETAILS b/crypto/ccid/DETAILS
index acf6929..a0521ed 100755
--- a/crypto/ccid/DETAILS
+++ b/crypto/ccid/DETAILS
@@ -1,9 +1,9 @@
SPELL=ccid
- VERSION=1.4.5
-
SOURCE_HASH=sha512:ca543cc7d56f0b948c77a5a362803a33320a61c687a039c8f5b1fd55c9d0eff0e0afc374dbb066372a0a248220c47ddefd126162c99e644a93fb315619a39d55
+ VERSION=1.4.6
+
SOURCE_HASH=sha512:77eb0c76968b2eb3e2f168a8a12a105699c7fcb41489f193dfdf38b1c1d0a9961389612ccd5ef1c0d34eb8e116bec7285583831b9b3d02cea5aaef88d190d28f
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3672/$SOURCE
+ SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3711/$SOURCE
WEB_SITE=http://pcsclite.alioth.debian.org/ccid.html
LICENSE[0]=LGPL
ENTERED=20070123
diff --git a/crypto/ccid/HISTORY b/crypto/ccid/HISTORY
index abf6db2..03875f2 100644
--- a/crypto/ccid/HISTORY
+++ b/crypto/ccid/HISTORY
@@ -1,3 +1,6 @@
+2012-04-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.6
+
2011-11-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.5

diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index 8721e81..a467511 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,9 +1,9 @@
SPELL=pcsc-lite
- VERSION=1.8.2
-
SOURCE_HASH=sha512:093666b8e44c24ef259cc5cf1f46ffebed7f0eedda43f7a4e58112695912b87148b5d1ae8fbd398bd0a623b943bb6f75253e5c6fdccf64f38b750c78a10f3064
+ VERSION=1.8.3
+
SOURCE_HASH=sha512:a568e67363661719d76e7f85b68843e118978b132ec6ecbb1663c8466fbdf79694ba4820989a53fdb81431b73b4de11f8a9c11df4dc0f6f710eb02025574fc36
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3695/$SOURCE
+ SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3706/$SOURCE
WEB_SITE=http://pcsclite.alioth.debian.org/
LICENSE[0]=BSD
ENTERED=20050106
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index f8c1b01..2c1fa52 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,6 @@
+2012-04-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.3
+
2012-01-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.2

diff --git a/e-16/e16/DETAILS b/e-16/e16/DETAILS
index 0498cce..6140da2 100755
--- a/e-16/e16/DETAILS
+++ b/e-16/e16/DETAILS
@@ -11,12 +11,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-0.16-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:$SPELL/e
SOURCE_IGNORE=volatile
else
- VERSION=1.0.9
+ VERSION=1.0.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE

-
SOURCE_HASH=sha512:75dc4c784bb70a22b5baa6462024164a10bcea325aa479d2c856f8d214910f36fba865f78017f5c71847991015e7164ecb3959b9ee6d8e531c1b938bd5f61d2a
+
SOURCE_HASH=sha512:52b7f66f06247f7f0bbe0873e6d36733d02bff34188ec3345511333b967c8b5710bcc335727eb656bfa26b6ead07f549d30258303880dadcd2b465491e9795a4
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"

fi
diff --git a/e-16/e16/HISTORY b/e-16/e16/HISTORY
index 859497e..1171901 100644
--- a/e-16/e16/HISTORY
+++ b/e-16/e16/HISTORY
@@ -1,3 +1,6 @@
+2012-04-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.10
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch

diff --git a/gnome2-apps/pan/DETAILS b/gnome2-apps/pan/DETAILS
index c2bd5bd..09074a0 100755
--- a/gnome2-apps/pan/DETAILS
+++ b/gnome2-apps/pan/DETAILS
@@ -11,17 +11,17 @@ if [ "$REL" == "cvs" ]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pan-$VERSION
elif [ "$REL" == "devel" ]; then
- VERSION=0.135
+ VERSION=0.136
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://pan.rebelbase.com/download/releases/$VERSION/source/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pan-$VERSION
-
SOURCE_HASH=sha512:1624f1939767fa912a924133d6ff12ad8f699a73278d96797a67d83215dc0249a01b4b179eb0b71691e67b93237a73ee5a8e4308ec4e36d3c1b9c49f2197ddbf
+
SOURCE_HASH=sha512:0280fa6b67d86f55369dc12e226d8730dd93a0b9444cb3090a028511520c49b842c773d4b99cc9babce0d2a2009a7f2e9c54ad56a9f62f34ff39e64d0f5304be
else
- VERSION=0.135
+ VERSION=0.136
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://pan.rebelbase.com/download/releases/$VERSION/source/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pan-$VERSION
-
SOURCE_HASH=sha512:1624f1939767fa912a924133d6ff12ad8f699a73278d96797a67d83215dc0249a01b4b179eb0b71691e67b93237a73ee5a8e4308ec4e36d3c1b9c49f2197ddbf
+
SOURCE_HASH=sha512:0280fa6b67d86f55369dc12e226d8730dd93a0b9444cb3090a028511520c49b842c773d4b99cc9babce0d2a2009a7f2e9c54ad56a9f62f34ff39e64d0f5304be
fi
LICENSE[0]=GPL
WEB_SITE=http://pan.rebelbase.com
diff --git a/gnome2-apps/pan/HISTORY b/gnome2-apps/pan/HISTORY
index f931472..79db503 100644
--- a/gnome2-apps/pan/HISTORY
+++ b/gnome2-apps/pan/HISTORY
@@ -1,3 +1,6 @@
+2012-04-08 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 0.136
+
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/gnome2-libs/mx/DETAILS b/gnome2-libs/mx/DETAILS
index 84f6212..799dc27 100755
--- a/gnome2-libs/mx/DETAILS
+++ b/gnome2-libs/mx/DETAILS
@@ -1,5 +1,5 @@
SPELL=mx
- VERSION=1.4.2
+ VERSION=1.4.5
SOURCE="${SPELL}-${VERSION}.tar.bz2"

SOURCE_URL[0]=http://source.clutter-project.org/sources/mx/${VERSION:0:3}/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
diff --git a/gnome2-libs/mx/HISTORY b/gnome2-libs/mx/HISTORY
index 666fdee..64c00e2 100644
--- a/gnome2-libs/mx/HISTORY
+++ b/gnome2-libs/mx/HISTORY
@@ -1,3 +1,6 @@
+2012-04-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.5
+
2012-02-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.2

diff --git a/gnome2-libs/mx/mx-1.4.2.tar.bz2.sig
b/gnome2-libs/mx/mx-1.4.2.tar.bz2.sig
deleted file mode 100644
index cccc4f9..0000000
Binary files a/gnome2-libs/mx/mx-1.4.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/mx/mx-1.4.5.tar.bz2.sig
b/gnome2-libs/mx/mx-1.4.5.tar.bz2.sig
new file mode 100644
index 0000000..951f726
Binary files /dev/null and b/gnome2-libs/mx/mx-1.4.5.tar.bz2.sig differ
diff --git a/gnustep-libs/gnustep-base/DEPENDS
b/gnustep-libs/gnustep-base/DEPENDS
index 7fc8acc..66e8458 100755
--- a/gnustep-libs/gnustep-base/DEPENDS
+++ b/gnustep-libs/gnustep-base/DEPENDS
@@ -1,7 +1,11 @@
depends gnustep-make &&
depends libxml2 &&
depends libxslt &&
-depends libffi "--with-ffi-include=/usr/lib/libffi-3.0.8/include" &&
+depends libffi "--with-ffi-include=/usr/lib/libffi-$(installed_version
libffi)/include" &&
+optional_depends icu \
+ "--enable-icu" \
+ "--disable-icu" \
+ "Enable utf-8 support." &&
optional_depends openssl \
"--enable-openssl" \
"--disable-openssl" \
diff --git a/gnustep-libs/gnustep-base/DETAILS
b/gnustep-libs/gnustep-base/DETAILS
index 96b2f3d..187def8 100755
--- a/gnustep-libs/gnustep-base/DETAILS
+++ b/gnustep-libs/gnustep-base/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnustep-base
- VERSION=1.22.0
+ VERSION=1.24.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/gnustep-libs/gnustep-base/HISTORY
b/gnustep-libs/gnustep-base/HISTORY
index f0517f1..a5b7c9c 100644
--- a/gnustep-libs/gnustep-base/HISTORY
+++ b/gnustep-libs/gnustep-base/HISTORY
@@ -1,3 +1,10 @@
+2012-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.24.0
+ * DEPENDS: added optional dependency on icu
+
+2011-10-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.23.0
+
2011-05-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.22.0

diff --git a/gnustep-libs/gnustep-gui/DEPENDS
b/gnustep-libs/gnustep-gui/DEPENDS
index 87ba2ef..72e95f3 100755
--- a/gnustep-libs/gnustep-gui/DEPENDS
+++ b/gnustep-libs/gnustep-gui/DEPENDS
@@ -2,6 +2,10 @@ depends gnustep-make &&
depends gnustep-base &&
depends tiff &&
depends xorg-libs &&
+optional_depends icu \
+ "--enable-icu" \
+ "--disable-icu" \
+ "Enable utf-8 support." &&
optional_depends libpng \
"--enable-png" \
"--disable-png" \
diff --git a/gnustep-libs/gnustep-gui/DETAILS
b/gnustep-libs/gnustep-gui/DETAILS
index 91f9623..a5743c3 100755
--- a/gnustep-libs/gnustep-gui/DETAILS
+++ b/gnustep-libs/gnustep-gui/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnustep-gui
- VERSION=0.20.0
+ VERSION=0.22.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnustep-libs/gnustep-gui/HISTORY
b/gnustep-libs/gnustep-gui/HISTORY
index 9524e97..c31cb29 100644
--- a/gnustep-libs/gnustep-gui/HISTORY
+++ b/gnustep-libs/gnustep-gui/HISTORY
@@ -1,3 +1,7 @@
+2012-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.22.0
+ * DEPENDS: added optional dependency on icu
+
2011-05-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.20.0

diff --git a/gnustep-libs/gnustep-make/DETAILS
b/gnustep-libs/gnustep-make/DETAILS
index 1d2fa0d..db34eff 100755
--- a/gnustep-libs/gnustep-make/DETAILS
+++ b/gnustep-libs/gnustep-make/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnustep-make
- VERSION=2.6.1
+ VERSION=2.6.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.sig
SOURCE2_IGNORE=signature
diff --git a/gnustep-libs/gnustep-make/HISTORY
b/gnustep-libs/gnustep-make/HISTORY
index 0ddfb2c..62ce1cb 100644
--- a/gnustep-libs/gnustep-make/HISTORY
+++ b/gnustep-libs/gnustep-make/HISTORY
@@ -1,3 +1,6 @@
+2012-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.2
+
2011-10-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.6.1

diff --git a/graphics/vym/DETAILS b/graphics/vym/DETAILS
index a70ed19..3f0d7ce 100755
--- a/graphics/vym/DETAILS
+++ b/graphics/vym/DETAILS
@@ -1,8 +1,8 @@
SPELL=vym
- VERSION=2.0.3
+ VERSION=2.0.10
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:5d96719776882de1883ff82c5d55f5e18e0488a030d222201bfcc949add85a1fcfda6517324ba2de9f3a25871f6e8997e31193a7944b9aeb131caecf48dc2c2d
+
SOURCE_HASH=sha512:c62317b1e4fe6853b2c78a1ba9a5a08c11a8a98c8bcba4e73c440c6ecfbbf41b19365aaa9dbfcee0d3a6ebb2cf97e9a96665c24a472f43ad6210d84113e0a2f0
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.insilmaril.de/vym/";
LICENSE[0]=GPL2
diff --git a/graphics/vym/HISTORY b/graphics/vym/HISTORY
index 7f83df6..d001f9d 100644
--- a/graphics/vym/HISTORY
+++ b/graphics/vym/HISTORY
@@ -1,3 +1,6 @@
+2012-04-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.10
+
2011-12-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.3

diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index d1f8589..145b754 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,12 +1,12 @@
SPELL=icu
if [[ "$ICU_DEV" == 'y' ]]; then
- VERSION=49.1
-
SOURCE_HASH=sha512:3ed36ed2e4cab426fe1c4e001d591375409cb4558010176372023e73b0858df325dcff134fb182efa11de45c149a09b8b5401d6456eaf60b63647939685d4f02
+ VERSION=4.8.1.1
+
SOURCE_HASH=sha512:811d8ed868c8520249b5de1e8ac5f6d2ae5d7aa9996d856eea6841fcae5e9af7d0746231671fb86d03634a42908643b54033bf86aa10bd3424e58ed0846271f1
VX=${VERSION//.r/r}
else
- VERSION=49.1
+ VERSION=4.8.1.1
VX=$VERSION
-
SOURCE_HASH=sha512:3ed36ed2e4cab426fe1c4e001d591375409cb4558010176372023e73b0858df325dcff134fb182efa11de45c149a09b8b5401d6456eaf60b63647939685d4f02
+
SOURCE_HASH=sha512:811d8ed868c8520249b5de1e8ac5f6d2ae5d7aa9996d856eea6841fcae5e9af7d0746231671fb86d03634a42908643b54033bf86aa10bd3424e58ed0846271f1
fi
SPELLX=icu4c
VERSIONX=${VERSION//./_}
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 0203ce8..b7fb903 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,6 +1,3 @@
-2012-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 49.1
-
2011-10-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.8.1.1 (both)

diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 234abdd..089c8af 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,5 @@
SPELL=dovecot
- VERSION=2.0.16
+ VERSION=2.0.20
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
@@ -7,8 +7,8 @@
SOURCE_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE
SOURCE2_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE2
if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
- VERSION2=0.2.5
- PATCHLEVEL=10
+ VERSION2=0.2.6
+ PATCHLEVEL=11
SOURCE3=$SPELL-${VERSION%.*}-pigeonhole-$VERSION2.tar.gz
SOURCE4=$SPELL-${VERSION%.*}-pigeonhole-$VERSION2.tar.gz.sig
SOURCE3_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE3
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 1ab1bd9..f49673c 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,6 @@
+2012-04-09 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 2.0.20, pigeonhole to 0.2.6
+
2011-11-20 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: correct PATCHLEVEL

diff --git a/python-pypi/alembic/DETAILS b/python-pypi/alembic/DETAILS
index 415184f..de5346c 100755
--- a/python-pypi/alembic/DETAILS
+++ b/python-pypi/alembic/DETAILS
@@ -1,6 +1,6 @@
SPELL=alembic
- VERSION=0.3.0
-
SOURCE_HASH=sha512:bfbee18017a19c441ed87aa0e3d315ecbc8fec20c643edeff8d479312b631961f979c44d9b9c89bb0f7d00e7ca4e29419573fda5d427d53259eae7d4ca52d2d8
+ VERSION=0.3.1
+
SOURCE_HASH=sha512:8149fc73e044f0d3934cb3f82dfad0f289bcb9b0655e39001bb3f362757fc7668b9a677a21b6988340a0266dc31055d303f632f16aaf58ecf805b1820744125c
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/a/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/alembic/HISTORY b/python-pypi/alembic/HISTORY
index 7471972..ca16731 100644
--- a/python-pypi/alembic/HISTORY
+++ b/python-pypi/alembic/HISTORY
@@ -1,3 +1,6 @@
+2012-04-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.1
+
2012-04-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.0

diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 254c40b..0ef0938 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,10 @@
+2012-04-09 Ladislav Hagara <hgr AT vabo.cz>
+ * PRE_BUILD, qt-4.8-glib-2.32.patch: patch removed
+ * PRE_BUILD: sed added
+ * PRE_BUILD, qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch,
+ qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch: patches added
+ from http://www.linuxfromscratch.org/blfs/view/svn/x/qt4.html
+
2012-04-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.8.1
* PRE_BUILD, WebKit.pri.patch: patch removed
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 66a54c2..93950b5 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,7 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-patch -p1 < ${SCRIPT_DIRECTORY}/qt-4.8-glib-2.32.patch &&
+sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&
+patch -p1 <
${SCRIPT_DIRECTORY}/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch &&
+patch -p1 <
${SCRIPT_DIRECTORY}/qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch &&

# fix bad .pro file for 4.6.0-beta1
for file in
tools/assistant/tools/{qhelpgenerator,qcollectiongenerator,qhelpconverter,assistant}/*.pro;
do
diff --git a/x11-toolkits/qt4/qt-4.8-glib-2.32.patch
b/x11-toolkits/qt4/qt-4.8-glib-2.32.patch
deleted file mode 100644
index 0f5ddc6..0000000
--- a/x11-toolkits/qt4/qt-4.8-glib-2.32.patch
+++ /dev/null
@@ -1,28 +0,0 @@
----
qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
2012-04-01 19:32:46.621395314 +0200
-+++
qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
2012-04-01 19:34:23.693181749 +0200
-@@ -24,6 +24,7 @@
-
- #if ENABLE(GLIB_SUPPORT)
-
-+#include <glib.h>
- #include <algorithm>
- #include <wtf/Assertions.h>
- #include <wtf/Noncopyable.h>
----
qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
2012-04-01 19:32:46.624395278 +0200
-+++
qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
2012-04-01 19:34:09.420360184 +0200
-@@ -39,7 +39,6 @@
- typedef struct _GAsyncResult GAsyncResult;
- typedef struct _GCancellable GCancellable;
- typedef struct _GCharsetConverter GCharsetConverter;
--typedef struct _GCond GCond;
- typedef struct _GDir GDir;
- typedef struct _GdkAtom* GdkAtom;
- typedef struct _GdkCursor GdkCursor;
-@@ -52,7 +51,6 @@
- typedef struct _GHashTable GHashTable;
- typedef struct _GInputStream GInputStream;
- typedef struct _GList GList;
--typedef struct _GMutex GMutex;
- typedef struct _GPatternSpec GPatternSpec;
- typedef struct _GPollableOutputStream GPollableOutputStream;
- typedef struct _GSocketClient GSocketClient;
diff --git
a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch
b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch
new file mode 100644
index 0000000..6f4985c
--- /dev/null
+++ b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch
@@ -0,0 +1,33 @@
+Submitted By: Ragnar Thomsen
<rthomsen_at_linuxfromscratch_dot_org>
+Date: 2012-04-04
+Initial Package Version: 4.8.1
+Origin: OpenSUSE
+Description: Fixes building with GCC 4.7
+
+diff -rupN
a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
2012-03-14 15:01:30.000000000 +0100
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
2012-04-04 21:40:41.287652897 +0200
+@@ -57,9 +57,7 @@ namespace JSC {
+
+ class JSGlobalObject : public JSVariableObject {
+ protected:
+- using JSVariableObject::JSVariableObjectData;
+-
+- struct JSGlobalObjectData : public JSVariableObjectData {
++ struct JSGlobalObjectData : public
JSVariableObject::JSVariableObjectData {
+ // We use an explicit destructor function pointer instead of a
+ // virtual destructor because we want to avoid adding a vtable
+ // pointer to this struct. Adding a vtable pointer would force
the
+diff -rupN
a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+---
a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
2012-03-14 15:01:30.000000000 +0100
++++
b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
2012-04-04 21:40:41.287652897 +0200
+@@ -32,8 +32,7 @@ namespace JSC{
+
+ class JSStaticScopeObject : public JSVariableObject {
+ protected:
+- using JSVariableObject::JSVariableObjectData;
+- struct JSStaticScopeObjectData : public JSVariableObjectData {
++ struct JSStaticScopeObjectData : public
JSVariableObject::JSVariableObjectData {
+ JSStaticScopeObjectData()
+ : JSVariableObjectData(&symbolTable, &registerStore + 1)
+ {
diff --git
a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch
b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch
new file mode 100644
index 0000000..dce2eaa
--- /dev/null
+++ b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch
@@ -0,0 +1,345 @@
+Submitted By: Ragnar Thomsen
<rthomsen_at_linuxfromscratch_dot_org>
+Date: 2012-04-04
+Initial Package Version: 4.8.1
+Origin: Webkit Trac
+Description: Fixes building with Glib 2.32
+
+diff -Naur a/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am
b/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am
2012-03-14 15:01:27.000000000 +0100
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am
2012-04-02 18:24:44.675935621 +0200
+@@ -438,7 +438,6 @@
+ Source/JavaScriptCore/wtf/gobject/GRefPtr.h \
+ Source/JavaScriptCore/wtf/gobject/GTypedefs.h \
+ Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
+- Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
+ Source/JavaScriptCore/wtf/HashCountedSet.h \
+ Source/JavaScriptCore/wtf/HashFunctions.h \
+ Source/JavaScriptCore/wtf/HashIterators.h \
+diff -Naur
a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h
b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h
2012-03-14 15:01:26.000000000 +0100
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h
2012-04-02 18:27:24.179929519 +0200
+@@ -44,8 +44,6 @@
+
+ #if USE(PTHREADS)
+ #include <pthread.h>
+-#elif PLATFORM(GTK)
+-#include "GOwnPtr.h"
+ #endif
+
+ #if PLATFORM(QT)
+@@ -66,10 +64,6 @@
+ typedef void* PlatformReadWriteLock;
+ #endif
+ typedef pthread_cond_t PlatformCondition;
+-#elif PLATFORM(GTK)
+-typedef GOwnPtr<GMutex> PlatformMutex;
+-typedef void* PlatformReadWriteLock; // FIXME: Implement.
+-typedef GOwnPtr<GCond> PlatformCondition;
+ #elif PLATFORM(QT)
+ typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex;
+ typedef void* PlatformReadWriteLock; // FIXME: Implement.
+diff -Naur
a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp
b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp
2012-03-14 15:01:26.000000000 +0100
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp
2012-04-02 18:29:01.491925799 +0200
+@@ -37,18 +37,6 @@
+ g_list_free(ptr);
+ }
+
+-template <> void freeOwnedGPtr<GCond>(GCond* ptr)
+-{
+- if (ptr)
+- g_cond_free(ptr);
+-}
+-
+-template <> void freeOwnedGPtr<GMutex>(GMutex* ptr)
+-{
+- if (ptr)
+- g_mutex_free(ptr);
+-}
+-
+ template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr)
+ {
+ if (ptr)
+diff -Naur a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
2012-03-14 15:01:26.000000000 +0100
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
2012-04-02 18:29:59.075923577 +0200
+@@ -35,8 +35,6 @@
+ template <typename T> inline void freeOwnedGPtr(T* ptr);
+ template<> void freeOwnedGPtr<GError>(GError*);
+ template<> void freeOwnedGPtr<GList>(GList*);
+-template<> void freeOwnedGPtr<GCond>(GCond*);
+-template<> void freeOwnedGPtr<GMutex>(GMutex*);
+ template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*);
+ template<> void freeOwnedGPtr<GDir>(GDir*);
+
+diff -Naur
a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
2012-03-14 15:01:26.000000000 +0100
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
2012-04-02 18:31:06.043921024 +0200
+@@ -39,7 +39,6 @@
+ typedef struct _GAsyncResult GAsyncResult;
+ typedef struct _GCancellable GCancellable;
+ typedef struct _GCharsetConverter GCharsetConverter;
+-typedef struct _GCond GCond;
+ typedef struct _GDir GDir;
+ typedef struct _GdkAtom* GdkAtom;
+ typedef struct _GdkCursor GdkCursor;
+@@ -52,7 +51,6 @@
+ typedef struct _GHashTable GHashTable;
+ typedef struct _GInputStream GInputStream;
+ typedef struct _GList GList;
+-typedef struct _GMutex GMutex;
+ typedef struct _GPatternSpec GPatternSpec;
+ typedef struct _GPollableOutputStream GPollableOutputStream;
+ typedef struct _GSocketClient GSocketClient;
+diff -Naur
a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
2012-03-14 15:01:26.000000000 +0100
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
1970-01-01 01:00:00.000000000 +0100
+@@ -1,248 +0,0 @@
+-/*
+- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+- * Copyright (C) 2007 Justin Haygood (jhaygood AT reaktix.com)
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- *
+- * 1. Redistributions of source code must retain the above copyright
+- * notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- * notice, this list of conditions and the following disclaimer in the
+- * documentation and/or other materials provided with the distribution.
+- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+- * its contributors may be used to endorse or promote products derived
+- * from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES
+- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES;
+- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
AND
+- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT
+- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-
+-#include "config.h"
+-#include "Threading.h"
+-
+-#if !USE(PTHREADS)
+-
+-#include "CurrentTime.h"
+-#include "HashMap.h"
+-#include "MainThread.h"
+-#include "RandomNumberSeed.h"
+-#include <wtf/StdLibExtras.h>
+-
+-#include <glib.h>
+-#include <limits.h>
+-
+-namespace WTF {
+-
+-typedef HashMap<ThreadIdentifier, GThread*> ThreadMap;
+-
+-static Mutex* atomicallyInitializedStaticMutex;
+-
+-static Mutex& threadMapMutex()
+-{
+- DEFINE_STATIC_LOCAL(Mutex, mutex, ());
+- return mutex;
+-}
+-
+-void initializeThreading()
+-{
+- if (!g_thread_supported())
+- g_thread_init(NULL);
+- ASSERT(g_thread_supported());
+-
+- if (!atomicallyInitializedStaticMutex) {
+- atomicallyInitializedStaticMutex = new Mutex;
+- threadMapMutex();
+- initializeRandomNumberGenerator();
+- }
+-}
+-
+-void lockAtomicallyInitializedStaticMutex()
+-{
+- ASSERT(atomicallyInitializedStaticMutex);
+- atomicallyInitializedStaticMutex->lock();
+-}
+-
+-void unlockAtomicallyInitializedStaticMutex()
+-{
+- atomicallyInitializedStaticMutex->unlock();
+-}
+-
+-static ThreadMap& threadMap()
+-{
+- DEFINE_STATIC_LOCAL(ThreadMap, map, ());
+- return map;
+-}
+-
+-static ThreadIdentifier identifierByGthreadHandle(GThread*& thread)
+-{
+- MutexLocker locker(threadMapMutex());
+-
+- ThreadMap::iterator i = threadMap().begin();
+- for (; i != threadMap().end(); ++i) {
+- if (i->second == thread)
+- return i->first;
+- }
+-
+- return 0;
+-}
+-
+-static ThreadIdentifier establishIdentifierForThread(GThread*& thread)
+-{
+- ASSERT(!identifierByGthreadHandle(thread));
+-
+- MutexLocker locker(threadMapMutex());
+-
+- static ThreadIdentifier identifierCount = 1;
+-
+- threadMap().add(identifierCount, thread);
+-
+- return identifierCount++;
+-}
+-
+-static GThread* threadForIdentifier(ThreadIdentifier id)
+-{
+- MutexLocker locker(threadMapMutex());
+-
+- return threadMap().get(id);
+-}
+-
+-static void clearThreadForIdentifier(ThreadIdentifier id)
+-{
+- MutexLocker locker(threadMapMutex());
+-
+- ASSERT(threadMap().contains(id));
+-
+- threadMap().remove(id);
+-}
+-
+-ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void*
data, const char*)
+-{
+- GThread* thread;
+- if (!(thread = g_thread_create(entryPoint, data, TRUE, 0))) {
+- LOG_ERROR("Failed to create thread at entry point %p with data %p",
entryPoint, data);
+- return 0;
+- }
+-
+- ThreadIdentifier threadID = establishIdentifierForThread(thread);
+- return threadID;
+-}
+-
+-void initializeCurrentThreadInternal(const char*)
+-{
+-}
+-
+-int waitForThreadCompletion(ThreadIdentifier threadID, void** result)
+-{
+- ASSERT(threadID);
+-
+- GThread* thread = threadForIdentifier(threadID);
+-
+- void* joinResult = g_thread_join(thread);
+- if (result)
+- *result = joinResult;
+-
+- clearThreadForIdentifier(threadID);
+- return 0;
+-}
+-
+-void detachThread(ThreadIdentifier)
+-{
+-}
+-
+-ThreadIdentifier currentThread()
+-{
+- GThread* currentThread = g_thread_self();
+- if (ThreadIdentifier id = identifierByGthreadHandle(currentThread))
+- return id;
+- return establishIdentifierForThread(currentThread);
+-}
+-
+-void yield()
+-{
+- g_thread_yield();
+-}
+-
+-Mutex::Mutex()
+- : m_mutex(g_mutex_new())
+-{
+-}
+-
+-Mutex::~Mutex()
+-{
+-}
+-
+-void Mutex::lock()
+-{
+- g_mutex_lock(m_mutex.get());
+-}
+-
+-bool Mutex::tryLock()
+-{
+- return g_mutex_trylock(m_mutex.get());
+-}
+-
+-void Mutex::unlock()
+-{
+- g_mutex_unlock(m_mutex.get());
+-}
+-
+-ThreadCondition::ThreadCondition()
+- : m_condition(g_cond_new())
+-{
+-}
+-
+-ThreadCondition::~ThreadCondition()
+-{
+-}
+-
+-void ThreadCondition::wait(Mutex& mutex)
+-{
+- g_cond_wait(m_condition.get(), mutex.impl().get());
+-}
+-
+-bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime)
+-{
+- // Time is in the past - return right away.
+- if (absoluteTime < currentTime())
+- return false;
+-
+- // Time is too far in the future for g_cond_timed_wait - wait forever.
+- if (absoluteTime > INT_MAX) {
+- wait(mutex);
+- return true;
+- }
+-
+- int timeSeconds = static_cast<int>(absoluteTime);
+- int timeMicroseconds = static_cast<int>((absoluteTime - timeSeconds) *
1000000.0);
+-
+- GTimeVal targetTime;
+- targetTime.tv_sec = timeSeconds;
+- targetTime.tv_usec = timeMicroseconds;
+-
+- return g_cond_timed_wait(m_condition.get(), mutex.impl().get(),
&targetTime);
+-}
+-
+-void ThreadCondition::signal()
+-{
+- g_cond_signal(m_condition.get());
+-}
+-
+-void ThreadCondition::broadcast()
+-{
+- g_cond_broadcast(m_condition.get());
+-}
+-
+-
+-}
+-
+-#endif // !USE(PTHREADS)



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (f43078e051b07f1e3df59cca3fbd09dc80fa0bfd), Eric Sandall, 04/09/2012

Archive powered by MHonArc 2.6.24.

Top of Page