Fix for deprecated macro in GTK+-2.20 and later (bug #326627). Thanks Diego and Kevin.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 66 insertions, 12 deletions

diff --git a/media-radio/xdx/ChangeLog b/media-radio/xdx/ChangeLog
index c13e7b6ab377..0cb449f1a12b 100644
--- a/media-radio/xdx/ChangeLog
+++ b/media-radio/xdx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-radio/xdx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/ChangeLog,v 1.17 2010/04/30 20:33:41 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/ChangeLog,v 1.18 2010/07/03 12:11:48 tomjbe Exp $
+
+  03 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> xdx-2.4.ebuild,
+  xdx-2.4.2.ebuild, +files/xdx-gtk-2.20.patch:
+  Fix for deprecated macro in GTK+-2.20 and later (bug #326627). Thanks
+  Diego and Kevin.
 
 *xdx-2.4.2 (30 Apr 2010)
 
diff --git a/media-radio/xdx/Manifest b/media-radio/xdx/Manifest
index 8838d578c369..12b75a28f6fe 100644
--- a/media-radio/xdx/Manifest
+++ b/media-radio/xdx/Manifest
@@ -1,11 +1,12 @@
 AUX xdx-2.4-gtk.patch 421 RMD160 ccedc9acb01652b04a7a1d85cf624e88471aea00 SHA1 f80ba369a63c2f3e2b1c0262d08a524d53d1095d SHA256 a6338b879c5b81e8d78e6084dc77cd4695bb4476b02f64c94b4c2f731ed1c2af
+AUX xdx-gtk-2.20.patch 1308 RMD160 71a0d1b2375ad2813197486735f697723daa3cf8 SHA1 ad8a82ff2b048843e3c9ff82fa6f011664a1940d SHA256 1deeb2da14e1ab471c7ec76a861423a7549d71491c8c198ed2a317c62bf4e830
 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.2.tar.gz 284792 RMD160 2575fc2d4db0290cbdcf8207860f1ce69f46c699 SHA1 73ee995618e44e248fe5bce9bb545c48ea674044 SHA256 ba6e66a248c61a52349881e2c2ea3324840b0acc0419a85f12a49f00ca9d121a
 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.2.ebuild 926 RMD160 363397bda33c7566d1d612f039d368dd4c662ac1 SHA1 cdb4f0020cdacd1f3d7a32a6f70ba6f8c839a7a6 SHA256 1c8523951a222a6b7df562bb04327813c51bde9627074de3efca857fae7ef26d
-EBUILD xdx-2.4.ebuild 1052 RMD160 e6930bd319aeef82667da3f2ee46b17d3718e7a1 SHA1 3765ce99d1295d8ab02e8fc7ae84e09406e710aa SHA256 d81f8b8949b48ddfa557bf594e5451d7725797d66aa373772cbaab53f2b90318
-MISC ChangeLog 2117 RMD160 e9cd9b6e06b2aa9ce92b1fcd923262283e7b494a SHA1 68c256b169b451a2fe07ef8cc316d20a199c357e SHA256 5fcbe5040b6a21601e420062c8e2c3acfe2777f07a1c416b072321b7587d6e8f
+EBUILD xdx-2.4.2.ebuild 1100 RMD160 b18e244ceabff589a25fa4979757e37f97fd5aa1 SHA1 131b39ba31ae4053c0086f91f267e6ffb1e7a285 SHA256 9ebebe1fcfce6ec3d4bb326ad45d49b8c717feb34bace561e5c6e0f6a6810103
+EBUILD xdx-2.4.ebuild 1227 RMD160 adba8feac9c2c6da3f555841c4f8d27153c68743 SHA1 a0023a15d323fd72cc359b3b79380632a8345418 SHA256 b0de3bfea1917b6ced43a3780fc675e04b84b1df4e74f8a7ed03016d1ba27262
+MISC ChangeLog 2324 RMD160 04f55287a706cc54631de8c08ccd1dd16868b65e SHA1 7a8d156bebed5f8ab0057d805a7af403619d88a0 SHA256 1c487f1aa5f2a1b13c46fb994635760279d8d6a09bed763ca2cbd0873c944729
 MISC metadata.xml 257 RMD160 c6f05f5951c1ad7388dd56f4abe0ccdbe23505dd SHA1 e31f6d71d2344810cca782e2accf9058eeb2c1fd SHA256 e52fb7be2e8c1ca2b7ce0066517558a34ee01c9e6340e0a31a053594b9077eda
diff --git a/media-radio/xdx/files/xdx-gtk-2.20.patch b/media-radio/xdx/files/xdx-gtk-2.20.patch
new file mode 100644
index 000000000000..2b3c7655e152
--- /dev/null
+++ b/media-radio/xdx/files/xdx-gtk-2.20.patch
@@ -0,0 +1,34 @@
+# fix for bug #326627 deprecated macro from gtk+-2.20 on
+diff -Nur xdx-2.4.2.orig//src/gui.c xdx-2.4.2//src/gui.c
+--- xdx-2.4.2.orig//src/gui.c	2010-07-03 11:09:59.000000000 +0000
++++ xdx-2.4.2//src/gui.c	2010-07-03 11:10:45.000000000 +0000
+@@ -841,7 +841,7 @@
+   GtkWidget *mainentry;
+ 
+   mainentry = g_object_get_data (G_OBJECT (gui->window), "mainentry");
+-  if (GTK_WIDGET_HAS_FOCUS(mainentry))
++  if (gtk_widget_has_focus(mainentry))
+   {
+     switch (event->keyval)
+     {
+diff -Nur xdx-2.4.2.orig//src/text.c xdx-2.4.2//src/text.c
+--- xdx-2.4.2.orig//src/text.c	2010-07-03 11:09:59.000000000 +0000
++++ xdx-2.4.2//src/text.c	2010-07-03 11:11:16.000000000 +0000
+@@ -528,7 +528,7 @@
+ 
+ 
+         /* focusing the treeview will stop scrolling */ 
+-	if (!GTK_WIDGET_HAS_FOCUS(treeview))
++	if (!gtk_widget_has_focus(treeview))
+         {
+           path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
+           gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview), path, NULL, FALSE);
+@@ -797,7 +797,7 @@
+           }
+         }
+         /* focusing (clicking) the textview will stop scrolling */
+-	if (!GTK_WIDGET_HAS_FOCUS(maintext))
++	if (!gtk_widget_has_focus(maintext))
+ 	{
+           gtk_text_buffer_get_bounds (buffer, &start, &end);
+           gtk_text_buffer_place_cursor(buffer, &end);
diff --git a/media-radio/xdx/xdx-2.4.2.ebuild b/media-radio/xdx/xdx-2.4.2.ebuild
index 938f2fc911c2..c5a6521b3a22 100644
--- a/media-radio/xdx/xdx-2.4.2.ebuild
+++ b/media-radio/xdx/xdx-2.4.2.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/xdx-2.4.2.ebuild,v 1.1 2010/04/30 20:33:41 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/xdx-2.4.2.ebuild,v 1.2 2010/07/03 12:11:48 tomjbe Exp $
+
+EAPI="2"
+
+inherit eutils
 
 DESCRIPTION="a GTK+ TCP/IP DX-cluster and ON4KST chat client."
 HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/ham"
@@ -16,9 +20,15 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_compile() {
+src_prepare() {
+	# fix for bug #326627 - deprecated macro in gtk+ from 2.20 on
+	if has_version ">=x11-libs/gtk+-2.20" ; then
+		epatch "${FILESDIR}"/${PN}-gtk-2.20.patch
+	fi
+}
+
+src_configure() {
 	econf $(use_enable nls)
-	emake || die "emake failed."
 }
 
 src_install() {
diff --git a/media-radio/xdx/xdx-2.4.ebuild b/media-radio/xdx/xdx-2.4.ebuild
index 26e43d2ab42d..36a66fee1abc 100644
--- a/media-radio/xdx/xdx-2.4.ebuild
+++ b/media-radio/xdx/xdx-2.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 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.4 2008/12/02 15:26:05 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/xdx-2.4.ebuild,v 1.5 2010/07/03 12:11:48 tomjbe Exp $
 
 inherit eutils
 
 DESCRIPTION="a GTK+ TCP/IP DX-cluster and ON4KST chat client."
-HOMEPAGE="http://www.qsl.net/pg4i/linux/xdx.html"
-SRC_URI="http://www.qsl.net/pg4i/download/${P}.tar.gz"
+HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/ham"
+SRC_URI="http://www.ibiblio.org/pub/linux/apps/ham/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,6 +23,10 @@ src_unpack(){
 	cd "${S}"
 	# fix for deprecated macro in GTK+-2.14 and later
 	epatch "${FILESDIR}"/xdx-2.4-gtk.patch
+	# fix for bug #326627 - deprecated macro in gtk+ from 2.20 on 
+	if has_version ">=x11-libs/gtk+-2.20" ; then
+		epatch "${FILESDIR}"/${PN}-gtk-2.20.patch
+	fi
 }
 
 src_compile() {
@@ -32,7 +36,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
 }
 
 pkg_postinst() {