Add a patch to fix compilation of 2.x versions with >=dev-libs/glib-2.32

Package-Manager: portage-2.2.0_alpha108/cvs/Linux i686

5 files changed, 33 insertions, 6 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 5510456f3d25..e0b5ca9d123c 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.245 2012/05/24 02:18:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.246 2012/05/25 06:55:17 jdhore Exp $
+
+  25 May 2012; Jeff Horelick <jdhore@gentoo.org>
+  +files/audacious-plugins-2.x-fix-skins-build-glib-2.32.patch,
+  audacious-plugins-2.4.4-r1.ebuild, audacious-plugins-2.5.4.ebuild:
+  Add a patch to fix compilation of 2.x versions with >=dev-libs/glib-2.32
 
   24 May 2012; Jeff Horelick <jdhore@gentoo.org>
   audacious-plugins-3.2.2-r1.ebuild:
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index c41083d980a5..def38e9f43c7 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,3 +1,4 @@
+AUX audacious-plugins-2.x-fix-skins-build-glib-2.32.patch 373 RMD160 098cc04132eeea011073bf50357dc5cd111fa4ff SHA1 99c581446e4fa2157c6285fd0f9655f3aa5ee718 SHA256 35511091a09198cc52c272748da35f3bce44b0cdafc2284843c41033e0f2bbde
 AUX audacious-plugins-3.2.2-fix-build-gmodule.patch 1244 RMD160 35437408a10eba1c616b2b78f605ab82c51f21ba SHA1 17e73f9d886b961d12053d1ee2a21dd1260333a3 SHA256 c86428993218ea785d740cc0e051a4c2401aadc17f35940048dd39347f1acdd5
 AUX audacious-plugins-3.2.2-fix-build-sdl.patch 622 RMD160 9c6e99012e5377031524b7024bc33ce2e10d2abf SHA1 4b3dcd60754c8d8aac1a10a5d41f35a6929b4b05 SHA256 c6b13de9284cb918a749b8c1356685af233c26065a1aff41290c5fff94074eb3
 AUX audacious-plugins_ldflags.patch 392 RMD160 4d606042a86ecc360fdd51131286027fbb5c991c SHA1 12929db542e94db329f50fec1d01a296b764c032 SHA256 1c22569d2a5c54656713f57b74412f61d09e002b87c6af2c291e771217d91a6a
@@ -8,12 +9,12 @@ DIST audacious-plugins-3.1.tar.bz2 2156993 RMD160 b62f8724a7babb53d4e2d70fb91edd
 DIST audacious-plugins-3.2.1.tar.bz2 1978406 RMD160 705043684ddddd21ba120c4168f1d76ca8a36fb7 SHA1 7957f545a2c050ba2d7b1fb9cf53fe77bf5f853c SHA256 5b7d3e52f6b8903bc01ae15651817e990d3348ae6b9734767f354eb2dbfc8c2d
 DIST audacious-plugins-3.2.2.tar.bz2 1898457 RMD160 76c027177820124e3efec6eaef87dc5aad6991ea SHA1 4518a6fdcba0c1b496e048b45ce5d87a46326c9b SHA256 c637e6770ed41ec0e885f210944234326090d9cecf0547e2545fff09bc25b7fc
 DIST audacious-plugins-3.2.tar.bz2 1978199 RMD160 95d08f3459b5de79eb0fff5123f492dd6dc8dc98 SHA1 49cc0a05fddef8b1730f08d0a0bf9e4797cd393d SHA256 5f600bf8068bdfd306b5230c333f45d5c012dd71728a7b250fe839956ee09904
