Added patch for gtk-2.6 from bug #75208.

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 140a8b8eb03c86cbeae75c84676fbd46b018139a..d00916150db5106973fe27e1fb96112eb3aa75ca 100644 (file)
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.41 2004/12/21 13:26:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.42 2004/12/22 00:03:54 eradicator Exp $
 
   22 Dec 2004; Joseph Jezak <josejx@gentoo.org> timidity++-2.13.2.ebuild:
   Marked ppc stable.
 
+  21 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/timidity++-2.13.2-gtk26.patch, timidity++-2.13.2.ebuild:
+  Added patch for gtk-2.6 from bug #75208.
+
   18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   timidity++-2.13.2.ebuild:
   Don't pull in tk unless we want X also.

diff --git a/media-sound/timidity++/files/timidity++-2.13.2-gtk26.patch b/media-sound/timidity++/files/timidity++-2.13.2-gtk26.patch
new file mode 100644 (file)
index 0000000..73dc8de
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.13.2-gtk26.patch
@@ -0,0 +1,19 @@
+--- interface/gtk_i.c  2004/12/21 16:59:33     1.1
++++ interface/gtk_i.c  2004/12/21 16:59:41
+@@ -365,6 +365,7 @@ void
+ Launch_Gtk_Process(int pipe_number)
+ {
+     int       argc = 0;
++    gchar **argv = NULL;
+     GtkWidget *button, *mbar, *swin;
+     GtkWidget *table, *align, *handlebox;
+     GtkWidget *vbox, *hbox, *vbox2, *scrolled_win;
+@@ -373,7 +374,7 @@ Launch_Gtk_Process(int pipe_number)
+     /* enable locale */
+     gtk_set_locale ();
+ 
+-    gtk_init (&argc, NULL);
++    gtk_init (&argc, &argv);
+ 
+     ttip = create_yellow_tooltips();
+     window = gtk_window_new(GTK_WINDOW_TOPLEVEL);

diff --git a/media-sound/timidity++/timidity++-2.13.2.ebuild b/media-sound/timidity++/timidity++-2.13.2.ebuild
index cd8ad140d77dc038910a5dd0ad749f9229f17ec0..d3d50fa2f9de216372f35e34891c7469e541e84a 100644 (file)
--- a/media-sound/timidity++/timidity++-2.13.2.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.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/timidity++/timidity++-2.13.2.ebuild,v 1.4 2004/12/21 13:26:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2.ebuild,v 1.5 2004/12/22 00:03:54 eradicator Exp $
 
 IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa arts jack portaudio emacs"
 
-inherit gnuconfig
+inherit gnuconfig eutils
 
 MY_PV=${PV/_/-}
 MY_P=TiMidity++-${MY_PV}
@@ -38,6 +38,12 @@ RDEPEND="${RDEPEND}
        X? ( tcltk? ( >=dev-lang/tk-8.1 ) )
        emacs? ( virtual/emacs )"
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${P}-gtk26.patch
+}
+
 src_compile() {
        local myconf
        local audios