fix building with latest gtk+, bug 247951. Add Thomas Beierlein to metadata, he will be maintaining this through me

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc6-wl-dirty x86_64

5 files changed, 38 insertions, 17 deletions

diff --git a/media-radio/xdx/ChangeLog b/media-radio/xdx/ChangeLog
index e394b59f361c..476c41025fc6 100644
--- a/media-radio/xdx/ChangeLog
+++ b/media-radio/xdx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-radio/xdx
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/ChangeLog,v 1.14 2008/11/08 15:33:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/ChangeLog,v 1.15 2008/12/02 15:26:05 darkside Exp $
+
+  02 Dec 2008; Jeremy Olexa <darkside@gentoo.org> +files/xdx-2.4-gtk.patch,
+  metadata.xml, xdx-2.4.ebuild:
+  fix building with latest gtk+, bug 247951. Add Thomas Beierlein to metadata,
+  he will be maintaining this through me
 
   08 Nov 2008; Markus Meier <maekke@gentoo.org> xdx-2.4.ebuild:
   amd64/x86 stable, bug #245578
diff --git a/media-radio/xdx/Manifest b/media-radio/xdx/Manifest
index 55f19936e96e..9237e9f9969a 100644
--- a/media-radio/xdx/Manifest
+++ b/media-radio/xdx/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xdx-2.4-gtk.patch 421 RMD160 ccedc9acb01652b04a7a1d85cf624e88471aea00 SHA1 f80ba369a63c2f3e2b1c0262d08a524d53d1095d SHA256 a6338b879c5b81e8d78e6084dc77cd4695bb4476b02f64c94b4c2f731ed1c2af
 DIST xdx-1.2.tar.gz 204680 RMD160 727dc18a53637aecd7083de5b9b7d85721f62cf8 SHA1 b4720c8ad873f065348933351a7c7d6909171b21 SHA256 cee4b67d00737e60c240348206da5abbf77aa05cca30ce2d6953fcdf175f5283
 DIST xdx-2.3.tar.gz 258939 RMD160 4214a6cbcb5f7dbddc268fe0fcddd4cd7c919f07 SHA1 d610873c759675f06a86a7de13b3d2d7f414a714 SHA256 43d1bad88979183f62b470d65e48aabbcb2304fa16f1d1142e77b847cb286913
 DIST xdx-2.4.tar.gz 282279 RMD160 e03f220fa59d6117b434561d45e49c6c516fea27 SHA1 e1e3be300bb3ac4accd3af5415e0d12c211a91f2 SHA256 fefe3fb34e56613f9b138882bc8226106995c801d873a1c5f6e595bfc9e81fa9
 EBUILD xdx-1.2.ebuild 874 RMD160 e16edc1cc6a62b410dd0d949b8c14cc0813ab513 SHA1 514aaf01b706cfe1c5bd134b10d8280c4abd4fed SHA256 e2850df544716d498cb81dbdc9952169215bd9ba696af5fa84ed11719a8c0b35
 EBUILD xdx-2.3.ebuild 879 RMD160 a599ab00bcd6c288a1e0427d677ccd970f17fbc5 SHA1 4419f0fd217a3fb79e1db6de1677d2ca004834c5 SHA256 f3c4d6411cde7f5373c3e0578d82932a2f354ff6795a680cf8ba444a0d4a331f
