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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 62 insertions, 9 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/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() {