build fix for >=glib-2.31, bug #396417

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

8 files changed, 66 insertions, 12 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 0ef337db1071..251a2d56f670 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.132 2012/04/17 16:13:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.133 2012/05/03 11:43:54 wired Exp $
+
+  03 May 2012; Alex Alexander <wired@gentoo.org> awesome-3.4.8.ebuild,
+  awesome-3.4.9.ebuild, awesome-3.4.9-r1.ebuild, awesome-3.4.10.ebuild,
+  awesome-3.4.11.ebuild, +files/awesome-glib-fix.patch:
+  build fix for >=glib-2.31, bug #396417
 
   17 Apr 2012; Brent Baude <ranger@gentoo.org> awesome-3.4.11.ebuild:
   Marking awesome-3.4.11 ppc for bug 407861
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 2545baa3c2b9..a719f88f8e4d 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,17 +1,38 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch 23023 RMD160 961a5046e4abc1135d70308c2571468b98a78be4 SHA1 b50ad1167c1cfeade882eba44afb6727540a5170 SHA256 58da405ee5fc1bfa0f57b6c228bc1a3ae7420c9d37acb956419661a4b0f3c7ef
 AUX awesome-3.4.2-backtrace.patch 713 RMD160 b60e09f17c1452588020738df6657768080f4dcc SHA1 2845c4529f9189bf41ecd1c2df7eae36fbec329a SHA256 5738944681ce666fab1621c0abbb444356456fcea3ea2119f732c54ef4bf3f26
 AUX awesome-3.4.4-cmake-2.8.4.patch 1581 RMD160 cefa281d597501ab162b14d526f8041f69969d66 SHA1 60789f332cdd9bf21de3caf91053170b85fc3214 SHA256 a7e9fe9dfd3b3cdcc67bdf563ff69c6d432fb038fd1b9c62164fa473751f97f1
 AUX awesome-3.4.8-cmake-2.8.4.patch 878 RMD160 1793b87bc558377e8d117f104cd830c7b38b95e2 SHA1 95a5b453d5c11dee3dff058b81f9500c7362eb92 SHA256 6f4f3fc953739d5437cd4258f664677aef882acf873894c5300f6b35feff708d
+AUX awesome-glib-fix.patch 206 RMD160 fe2ed2588a740ad63970d5338811d8117d078db3 SHA1 8c83e1fb56ae7993d8c4f9077341d736b9212a25 SHA256 04b6fa47de20677c198a2be5357774c473867cd1a91518b7ed9de3398abd32e6
 AUX awesome-session 1999 RMD160 2a92c71209f81ecaa302e03974b2f44e380abf38 SHA1 8d86595e00759508a5f20f54dab46d2c143c5033 SHA256 bee150a5b32a118c905ffe26df3f776f40a2db19230f6600cc2966b6c727838a
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
 DIST awesome-3.4.10.tar.bz2 747589 RMD160 f64298c9865effca1730650142d2efe9be690dd3 SHA1 f3fb824623197aa70708c28ea3aa0c0665617016 SHA256 3ed72cf9a63b93290d6ce4dcbbb56cff555cb172868aaac02a64dee995e0c3b0
 DIST awesome-3.4.11.tar.bz2 758495 RMD160 1ceafb96ebe4e5b04c09dee5d6a69266516203b4 SHA1 b49f47618c014e9ada54336c0c31b616af0b9a1b SHA256 83fc42d4ea71914d1b456023ce53b546e22e8ccc11a73c4a39a1152d2f30b628
 DIST awesome-3.4.8.tar.bz2 741506 RMD160 f97c31631e81c003b7fc90e582d7d8bcae40981f SHA1 23748bccd8bd4999107354a24173811cbdc85740 SHA256 457b639779053a28d39a0039cdc2d76e6b1ae358b2b0d34467a05a75e959ff66
 DIST awesome-3.4.9.tar.bz2 742902 RMD160 ab6cb81f9c44ca2d3ef863d37683930a21fb9c58 SHA1 8fba4bf2e272c21cf9d7f5f2269932a967fa733c SHA256 144cf9643ca47c2238981f9fe0a1c8ae379ef54a5fb853fd9ac3541a60fc738d