-EBUILD xdx-2.4.ebuild 902 RMD160 22e0e2455fbb3b805542e13c996a5a668ffca98d SHA1 8b5f79109946d0e772deeca508893dccca0a97d2 SHA256 9425f8b1d1edee8b8022ad212af2413eee52bb917d23e2f64d5759a0e5238b25
-MISC ChangeLog 1618 RMD160 2aa45a33c107e3d7bf6c598b92c70cd320a1382c SHA1 a38ce07096b794236312df693a632d11ac49255a SHA256 dce688764f466da2192dd37e81689ba67f5b3a985d4d8451927d36c5b9740cf2
-MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkVsWgACgkQkKaRLQcq0GIg7ACgjsVtdeFt2CSm+LPF0Y5f705h
-mfYAoJSRMPpjS4lSYRbUENZxoiIF3Umh
-=gP/a
------END PGP SIGNATURE-----
+EBUILD xdx-2.4.ebuild 1052 RMD160 e6930bd319aeef82667da3f2ee46b17d3718e7a1 SHA1 3765ce99d1295d8ab02e8fc7ae84e09406e710aa SHA256 d81f8b8949b48ddfa557bf594e5451d7725797d66aa373772cbaab53f2b90318
+MISC ChangeLog 1849 RMD160 3226641b19816a748fd9f81021c394b709d4c801 SHA1 1b6ae049bcb03fbde4f0a90b6989e2b7425d6c20 SHA256 1e963795f073d21e46876c9bf3304b2dba439a13c8965e421ad2cd07b63712e5
+MISC metadata.xml 445 RMD160 5c4df32a3cd29ba926c9c5457ad462ac00798b87 SHA1 db84ad4be4f3e05bddbcbd4eafdf17b9f1b68bf6 SHA256 f47eb6e8c3746271d2996691a234c9216c9821ec937828d8c8aeedca29b10d00
diff --git a/media-radio/xdx/files/xdx-2.4-gtk.patch b/media-radio/xdx/files/xdx-2.4-gtk.patch
new file mode 100644
index 000000000000..8928f2e72e83
--- /dev/null
+++ b/media-radio/xdx/files/xdx-2.4-gtk.patch
@@ -0,0 +1,11 @@
+--- src/gui_manualdialog.c.orig	2008-11-21 16:19:15.000000000 +0100
++++ src/gui_manualdialog.c	2008-11-21 16:19:45.000000000 +0100
+@@ -59,7 +59,7 @@
+ 	helpfile = g_strdup_printf ("%s%s%s", PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S, _("MANUAL"));
+ 
+ 	g_signal_connect(G_OBJECT(manualdialog), "response",
+-		GTK_SIGNAL_FUNC(gtk_widget_destroy), NULL);
++		G_CALLBACK (gtk_widget_destroy), NULL);
+ 
+ 
+ 	in = fopen (helpfile, "r");
diff --git a/media-radio/xdx/metadata.xml b/media-radio/xdx/metadata.xml
index fae7d74a9aee..6877160ab12c 100644
--- a/media-radio/xdx/metadata.xml
+++ b/media-radio/xdx/metadata.xml
@@ -3,7 +3,12 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
+		<email>tb@forth-ev.de</email>
+		<name>Thomas Beierlein</name>
+		<description>Proxy maintainer, please assign bugs</description>
+	</maintainer>
+	<maintainer>
+	  <email>darkside@gentoo.org</email>
+	  <description>Proxy committer, CC on bugs</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/media-radio/xdx/xdx-2.4.ebuild b/media-radio/xdx/xdx-2.4.ebuild
index f5db50c4cc4e..26e43d2ab42d 100644
--- a/media-radio/xdx/xdx-2.4.ebuild
+++ b/media-radio/xdx/xdx-2.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/xdx-2.4.ebuild,v 1.3 2008/11/08 15:33:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/xdx-2.4.ebuild,v 1.4 2008/12/02 15:26:05 darkside Exp $
+
+inherit eutils
 
 DESCRIPTION="a GTK+ TCP/IP DX-cluster and ON4KST chat client."
 HOMEPAGE="http://www.qsl.net/pg4i/linux/xdx.html"
@@ -16,6 +18,13 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+src_unpack(){
+	unpack ${A}
+	cd "${S}"
+	# fix for deprecated macro in GTK+-2.14 and later
+	epatch "${FILESDIR}"/xdx-2.4-gtk.patch
+}
+
 src_compile() {
 	econf $(use_enable nls)
 	emake || die "emake failed."