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

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

7 files changed, 39 insertions, 6 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/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"