-EBUILD awesome-3.4.10.ebuild 2725 RMD160 6862a1b518deceb3ce6f9058691cce8193365dc2 SHA1 986c3a1ad6cd6a4fd1941f2924f5d7973662ceb5 SHA256 99613aca2a6f42c2d784419555db11b4cfda134df796b5e27ae4e89a8ba7fc15
-EBUILD awesome-3.4.11.ebuild 2619 RMD160 cb99ccb24589986150808da6a617f3dcdeb5cdfc SHA1 3080b2323a62b6d36334bb8f31acace3d5d18c71 SHA256 d37851e35e48f1d1686877ef9f4ad74950d4da2aebc6c81ac9e973d91165462e
-EBUILD awesome-3.4.8.ebuild 2719 RMD160 5436feebaed3ca55bdf8caac9fc49d79d9a9649e SHA1 d7278275d7037251cbacc72e9fa056ca1b5121a8 SHA256 4e025878861a92c32d0316b0a465b7e808eff615fd2e3eed074fde3719f1e65c
-EBUILD awesome-3.4.9-r1.ebuild 2766 RMD160 6b4cca4c3143876c1986083d908fb09e84cfc528 SHA1 cc18921ba4825b6e641935d1555387407540f705 SHA256 4626abf346a3d961c422b02b33056256dfa7e8bfc46db18e0955a20b7421a0b6
-EBUILD awesome-3.4.9.ebuild 2652 RMD160 c8b7a81acf9d63ff4973b6d2a94dd6ff7ba84d26 SHA1 77ef6393f05a09275d7ff2b1d9b4401f94ea8f83 SHA256 222d4c831ca3809544edaa4cd2ab2aa176d3159cd687f32314f9f77adf8eb021
-MISC ChangeLog 19525 RMD160 7d35c932a65159ecb5c36f5f6364c6bab0d4a0d9 SHA1 cf04bcf6d2e364e90a802d7ded916a1b1d85f3a5 SHA256 8d50068a6a27de39e90f2de55c223ab8a7b8bd80c4ffe3598dd7989e4da9c0f2
+EBUILD awesome-3.4.10.ebuild 2784 RMD160 c96858f798e1b1f60e0c278f7a094f3f85f3d350 SHA1 d24bcb079d5a4b27e12769d75d5de7d261d862bb SHA256 4822c3fa12f53275c88ba4319e9981849dc995af7353476b237b353e7941fd3d
+EBUILD awesome-3.4.11.ebuild 2677 RMD160 a66d917545953e4e0f76f487255b27c0be8b8b75 SHA1 15d12e28e72badb2dc1fffb71dd961ab426a3274 SHA256 3e0d8637863db84b1f443afcc19de6d163fda7bb7e214ed9ced2ef655d696475
+EBUILD awesome-3.4.8.ebuild 2778 RMD160 ad97a5fb6d9f614b8ec9d4d72e77baea5300125b SHA1 1efff68340ece4191c7b36ae91f3abf54d6fb45a SHA256 5ba46a8e6a33aa9333d1c306969f8f6858c99aef06024365f12c5831499c051b
+EBUILD awesome-3.4.9-r1.ebuild 2825 RMD160 1c6e429fcf4137e2f4944d1dc0ab97de6981ba5c SHA1 d810c5686fb9e4614cd5263a4cda477cd24f30bc SHA256 8684c4d65f5d07eafdd82ad608faa36b2e0f09eb66e581b9fc9654890dcb6b47
+EBUILD awesome-3.4.9.ebuild 2711 RMD160 dc359b1f8525a2343620fa08fe62f998e30f0d45 SHA1 3e75a508efe3f31fe68f70f3bdc11794e9dc2ba9 SHA256 5bbe5e729d9b85e486d904d9bd8fea460308dfe49cad57add9f2c1f7c10115ef
+MISC ChangeLog 19765 RMD160 0e94c83745a0743df8b97a824b67c23490cc9502 SHA1 da5681751113c73299216284189a6a244cc66e7b SHA256 32648bb849884564059e53d23f67d9b0c295db2e9c6edb54d08df87b76477c32
 MISC metadata.xml 326 RMD160 ced8f7923f363eef060cff4c80b7b3ede10fe120 SHA1 2c709bad680d6ab8dcd19466039cedd5ca8bc952 SHA256 4d23256553ae5f4f0e2b2ec2dc603fa7199160052eee9dbe58c61108afe4cd03
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPom+6AAoJEDZF8K7rm0r6iogQAI+3CHMvu0bxCzUOGqDn5pfI
+SGOVCashoxIM7BG3EMoxB83cfv4eg37J2T2zURaLD2OcR0e/QESlysuZQLESUCjq
+SSWxjtEKSjlyyZOEGXitz7jTupi2gfoY2glzzmEvupWgbsImR0hDgZggZo8QHigI
+7iVscsCSURsEh+iUgaRD8cTtMZm5b07oQ5efN7qNLBv5SpKWEGeGuWRPNxYdooHD
+G/n3PkYJyyJL7NZMXS1zxMGKoBIOiTCzLubPkMra2Q+fqx8cc3N8gBVVbQHAGebo
+U3odq9JGlsFanztCaEk01QB//5Lwca2MtPeXQHNS3pj0ahqOwqtozGyUQS1SSZmp
+8pzt1yy4tDd/2GGaAktY8Dtwh/iYq+b9uIDmZv5/VFLUESDtpdRmCSgPDPVEEpMG
+o+uQS2PPF8XOlwMXfGYCA4M7F6xLlYNnpjWkW/02mKp+Ra17Q7Sl9WnVy/8m+Ymz
+j36C7zz/j+gK+tRmWj8pRWUPvzLXALWmv2NU288VXERRzxqXJQ94dovEt6ppbxUb
+25i86a3M/Yy/YljQK5oszwqS1POPkFBoYOd/uK7lcf24b3Jz2WGkKhyL/Nogt+IB
+ZpmKSRQ0onEYANibsJbjHKP2SO1OZYPrC39/8f0Xct1GygPQ+9xSEmvhm5vZjFPH
+7+eoPlHzF3HZW/LnxT9z
+=5Lv4
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/awesome-3.4.10.ebuild b/x11-wm/awesome/awesome-3.4.10.ebuild
index 04398e30e40a..f7570a3c5af7 100644
--- a/x11-wm/awesome/awesome-3.4.10.ebuild
+++ b/x11-wm/awesome/awesome-3.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.10.ebuild,v 1.3 2012/03/05 15:33:32 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.10.ebuild,v 1.4 2012/05/03 11:43:54 wired Exp $
 
 EAPI="3"
 CMAKE_MIN_VERSION="2.8"
