Revbump to fix GTK Critical errors wrt bug #349419. Bug report and patch by Rick Warner <rick@sapphire.no-ip.com>

Package-Manager: portage-2.2.0_alpha13/cvs/Linux x86_64

4 files changed, 91 insertions, 3 deletions

diff --git a/media-sound/gnomad/ChangeLog b/media-sound/gnomad/ChangeLog
index 5eb1b20b38a1..1a9c1307c86c 100644
--- a/media-sound/gnomad/ChangeLog
+++ b/media-sound/gnomad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/gnomad
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/ChangeLog,v 1.36 2009/05/14 19:57:36 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/ChangeLog,v 1.37 2011/01/07 05:10:33 serkan Exp $
+
+*gnomad-2.9.4-r1 (07 Jan 2011)
+
+  07 Jan 2011; Serkan Kaba <serkan@gentoo.org> +gnomad-2.9.4-r1.ebuild,
+  +files/gnomad-2.9.4-fix-gtk-widget-destroy.diff:
+  Revbump to fix GTK Critical errors wrt bug #349419. Bug report and patch by
+  Rick Warner <rick@sapphire.no-ip.com>
 
   14 May 2009; Markus Meier <maekke@gentoo.org> gnomad-2.9.4.ebuild:
   amd64/x86 stable, bug #269411
diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest
index e088818d001f..2c8109122157 100644
--- a/media-sound/gnomad/Manifest
+++ b/media-sound/gnomad/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnomad-2.9.4-fix-gtk-widget-destroy.diff 681 RMD160 f2cbdef78404aaf5433817c70847628e3266b7af SHA1 1ee1d5d8ac63e8400363b5fd62ddab4949a49829 SHA256 7349f56888a1f4369a8a400b510c2c015ba53db63aa1fcd6fc8fa5fdad0f7803
 DIST gnomad2-2.9.4.tar.gz 347481 RMD160 ff884acb2425f84541b8a7ee2e86403d2509149a SHA1 51d8d89c2960a36084fc6dd007fe652224b57ce5 SHA256 7dc696b50b9bb5fcbddf67988096a989212a4f6c6a728a5b491f06c64569e380
+EBUILD gnomad-2.9.4-r1.ebuild 1067 RMD160 23f72200d7f1ff0479f5f8f8e86936b36c4454f4 SHA1 b107f72b74784af53a296abd7443adaf8f993014 SHA256 7213e190f89bc982912e6be1425681613340810d199facbafc6559e8c9e7f887
 EBUILD gnomad-2.9.4.ebuild 988 RMD160 58656b556cfaf9b645cdf8b6e4eb3d075544b4b5 SHA1 bd5e01269e3eb8a1f8398ce62ee7bf17aea18474 SHA256 42dc1f03e243fb1aedb91ca6c35fc7a9d1c3cc2b5b2f74a4d5cde7729fe232ae
-MISC ChangeLog 4921 RMD160 b66dcd6069109b2f0507b4bd7a14431f7bdf5943 SHA1 133a5768451d74908668709dbac0bc6100174b36 SHA256 0ed12f9a63de12758553c8a4c569889fa36233c3d1f9d3d3118221ceb55b9796
+MISC ChangeLog 5195 RMD160 80a1eda468d20b08e185ba4f4aea34fd43c0fdde SHA1 4cf79954dd2dc5d6fd968bc167d398f02068f4be SHA256 2757547c3c4f0f9a16fc5c3edbc9f0da0e26217e64ab3f1dd8d977c98b3aaee1
 MISC metadata.xml 250 RMD160 b54dd8011b3d6177a89d21f6fbdb751aa9d69934 SHA1 c5de7e2c409a5f0f76a59acbd3164752c7d54819 SHA256 9843e2780d4541b36788a00dc8ac35ddb86fab1116002a1f34c97e6d97c61dbd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0moFEACgkQRh6X64ivZaJgWQCfVCiJebtlkQvqLgktbikTNql2
++fQAmwWPXoO98qbnN4mpCR+14FhS6YJS
+=kgDH
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gnomad/files/gnomad-2.9.4-fix-gtk-widget-destroy.diff b/media-sound/gnomad/files/gnomad-2.9.4-fix-gtk-widget-destroy.diff
new file mode 100644
index 000000000000..2e3369b1e705
--- /dev/null
+++ b/media-sound/gnomad/files/gnomad-2.9.4-fix-gtk-widget-destroy.diff
@@ -0,0 +1,22 @@
+--- src/filesystem.c.orig	2009-01-22 17:29:16.000000000 -0500
++++ src/filesystem.c	2010-12-22 16:00:44.000000000 -0500
+@@ -633,6 +633,10 @@
+   return metalist;
+ }
+ 
++void my_gtk_widget_destroy(GtkWidget *widget) {
++ if (GTK_IS_WIDGET(widget)) gtk_widget_destroy(widget);
++}
++
+ static gpointer dirfill_thread(gpointer thread_args)
+ {
+   dirfill_thread_arg_t *args = (dirfill_thread_arg_t *) thread_args;
+@@ -653,7 +657,7 @@
+   metarg->metalist = metalist;
+   g_idle_add(update_metadata,metarg);
+ 
+-  g_idle_add((GSourceFunc) gtk_widget_destroy, args->dialog);
++  g_idle_add((GSourceFunc) my_gtk_widget_destroy, args->dialog);
+   g_free(args->path);
+   g_free(args);
+   return NULL;
diff --git a/media-sound/gnomad/gnomad-2.9.4-r1.ebuild b/media-sound/gnomad/gnomad-2.9.4-r1.ebuild
new file mode 100644
index 000000000000..450c463b28a5
--- /dev/null
+++ b/media-sound/gnomad/gnomad-2.9.4-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.9.4-r1.ebuild,v 1.1 2011/01/07 05:10:33 serkan Exp $
+
+EAPI=2
+GCONF_DEBUG=no
+inherit flag-o-matic gnome2
+
+MY_P=${PN}2-${PV}
+
+DESCRIPTION="A GNOME2 frontend for Creative Players (Zen, JukeBox, etc ...)"
+HOMEPAGE="http://gnomad2.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}2/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+RDEPEND="sys-apps/hal
+	dev-libs/dbus-glib
+	>=x11-libs/gtk+-2.6:2
+	>=media-libs/libnjb-2.2.4
+	>=media-libs/libmtp-0.3
+	>=media-libs/taglib-1.5
+	>=media-libs/libid3tag-0.15.1b"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext
+		dev-util/intltool )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-gtk-widget-destroy.diff
+}
+
+pkg_setup() {
+	G2CONF+=" $(use_enable nls)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_configure() {
+	strip-flags
+	replace-flags -O3 -O2
+	gnome2_src_configure
+}