Stop using -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED in configure.ac because it breaks with GTK+-2.12 wrt #192408.

Package-Manager: portage-2.1.3.9

4 files changed, 32 insertions, 20 deletions

diff --git a/media-sound/gnusound/ChangeLog b/media-sound/gnusound/ChangeLog
index 54e6dd7d8917..f7a9be86f57a 100644
--- a/media-sound/gnusound/ChangeLog
+++ b/media-sound/gnusound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/gnusound
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.17 2007/06/12 20:37:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.18 2007/09/23 11:40:17 drac Exp $
+
+  23 Sep 2007; Samuli Suominen <drac@gentoo.org>
+  +files/gnusound-0.7.4-gtk212.patch, gnusound-0.7.4.ebuild:
+  Stop using -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED in
+  configure.ac because it breaks with GTK+-2.12 wrt #192408.
 
   12 Jun 2007; Alexis Ballier <aballier@gentoo.org> gnusound-0.7.4.ebuild:
   Ship gtk.m4 to avoid autoconf failures on systems without gtk 1 installed
diff --git a/media-sound/gnusound/Manifest b/media-sound/gnusound/Manifest
index 9b148c9d8c04..32af7652d8bc 100644
--- a/media-sound/gnusound/Manifest
+++ b/media-sound/gnusound/Manifest
@@ -1,17 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gnusound-0.7.4-gtk212.patch 622 RMD160 c0ebb9708919327bafd0e0fe28ba21298294d99c SHA1 e0057b6b16834a76714497e82350ba1a602f12ca SHA256 b2f765188fd71abce97711a27e2c8bdd8d5e3e40005483ab45a5a7bf65d01e6d
+MD5 136f9ffb743d8e6d9ee81456eb57b166 files/gnusound-0.7.4-gtk212.patch 622
+RMD160 c0ebb9708919327bafd0e0fe28ba21298294d99c files/gnusound-0.7.4-gtk212.patch 622
+SHA256 b2f765188fd71abce97711a27e2c8bdd8d5e3e40005483ab45a5a7bf65d01e6d files/gnusound-0.7.4-gtk212.patch 622
 DIST gnusound-0.7.4-m4-1.tar.bz2 2878 RMD160 bc34bad75c70096e4c86a5366bfb90447efb667f SHA1 30fdf0ee15678c4d53d6ff8017e900761578f38f SHA256 4bf61eeb5c79154fcdc3c2d18eb429e8f876924977a6cc2c9d377ea17d6848e0
 DIST gnusound-0.7.4-patches-1.tar.bz2 6190 RMD160 55b05431c1c0222e1ed73ffcad6c5ad575be163f SHA1 01340a8ecba8a1a5fbcf54eeaebde44ee2fd2c1b SHA256 3586478c7c986fb170b9a2fc71e2b5051bf593625bf0ce079397b306b7ef0040
 DIST gnusound-0.7.4.tar.bz2 513044 RMD160 775c7d3ae5dc94f56221526c7e1f0e9afb6a0b7f SHA1 c5fc8bc979d5031ab8850cbd39a072abe7372194 SHA256 9309d8212cf1d98ab1e8de776e52e2fcd6e68618b0bf4ac60766f6351746edfb
