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 (d25587817db002178941f953309021890a2ad4ce)
- 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 (d25587817db002178941f953309021890a2ad4ce)
- Date: Fri, 14 Sep 2012 03:25:24 -0500
GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:
audio-players/ario/DEPENDS | 1
audio-players/ario/HISTORY | 3
devel/nasm/DETAILS | 4
devel/nasm/HISTORY | 3
devel/patch/DETAILS | 5
devel/patch/HISTORY | 5
devel/pkgconfig/DETAILS | 4
devel/pkgconfig/HISTORY | 3
ftp/lftp/HISTORY | 3
ftp/lftp/PRE_BUILD | 4
ftp/lftp/gets.patch | 16
graphics/optipng/DETAILS | 4
graphics/optipng/HISTORY | 3
kde4-apps/calligra/DETAILS | 4
kde4-apps/calligra/HISTORY | 3
net/bind-tools/DETAILS | 4
net/bind-tools/HISTORY | 3
net/bind/DETAILS | 6
net/bind/HISTORY | 3
net/dhcp/DETAILS | 4
net/dhcp/HISTORY | 4
net/dhcp/INSTALL | 4
utils/sudo/DETAILS | 2
utils/sudo/HISTORY | 3
x11-toolkits/qt4/DETAILS | 4
x11-toolkits/qt4/HISTORY | 5
x11-toolkits/qt4/PRE_BUILD | 1
x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch | 345
----------
28 files changed, 84 insertions(+), 369 deletions(-)
New commits:
commit 65120aaebe92e00350f082941a4d9602c2a19f94
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nasm: => 2.10.05
commit b019c2f45bbfe08f6151499750c55f0c41c7ae46
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pkgconfig: => 0.27.1
commit 518477d09db28773683c14a639dc2e75776a7383
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sudo: => 1.8.6p1
commit 3ea7478470b005146c58a739d1c9c0bc9a6843b2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
optipng: => 0.7.2
commit 308dea07c2594ff56d65b8a26fa4d8b4db99e94e
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>
ftp/lftp: added patch to build with glibc 2.16 and newer
commit 304949c91c221dfb42a5c3bd2d8196b35b3e1745
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
x11-toolkits/qt4: version 4.8.3
commit 12213a627c3489f4f2b96bf4d8afc14fc2235acd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
ario: depends on libmpdclient
commit 5a2dd710855f8c76bdcd1695bae72b93ba9b6f25
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
calligra: => 2.5.2
commit e67ebad36c7af058ad972a1b451c8ffdbb9d8ebd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
patch-2.7 - fixes CVE-2010-4651
commit 34ec181237d971e20f56af48f915f81b54e81e30
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bind: => 9.8.3-P3 (security)
commit 9b9b0e97fbf6d23f6b1768585c1c8a4efac2ed4c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bind-tools: => 9.9.1-P3 (security)
commit fefd0e45389c51b579c12120473ddc893ecbe879
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
dhcp: => 4.2.4-P2 (security)
diff --git a/audio-players/ario/DEPENDS b/audio-players/ario/DEPENDS
index 6d2e047..45e969c 100755
--- a/audio-players/ario/DEPENDS
+++ b/audio-players/ario/DEPENDS
@@ -1,3 +1,4 @@
+depends libmpdclient &&
depends gtk+2 &&
depends glib2 &&
depends libglade2 &&
diff --git a/audio-players/ario/HISTORY b/audio-players/ario/HISTORY
index 272b180..b1753ad 100644
--- a/audio-players/ario/HISTORY
+++ b/audio-players/ario/HISTORY
@@ -1,3 +1,6 @@
+2012-09-13 Ismael Luceno <ismael.luceno AT gmail.com>
+ * DEPENDS: depends on libmpdclient
+
2012-05-01 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.5.1
* DEPENDS: depends on unique
diff --git a/devel/nasm/DETAILS b/devel/nasm/DETAILS
index 581c8c3..5f3bb9e 100755
--- a/devel/nasm/DETAILS
+++ b/devel/nasm/DETAILS
@@ -1,6 +1,6 @@
SPELL=nasm
- VERSION=2.10.04
-
SOURCE_HASH=sha512:a55ab9c09e0ee2ac9a73aadbeafaecb940288a2bb38442cf840b54cc6c61f6a67e42cb63dee67a58b8e05e44cd9a162cdf3af7e7a42dfbdee16496119499329d
+ VERSION=2.10.05
+
SOURCE_HASH=sha512:0a0a8752dcea6b1d205c265f72d7bbd56c90f8ea1438af3839696d21523cda7ac98441ad148c3ca0f0f3b18d83c989213d6e4366cf479b300749879e0c0fcbf0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.nasm.us/pub/nasm/releasebuilds/$VERSION/$SOURCE
diff --git a/devel/nasm/HISTORY b/devel/nasm/HISTORY
index bf900a9..8ca664b 100644
--- a/devel/nasm/HISTORY
+++ b/devel/nasm/HISTORY
@@ -1,3 +1,6 @@
+2012-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.10.05
+
2012-08-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.10.04
diff --git a/devel/patch/DETAILS b/devel/patch/DETAILS
index 88ef4a7..67d7ab8 100755
--- a/devel/patch/DETAILS
+++ b/devel/patch/DETAILS
@@ -1,6 +1,7 @@
SPELL=patch
- VERSION=2.6.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=2.7
+ SECURITY_PATCH=1
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/devel/patch/HISTORY b/devel/patch/HISTORY
index 66f6a77..a4c43b6 100644
--- a/devel/patch/HISTORY
+++ b/devel/patch/HISTORY
@@ -1,3 +1,8 @@
+2012-09-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.7
+ SECURITY_PATCH=1
+ fixes CVE-2010-4651
+
2010-01-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.6.1
diff --git a/devel/pkgconfig/DETAILS b/devel/pkgconfig/DETAILS
index 85e55f3..b2826d1 100755
--- a/devel/pkgconfig/DETAILS
+++ b/devel/pkgconfig/DETAILS
@@ -1,8 +1,8 @@
SPELL=pkgconfig
if spell_ok glib2; then
- VERSION=0.27
-
SOURCE_HASH=sha512:5ac68fb66804f56e9daf760a8f6e91da194f78895208d3ca25a4b7b5ace97d9cf8441f2aea79a0eaf7a2a518761764ab7722f3c0878d85265a9412c8b0ef6a1f
+ VERSION=0.27.1
+
SOURCE_HASH=sha512:f9c6d013848c3d9868e99a2cbf16e6735ca6ca12ff5a0b18d536a135aadd72dc2be1afcc962c866bc3c7301150e805d1630ea510d0e4ee222cb5c9f70b8fd675
else
VERSION=0.25
SOURCE_HASH=sha512:6c50ca542733feeb10301097ade32075c5417ada5bdd195957de8521a28b20e0e7a54ed553fa3e022b24969e9deb97d72e289192cb2a3afc2c86241dc6cafa02
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index 7f06080..1e8ed54 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,6 @@
+2012-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.27.1
+
2012-08-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.27
diff --git a/ftp/lftp/HISTORY b/ftp/lftp/HISTORY
index 94b21c9..1012a03 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,6 @@
+2012-09-13 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD, gets.patch: added patch to build with glibc >= 2.16
+
2012-08-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: 4.3.8
diff --git a/ftp/lftp/PRE_BUILD b/ftp/lftp/PRE_BUILD
new file mode 100755
index 0000000..1e710c5
--- /dev/null
+++ b/ftp/lftp/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < "$SPELL_DIRECTORY/gets.patch"
diff --git a/ftp/lftp/gets.patch b/ftp/lftp/gets.patch
new file mode 100644
index 0000000..b0a6fbb
--- /dev/null
+++ b/ftp/lftp/gets.patch
@@ -0,0 +1,16 @@
+
+--- a/lib/stdio.in.h
++++ b/lib/stdio.in.h
+@@ -702,10 +702,12 @@
+ /* It is very rare that the developer ever has full control of stdin,
+ so any use of gets warrants an unconditional warning; besides, C11
+ removed it. */
++#ifdef gets
+ #undef gets
+ #if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
++#endif
+
+
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/graphics/optipng/DETAILS b/graphics/optipng/DETAILS
index 4199c21..caaa222 100755
--- a/graphics/optipng/DETAILS
+++ b/graphics/optipng/DETAILS
@@ -1,8 +1,8 @@
SPELL=optipng
- VERSION=0.7.1
+ VERSION=0.7.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:21b3470c5e07b208536fcdd29df2cc7bcc0f28d928ddd7e91c097327abeed45686bd2c6b173b24f13bfccf403bb93ca585f35142452384f52a8b4e8aca12cdb2
+
SOURCE_HASH=sha512:3908f74ea575cdc3265e2abd1037cfdbb34182a4279a6f7af1c09502acf2d847acefa4dae52de9840c53c3b4cc0f3606e99bd0e66529ee52d2b90d3e7d1723fc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://optipng.sourceforge.net/
LICENSE[0]=ZLIB
diff --git a/graphics/optipng/HISTORY b/graphics/optipng/HISTORY
index 3fc821f..24e930b 100644
--- a/graphics/optipng/HISTORY
+++ b/graphics/optipng/HISTORY
@@ -1,3 +1,6 @@
+2012-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.2
+
2012-04-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7.1
* PRE_BUILD, png.patch: dropped
diff --git a/kde4-apps/calligra/DETAILS b/kde4-apps/calligra/DETAILS
index 9f939ba..de53202 100755
--- a/kde4-apps/calligra/DETAILS
+++ b/kde4-apps/calligra/DETAILS
@@ -1,6 +1,6 @@
SPELL=calligra
- VERSION=2.5.1
-
SOURCE_HASH=sha512:e67b94aafe5c32461169729bb591c32495d3e1c8fec934044b19425d65f1a95398caf98588308074e2457ca6ee3608498ba14d3cc71c59bd371651af28bd8b38
+ VERSION=2.5.2
+
SOURCE_HASH=sha512:8bff1aa2cd6d785c575dfa38ef6d680026ea6634fb6d6a994fc133754412530048e70ab62ffeeadc417e37b644ff821ea75aeeaf31bcb99f11c0f706e79b792d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.calligra-suite.org/
diff --git a/kde4-apps/calligra/HISTORY b/kde4-apps/calligra/HISTORY
index 89012ba..0a5b627 100644
--- a/kde4-apps/calligra/HISTORY
+++ b/kde4-apps/calligra/HISTORY
@@ -1,3 +1,6 @@
+2012-09-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.2
+
2012-08-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.5.1
diff --git a/net/bind-tools/DETAILS b/net/bind-tools/DETAILS
index e6d720b..2cc83da 100755
--- a/net/bind-tools/DETAILS
+++ b/net/bind-tools/DETAILS
@@ -1,12 +1,12 @@
SPELL=bind-tools
- VERSION=9.9.1-P2
+ VERSION=9.9.1-P3
SOURCE=bind-$VERSION.tar.gz
SOURCE2=$SOURCE.sha512.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/bind-$VERSION"
SOURCE_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE
SOURCE2_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=9
+ SECURITY_PATCH=10
SOURCE_GPG=isc.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=ISC
KEYWORDS="net"
diff --git a/net/bind-tools/HISTORY b/net/bind-tools/HISTORY
index 9efb7e2..1dc8802 100644
--- a/net/bind-tools/HISTORY
+++ b/net/bind-tools/HISTORY
@@ -1,3 +1,6 @@
+2012-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.9.1-P3; SECURITY_PATCH++
+
2012-07-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.9.1-P2; SECURITY_PATCH++
diff --git a/net/bind/DETAILS b/net/bind/DETAILS
index b15065e..f2b41d3 100755
--- a/net/bind/DETAILS
+++ b/net/bind/DETAILS
@@ -1,5 +1,5 @@
SPELL=bind
- VERSION=9.8.0-P2
+ VERSION=9.8.3-P3
SOURCE=$SPELL-${VERSION}.tar.gz
SOURCE2=root.zone.gz
SOURCE2_IGNORE=unversioned
@@ -7,12 +7,10 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE_URI=$VERSION/$SOURCE
SOURCE_URL[0]=ftp://ftp.isc.org/isc/bind9/$SOURCE_URI
- SOURCE_URL[1]=http://isc.software-archive.net/bind9/$SOURCE_URI
- SOURCE_URL[2]=ftp://ftp.epix.net/pub/isc/bind9/$SOURCE_URI
SOURCE2_URL[0]=ftp://ftp.internic.net/domain/$SOURCE2
SOURCE3_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE3
SOURCE3_IGNORE=signature
- SECURITY_PATCH=6
+ SECURITY_PATCH=7
SOURCE_GPG="isc.gpg:$SOURCE3:UPSTREAM_KEY"
FORCE_DOWNLOAD[2]=true
LICENSE[0]=ISC
diff --git a/net/bind/HISTORY b/net/bind/HISTORY
index 8704bb8..40b5e80 100644
--- a/net/bind/HISTORY
+++ b/net/bind/HISTORY
@@ -1,3 +1,6 @@
+2012-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.8.3-P3; SECURITY_PATCH++
+
2011-06-07 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 9.8.0-P2, SECURITY_PATCH=6
diff --git a/net/dhcp/DETAILS b/net/dhcp/DETAILS
index ecb52e7..32919c9 100755
--- a/net/dhcp/DETAILS
+++ b/net/dhcp/DETAILS
@@ -1,6 +1,6 @@
SPELL=dhcp
- VERSION=4.2.4-P1
- SECURITY_PATCH=2
+ VERSION=4.2.4-P2
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/dhcp/HISTORY b/net/dhcp/HISTORY
index 733ced1..4b3762a 100644
--- a/net/dhcp/HISTORY
+++ b/net/dhcp/HISTORY
@@ -1,3 +1,7 @@
+2012-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.4-P2; SECURITY_PATCH++ (CVE-2012-3955)
+ * INSTALL: verbosity++
+
2012-07-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.2.4-P1; SECURITY_PATCH++ (CVE-2012-3571,
CVE-2012-3570, CVE-2012-3954)
diff --git a/net/dhcp/INSTALL b/net/dhcp/INSTALL
index 67f5531..0586826 100755
--- a/net/dhcp/INSTALL
+++ b/net/dhcp/INSTALL
@@ -1,4 +1,4 @@
make LIBDIR="$INSTALL_ROOT/usr/lib" \
INCDIR="$INSTALL_ROOT/usr/include" install &&
-install -m 644 client/dhclient.conf
$INSTALL_ROOT/etc/dhclient.conf.example &&
-install -m 644 server/dhcpd.conf $INSTALL_ROOT/etc/dhcpd.conf.example
+install -vm 644 client/dhclient.conf
$INSTALL_ROOT/etc/dhclient.conf.example &&
+install -vm 644 server/dhcpd.conf $INSTALL_ROOT/etc/dhcpd.conf.example
diff --git a/utils/sudo/DETAILS b/utils/sudo/DETAILS
index 102a2e8..a268911 100755
--- a/utils/sudo/DETAILS
+++ b/utils/sudo/DETAILS
@@ -1,5 +1,5 @@
SPELL=sudo
- VERSION=1.8.5p3
+ VERSION=1.8.6p1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.gratisoft.us/sudo/dist/${SOURCE}
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index d81cde3..b9426b8 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,6 @@
+2012-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.6p1
+
2012-08-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: re-add source urls
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index cca3b81..17c01f0 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,8 +2,8 @@ persistent_remove QT_VER
SPELL=qt4
TMPFS=off
SPELLX=qt-everywhere-opensource-src
- VERSION=4.8.2
-
SOURCE_HASH=sha512:42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62
+ VERSION=4.8.3
+
SOURCE_HASH=sha512:3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4
SOURCE=$SPELLX-$VERSION.tar.gz
SECURITY_PATCH=4
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 713ad6b..10d0255 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,8 @@
+2012-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.8.3
+ * PRE_BUILD, qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch:
+ removed obsolete patch
+
2012-06-02 Sukneet Basuta <sukneet AT sourcemage.org>
* CONFIGURE: add config_query to build webkit with or without
HTML5 video support
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index b62fd90..4efb000 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -2,7 +2,6 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&
-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-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
deleted file mode 100644
index dce2eaa..0000000
--- a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-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 Treeve Jelbert (d25587817db002178941f953309021890a2ad4ce), Treeve Jelbert, 09/14/2012
Archive powered by MHonArc 2.6.24.