@@ -75,6 +75,9 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-3.4.2-backtrace.patch" \
 		"${FILESDIR}/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch"
+
+	# bug #396417
+	epatch "${FILESDIR}/${PN}-glib-fix.patch"
 }
 
 src_configure() {
diff --git a/x11-wm/awesome/awesome-3.4.11.ebuild b/x11-wm/awesome/awesome-3.4.11.ebuild
index cc7330f2764e..a20f69f84aa9 100644
--- a/x11-wm/awesome/awesome-3.4.11.ebuild
+++ b/x11-wm/awesome/awesome-3.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.11.ebuild,v 1.6 2012/04/17 16:13:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.11.ebuild,v 1.7 2012/05/03 11:43:54 wired Exp $
 
 EAPI="3"
 CMAKE_MIN_VERSION="2.8"
@@ -73,6 +73,9 @@ DOCS="AUTHORS BUGS PATCHES README STYLE"
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-3.4.2-backtrace.patch"
+
+	# bug #396417
+	epatch "${FILESDIR}/${PN}-glib-fix.patch"
 }
 
 src_configure() {
diff --git a/x11-wm/awesome/awesome-3.4.8.ebuild b/x11-wm/awesome/awesome-3.4.8.ebuild
index a4f7f7516736..79b83603b7a7 100644
--- a/x11-wm/awesome/awesome-3.4.8.ebuild
+++ b/x11-wm/awesome/awesome-3.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.13 2012/03/05 15:33:32 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.14 2012/05/03 11:43:54 wired Exp $
 
 EAPI="3"
 inherit cmake-utils eutils
@@ -75,6 +75,9 @@ DOCS="AUTHORS BUGS PATCHES README STYLE"
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.4.2-backtrace.patch"
 	epatch "${FILESDIR}/${PN}-3.4.8-cmake-2.8.4.patch"
+
+	# bug #396417
+	epatch "${FILESDIR}/${PN}-glib-fix.patch"
 }
 
 src_configure() {
diff --git a/x11-wm/awesome/awesome-3.4.9-r1.ebuild b/x11-wm/awesome/awesome-3.4.9-r1.ebuild
index 5a9e75cfa910..41d3f4e2fac8 100644
--- a/x11-wm/awesome/awesome-3.4.9-r1.ebuild
+++ b/x11-wm/awesome/awesome-3.4.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.9-r1.ebuild,v 1.6 2012/03/05 15:33:32 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.9-r1.ebuild,v 1.7 2012/05/03 11:43:54 wired Exp $
 
 EAPI="3"
 CMAKE_MIN_VERSION="2.8"
@@ -76,6 +76,9 @@ src_prepare() {
 		"${FILESDIR}/${PN}-3.4.2-backtrace.patch" \
 		"${FILESDIR}/${PN}-3.4.8-cmake-2.8.4.patch" \
 		"${FILESDIR}/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch"
+
+	# bug #396417
+	epatch "${FILESDIR}/${PN}-glib-fix.patch"
 }
 
 src_configure() {
diff --git a/x11-wm/awesome/awesome-3.4.9.ebuild b/x11-wm/awesome/awesome-3.4.9.ebuild
index 414271c135f1..b3d831780e3a 100644
--- a/x11-wm/awesome/awesome-3.4.9.ebuild
+++ b/x11-wm/awesome/awesome-3.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.9.ebuild,v 1.6 2012/03/05 15:33:32 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.9.ebuild,v 1.7 2012/05/03 11:43:54 wired Exp $
 
 EAPI="3"
 CMAKE_MIN_VERSION="2.8"
@@ -74,6 +74,9 @@ DOCS="AUTHORS BUGS PATCHES README STYLE"
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.4.2-backtrace.patch"
 	epatch "${FILESDIR}/${PN}-3.4.8-cmake-2.8.4.patch"
+
+	# bug #396417
+	epatch "${FILESDIR}/${PN}-glib-fix.patch"
 }
 
 src_configure() {
diff --git a/x11-wm/awesome/files/awesome-glib-fix.patch b/x11-wm/awesome/files/awesome-glib-fix.patch
new file mode 100644
index 000000000000..e3e6fcf94896
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-glib-fix.patch
@@ -0,0 +1,13 @@
+>=glib-2.31 build fix
+
+--- a/spawn.c
++++ b/spawn.c
+@@ -24,7 +24,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
+-#include <glib/gspawn.h>
++#include <glib.h>
+ 
+ #include "spawn.h"
+ #include "screen.h"