-EBUILD gnusound-0.7.4.ebuild 2282 RMD160 a346c99b6c5437ebf5a1264c00a1e588274bf64c SHA1 10f52042fdf848f73a0dc795703f63d856a8bd32 SHA256 e0549a7d62232e4b23bd1f771de64099118d840f1b2066cad82afa48d0b4a279
-MD5 90546c3b8fd8df53ffa4cb009419f62f gnusound-0.7.4.ebuild 2282
-RMD160 a346c99b6c5437ebf5a1264c00a1e588274bf64c gnusound-0.7.4.ebuild 2282
-SHA256 e0549a7d62232e4b23bd1f771de64099118d840f1b2066cad82afa48d0b4a279 gnusound-0.7.4.ebuild 2282
-MISC ChangeLog 3245 RMD160 069c91f3d6a2269bb85dd57b30dad567f9d58918 SHA1 48673f949db9fee2fce4d0446d82edb1d14aa575 SHA256 f984854feebbc9774675d38057ef40918aa064af5b0e7afe3aa41203c3b45199
-MD5 efe7880ed55d632823eedd6ede1f861e ChangeLog 3245
-RMD160 069c91f3d6a2269bb85dd57b30dad567f9d58918 ChangeLog 3245
-SHA256 f984854feebbc9774675d38057ef40918aa064af5b0e7afe3aa41203c3b45199 ChangeLog 3245
+EBUILD gnusound-0.7.4.ebuild 2318 RMD160 387b92f48d29c209f1cee41e913b5792249c2f8d SHA1 c70c1dd0a68992679000c466f02f2c417459468e SHA256 02006ea072d9630c3c80232db9d741920f8a91150ac078d4d1cf1fa2f7ba8615
+MD5 17bdd9c5a90f255da775a8e518571b03 gnusound-0.7.4.ebuild 2318
+RMD160 387b92f48d29c209f1cee41e913b5792249c2f8d gnusound-0.7.4.ebuild 2318
+SHA256 02006ea072d9630c3c80232db9d741920f8a91150ac078d4d1cf1fa2f7ba8615 gnusound-0.7.4.ebuild 2318
+MISC ChangeLog 3481 RMD160 7957b114f03b7d5062a62cff712e2702a602caeb SHA1 fe5ed46e1fd32951df20c6ed8c0a987645827f55 SHA256 7884654bec123cc626c4cce1f30ab35d263ce8a0457d90ef41f24eb50af21828
+MD5 aa2896b184e2b85b3b1831f148d3ec2e ChangeLog 3481
+RMD160 7957b114f03b7d5062a62cff712e2702a602caeb ChangeLog 3481
+SHA256 7884654bec123cc626c4cce1f30ab35d263ce8a0457d90ef41f24eb50af21828 ChangeLog 3481
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -19,10 +20,3 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 61d93dc876b0ecfa9d1d065065b30df5 files/digest-gnusound-0.7.4 774
 RMD160 ee562791f9ba09d806b46ef54b6018b3d2764d94 files/digest-gnusound-0.7.4 774
 SHA256 d767c3b9cb5972ed1ccd1d1697c080e989647d6aef672b571926e54daf5c0244 files/digest-gnusound-0.7.4 774
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGbwQrvFcC4BYPU0oRApvpAJ9zsm6uXiKnmEkGGF1k957sNs52lgCfe/xU
-1zWLUtvq7vpb3X2PJNR6s64=
-=DqJL
------END PGP SIGNATURE-----
diff --git a/media-sound/gnusound/files/gnusound-0.7.4-gtk212.patch b/media-sound/gnusound/files/gnusound-0.7.4-gtk212.patch
new file mode 100644
index 000000000000..656bd95d9568
--- /dev/null
+++ b/media-sound/gnusound/files/gnusound-0.7.4-gtk212.patch
@@ -0,0 +1,12 @@
+diff -ur gnusound-0.7.4.orig/configure.ac gnusound-0.7.4/configure.ac
+--- gnusound-0.7.4.orig/configure.ac	2005-07-06 12:56:47.000000000 +0300
++++ gnusound-0.7.4/configure.ac	2007-09-23 14:34:48.000000000 +0300
+@@ -242,7 +242,7 @@
+ if test "x$use_gnome2" = "xyes"; then
+   PKG_CHECK_MODULES(GNOME2,libgnomeui-2.0 >= 2.0.0 libglade-2.0 gthread-2.0,
+         AC_DEFINE(HAVE_GNOME2,,[use GNOME2])
+-        CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -rdynamic $GNOME2_CFLAGS"
++        CFLAGS="$CFLAGS -rdynamic $GNOME2_CFLAGS"
+         LIBS="$LIBS -rdynamic $GNOME2_LIBS",
+         use_gnome2=no)
+ fi
diff --git a/media-sound/gnusound/gnusound-0.7.4.ebuild b/media-sound/gnusound/gnusound-0.7.4.ebuild
index eaa645fcf199..a0f7b8d91bd7 100644
--- a/media-sound/gnusound/gnusound-0.7.4.ebuild
+++ b/media-sound/gnusound/gnusound-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.7.4.ebuild,v 1.6 2007/06/12 20:37:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.7.4.ebuild,v 1.7 2007/09/23 11:40:17 drac Exp $
 
 WANT_ATUOMAKE=1.8
 WANT_AUTOCONF=2.5
@@ -49,6 +49,7 @@ src_unpack() {
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 	cp "${WORKDIR}"/m4/* config/
+	epatch "${FILESDIR}"/${P}-gtk212.patch
 	AT_M4DIR="config" eautoreconf
 }