-EBUILD audacious-plugins-2.4.4-r1.ebuild 3519 RMD160 4e57c91fc722a99d3468e6ee83b755e527c80d7b SHA1 bec463e2aa44154252332db5434a2b2eb822e861 SHA256 282c5db1a7de57ce5b2676a6158d72e0884c1b0a0dae7526e2839ffa5a8208b7
-EBUILD audacious-plugins-2.5.4.ebuild 3477 RMD160 a0cd4b090fce0ecd95b4530e05d331e03661825f SHA1 216e82b517281ad8e91cef6f93b1911c9e0b1a60 SHA256 70ad40a5aa49f2358cbeed9c50ec701cfb6fb3f8aee8a11039dd9ec4bc7ce27d
+EBUILD audacious-plugins-2.4.4-r1.ebuild 3602 RMD160 cfb2c9d836c4eda3a7290fafa6a4fa04c8da6a24 SHA1 9665d0dd1d12a929a1b4a948851f017404b3e47d SHA256 fb8af01758cac93221ce4c9e99d5a0ebf2cb8decd3fe113ffacae49386947700
+EBUILD audacious-plugins-2.5.4.ebuild 3560 RMD160 1650be795a77e34760ce3691b72fb0aa03a8789f SHA1 151e299f4179df40d3750a95d49e729e69392f6c SHA256 35a5646e92e6f5b27be0a28ff503873390603c1413edb2baee21c3561575a87d
 EBUILD audacious-plugins-3.1.1.ebuild 3423 RMD160 030fdccd6afcee56d36db05452f279b5fe1855c2 SHA1 1681d1209d99d8654664bb394da90e57d79dbe83 SHA256 6ea2321331a8deaed3daea89219de3abf9147c0a6cac5b2457d88585956e901a
 EBUILD audacious-plugins-3.1.ebuild 3414 RMD160 b8157d106a57f250f52e1b065bde98a9dba94b66 SHA1 448acfd7afd57ca9385d3ff1eb1269b5ff36ae39 SHA256 29e41512a80145bdf089e7ae76db7ccb8eb81d2daa2d4bfdc329ddaf31d97ce1
 EBUILD audacious-plugins-3.2.1.ebuild 3317 RMD160 b909208a93acb865c90601e1e5ea3c7e0e3fb8ed SHA1 d85113255eb60172426696c2f8a5fc1768af5fe7 SHA256 61fb4920fad413f342f37fcdee4c4985ec2a783c898142282e8c960a4ab0b468
 EBUILD audacious-plugins-3.2.2-r1.ebuild 3447 RMD160 ce9397fa1f42d9c6c47dd251447b2c39ec172373 SHA1 ce5f7ab66e8e8e9b5d53b6c980448f5fdf895d49 SHA256 9911193210e9365b59290e22770d4889e577f790084afd582b1b97b7ea90ea72
 EBUILD audacious-plugins-3.2.ebuild 3313 RMD160 3fa4427809d81df4874155623ad694d7623561a8 SHA1 f7dd3c7bca4887ad2958a3b45807fa781f2097ea SHA256 f2cb4c2917863c27c5532b8c212a18696d672dbde29732b41644a7ed76825c63
-MISC ChangeLog 50817 RMD160 0a29376ef1045ea293beaffd61096503ecb01a75 SHA1 e613f982e4c8cc85df191ae08e15ba4c6b34cb88 SHA256 1fd5c63d4dd93de8d8c3c8ec55e498e3bc067824f6f1c98f0b847ea9b3eb3ba0
+MISC ChangeLog 51075 RMD160 becc967873a63405660db7c84318b77fc9c64250 SHA1 afaf5f240ee8e587c796d170d3244c42a993f9f8 SHA256 59e59942a57dff5d32be58272924b2114b7f5bc1a8077affbc94293bbcf21d40
 MISC metadata.xml 900 RMD160 bbe25dee100a0a3158ca5cdb78e142adbc8a7cd6 SHA1 0d199202747a7e8fc420f4fa7172877d865e16c9 SHA256 67b5344a7a88e6d04a4df5958625bc175514692e5e0f5a9c441ebbbcf9bb2750
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.4.4-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.4.4-r1.ebuild
index 1db8f4189d13..d40bf824fb19 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.4.4-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.4.4-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/media-plugins/audacious-plugins/audacious-plugins-2.4.4-r1.ebuild,v 1.10 2012/05/05 08:27:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.4.4-r1.ebuild,v 1.11 2012/05/25 06:55:17 jdhore Exp $
 
 EAPI="3"
 
@@ -63,6 +63,10 @@ mp3_warning() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.x-fix-skins-build-glib-2.32.patch
+}
+
 src_configure() {
 	mp3_warning
 
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild
index 423316e891bb..f53aaec1a001 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.5.4.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/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild,v 1.6 2012/05/05 08:27:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild,v 1.7 2012/05/25 06:55:17 jdhore Exp $
 
 EAPI=4
 
@@ -63,6 +63,10 @@ mp3_warning() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.x-fix-skins-build-glib-2.32.patch
+}
+
 src_configure() {
 	mp3_warning
 
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-2.x-fix-skins-build-glib-2.32.patch b/media-plugins/audacious-plugins/files/audacious-plugins-2.x-fix-skins-build-glib-2.32.patch
new file mode 100644
index 000000000000..f5fb42cf53d1
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/audacious-plugins-2.x-fix-skins-build-glib-2.32.patch
@@ -0,0 +1,13 @@
+diff --git a/src/skins/ui_skinned_window.c b/src/skins/ui_skinned_window.c
+index 9b178a2..b90e943 100644
+--- a/src/skins/ui_skinned_window.c
++++ b/src/skins/ui_skinned_window.c
+@@ -20,7 +20,7 @@
+ 
+ #include <gtk/gtkmain.h>
+ #include <glib-object.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <gtk/gtkmarshal.h>
+ #include <gtk/gtkwindow.h>
+ #include <string.h>