Patch to fix compilation with new versions of gtk/glib.

5 files changed, 72 insertions, 10 deletions

diff --git a/media-sound/gnusound/ChangeLog b/media-sound/gnusound/ChangeLog
index d2f05729e8e9..80fd2aa16320 100644
--- a/media-sound/gnusound/ChangeLog
+++ b/media-sound/gnusound/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gnusound
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.5 2004/07/06 08:08:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.6 2004/10/08 07:14:12 eradicator Exp $
+
+  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  gnusound-0.6.2.ebuild, +files/gnusound-0.6.2-gtkdep.patch:
+  Patch to fix compilation with new versions of gtk/glib.
 
   06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   gnusound-0.6.2.ebuild:
diff --git a/media-sound/gnusound/Manifest b/media-sound/gnusound/Manifest
index 9222322e06f7..001cfd102006 100644
--- a/media-sound/gnusound/Manifest
+++ b/media-sound/gnusound/Manifest
@@ -1,6 +1,17 @@
-MD5 9e784ef6f5594cc8aa9ab2f58e23d5ea ChangeLog 704
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 79a13a8864a89d8f3fab583d8ff86384 ChangeLog 895
 MD5 f22ab421f3602aa20e1768dcf5f09e1b gnusound-0.6.1.ebuild 1107
-MD5 688d2fbc2f5c8e320c298bbf1eaf07dd gnusound-0.6.2.ebuild 1148
-MD5 9facd0bc4253ab84a2744bba7b5f27cb metadata.xml 247
+MD5 8bf9bd9a9456d4d2df3029d68181bc0f gnusound-0.6.2.ebuild 1208
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 144ea19f7fb52c88a88e39c3abe72dba files/digest-gnusound-0.6.1 67
 MD5 2fc6416b1d46e2e4b4cd98881e3b6ca6 files/digest-gnusound-0.6.2 67
+MD5 7664f0269c796f265829b3d0fc5690c8 files/gnusound-0.6.2-gtkdep.patch 1673
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBZj5UArHZZzCEUG0RAkC+AJ9ZHLKjgH5kcCdhkSAT5Ey0jqmPvACfUhWy
+GtpHndZNBRfJFSRWMeOir84=
+=4qkV
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gnusound/files/gnusound-0.6.2-gtkdep.patch b/media-sound/gnusound/files/gnusound-0.6.2-gtkdep.patch
new file mode 100644
index 000000000000..2d9ccd025ca5
--- /dev/null
+++ b/media-sound/gnusound/files/gnusound-0.6.2-gtkdep.patch
@@ -0,0 +1,48 @@
+diff -Naur gnusound-0.6.2.orig/config.h gnusound-0.6.2/config.h
+--- gnusound-0.6.2.orig/config.h	2003-04-14 15:31:47.000000000 +0200
++++ gnusound-0.6.2/config.h	2004-09-10 23:48:52.379703328 +0200
+@@ -15,8 +15,6 @@
+ #include "defines.h"
+ 
+ #ifdef HAVE_GNOME2
+-#define GTK_DISABLE_DEPRECATED 1
+-#define GNOME_DISABLE_DEPRECATED 1
+ #define GLADE_FILE             "gnusound-2.glade"
+ #else
+ /* GNOME1 compatibility layer :) */
+diff -Naur gnusound-0.6.2.orig/configure gnusound-0.6.2/configure
+--- gnusound-0.6.2.orig/configure	2004-01-15 08:11:20.000000000 +0100
++++ gnusound-0.6.2/configure	2004-09-10 23:49:17.157936464 +0200
+@@ -4981,7 +4981,7 @@
+ #define HAVE_GNOME2
+ _ACEOF
+ 
+-        CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -rdynamic $GNOME2_CFLAGS"
++        CFLAGS="$CFLAGS  -rdynamic $GNOME2_CFLAGS"
+         LIBS="$LIBS -rdynamic $GNOME2_LIBS"
+         messages="$messages
+ * GNOME2 support is experimental.  Be careful.
+diff -Naur gnusound-0.6.2.orig/gui.c gnusound-0.6.2/gui.c
+--- gnusound-0.6.2.orig/gui.c	2003-04-08 11:12:55.000000000 +0200
++++ gnusound-0.6.2/gui.c	2004-09-10 23:51:28.917905904 +0200
+@@ -4,8 +4,6 @@
+  * Absolutely no warranty.
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED 1
+-#define GNOME_DISABLE_DEPRECATED 1
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -Naur gnusound-0.6.2.orig/shell.c gnusound-0.6.2/shell.c
+--- gnusound-0.6.2.orig/shell.c	2004-01-15 09:05:56.000000000 +0100
++++ gnusound-0.6.2/shell.c	2004-09-10 23:51:46.205277824 +0200
+@@ -4,8 +4,6 @@
+  * Absolutely no warranty.
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED 1
+-#define GNOME_DISABLE_DEPRECATED 1
+ 
+ #include <sys/time.h>
+ #include <sys/types.h>
diff --git a/media-sound/gnusound/gnusound-0.6.2.ebuild b/media-sound/gnusound/gnusound-0.6.2.ebuild
index 15cb60498d5b..d4d3a04f49d9 100644
--- a/media-sound/gnusound/gnusound-0.6.2.ebuild
+++ b/media-sound/gnusound/gnusound-0.6.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.6.2.ebuild,v 1.3 2004/07/06 08:08:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.6.2.ebuild,v 1.4 2004/10/08 07:14:12 eradicator Exp $
 
 IUSE="libsamplerate"
 
-inherit gnuconfig
+inherit gnuconfig eutils
 
 DESCRIPTION="GNUsound is a sound editor for Linux/x86"
 HOMEPAGE="http://gnusound.sourceforge.net/"
@@ -27,6 +27,9 @@ src_unpack() {
 	rm -f modules/Makefile || die "could not remove modules Makefile"
 	sed -i "s:docrootdir:datadir:" doc/Makefile.in
 
+	# Bug #54980
+	epatch ${FILESDIR}/${P}-gtkdep.patch
+
 	gnuconfig_update
 }
 
diff --git a/media-sound/gnusound/metadata.xml b/media-sound/gnusound/metadata.xml
index cc0775da35be..e1774e3d9ad7 100644
--- a/media-sound/gnusound/metadata.xml
+++ b/media-sound/gnusound/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>jake@gentoo.org</email>
-  <name>Blake Matheny</name>
-</maintainer>
 </pkgmetadata>