From f362c19e91cfa66f99f7a292b91f202addbacda3 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Sun, 4 Jul 2010 08:29:51 +0000 Subject: [PATCH] Fix build with >=gtk+-2.18 wrt bug 326793. Thanks to Diego for reporting. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- sci-calculators/tiemu/ChangeLog | 8 +- sci-calculators/tiemu/Manifest | 17 +- ...mu-3.03-remove_depreciated_gtk_calls.patch | 232 ++++++++++++++++++ sci-calculators/tiemu/tiemu-3.03.ebuild | 8 +- 4 files changed, 259 insertions(+), 6 deletions(-) create mode 100644 sci-calculators/tiemu/files/tiemu-3.03-remove_depreciated_gtk_calls.patch diff --git a/sci-calculators/tiemu/ChangeLog b/sci-calculators/tiemu/ChangeLog index 4c738864b906..d9c55714b3b4 100644 --- a/sci-calculators/tiemu/ChangeLog +++ b/sci-calculators/tiemu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-calculators/tiemu -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-calculators/tiemu/ChangeLog,v 1.3 2009/11/09 11:12:26 ssuominen Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-calculators/tiemu/ChangeLog,v 1.4 2010/07/04 08:29:50 xarthisius Exp $ + + 04 Jul 2010; Kacper Kowalik tiemu-3.03.ebuild, + +files/tiemu-3.03-remove_depreciated_gtk_calls.patch: + Fix build with >=gtk+-2.18 wrt bug 326793. Thanks to Diego for reporting. 09 Nov 2009; Samuli Suominen tiemu-3.03.ebuild: Remove USE kde wrt #257590, thanks to Jakob Dettner for reporting. diff --git a/sci-calculators/tiemu/Manifest b/sci-calculators/tiemu/Manifest index 36e15c6773c7..d7e15af9530c 100644 --- a/sci-calculators/tiemu/Manifest +++ b/sci-calculators/tiemu/Manifest @@ -1,4 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX tiemu-3.03-remove_depreciated_gtk_calls.patch 5180 RMD160 36aff00e850c7ef05357844ffa0868b677f8f33c SHA1 637795391d58f8e1474931000449a9c8502133cf SHA256 8834a2b16c5fef267570354eb3853a45324a448b1d65000789625b578dd49733 DIST tiemu_3.03.orig.tar.gz 27343892 RMD160 a749681d12367291d6a71e47fbd1e9c662805734 SHA1 c95467a41eef4b4e90a7a59d8400ae72ed0e22b2 SHA256 c47b1c58640622c0fac9049d83eb8953d5805e54dede32cb2d3aa6453fb9ce8b -EBUILD tiemu-3.03.ebuild 1444 RMD160 8b4adf3bd2e98a9c6d838404d56b2dd0a2afe350 SHA1 3e060849a64260005179780ce1c182d9ebc4e9a5 SHA256 025fcad1b7903a88270fc21fcbdd3634c7e4cc558d5b151fe373b0dbca8f0431 -MISC ChangeLog 1000 RMD160 9962a9fc2d219ae8f589859a44b1e4bb57d63f32 SHA1 aec3f811d3546773c7847b7c7a30edc87582a268 SHA256 efd16c8e1dfb8cf76e655fd59604fa1e832faa277d3890724be8592afb6b0d56 +EBUILD tiemu-3.03.ebuild 1526 RMD160 0b973b1d1c83a052c833dedef9877e6f7a129e88 SHA1 51db82086b6b568026f95090b12e8aa6ad9539b5 SHA256 56964deffc6e53d9db2ad60d69b292ed66427096e8a14cc4c98516488d71cac9 +MISC ChangeLog 1207 RMD160 2072159504b97058ae073fc11788dc150fc5a499 SHA1 6cbc5b729f02eb993528265814f35bed59885832 SHA256 44ed8e7d9744360a03df09a6736a2fec792d50fb1c84e3af58c629d75b84da33 MISC metadata.xml 498 RMD160 65c016d1c9e8597ad1ff77a34aa992bc175c5ac1 SHA1 4b562110472fafb3d6045c2692dfde7f4a7183a8 SHA256 d7e0ed8a46f9fba60ac8f1d40b011267056bb25fa22b480fd0eaa9a02ec00d7b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iJwEAQECAAYFAkwwRocACgkQIiMqcbOVdxQnAgP+PiYEp1MLQ12fNZZJWGxAbgBK +ODn5SsIXCqIJUR7Rgj6JPPSuXeElfph/+Vq9kIqcJiRSz1AKg+rKkJt8DWmGIFv4 +FzuKEMAdXzUd+6+e71pMqb3rE+3AMuiJRilmyhF/9bOnDOavdbnj4xlKIeas18n0 +QoFr447AaDT3Dtao7Qs= +=E4xu +-----END PGP SIGNATURE----- diff --git a/sci-calculators/tiemu/files/tiemu-3.03-remove_depreciated_gtk_calls.patch b/sci-calculators/tiemu/files/tiemu-3.03-remove_depreciated_gtk_calls.patch new file mode 100644 index 000000000000..10a0e1a11341 --- /dev/null +++ b/sci-calculators/tiemu/files/tiemu-3.03-remove_depreciated_gtk_calls.patch @@ -0,0 +1,232 @@ +--- src/gui/debugger/dbg_bkpts.c ++++ src/gui/debugger/dbg_bkpts.c +@@ -29,10 +29,15 @@ + # include + #endif + ++#include + #include + #include +-#include + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_VISIBLE ++#define GTK_WIDGET_VISIBLE(wid) (gtk_widget_get_visible(wid)) ++#endif ++ + #include "intl.h" + #include "paths.h" + #include "support.h" +--- src/gui/debugger/dbg_regs.c ++++ src/gui/debugger/dbg_regs.c +@@ -28,14 +28,19 @@ + # include + #endif + +-#include +-#include + #include + #include + #include + #include ++#include ++#include + #include + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_VISIBLE ++#define GTK_WIDGET_VISIBLE(wid) (gtk_widget_get_visible(wid)) ++#endif ++ + #include "intl.h" + #include "paths.h" + #include "support.h" +--- src/gui/debugger/dbg_pclog.c ++++ src/gui/debugger/dbg_pclog.c +@@ -31,6 +31,11 @@ + #include + #include + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_VISIBLE ++#define GTK_WIDGET_VISIBLE(wid) (gtk_widget_get_visible(wid)) ++#endif ++ + #include "intl.h" + #include "paths.h" + #include "support.h" +--- src/gui/debugger/dbg_wnds.c ++++ src/gui/debugger/dbg_wnds.c +@@ -38,6 +38,11 @@ + #include + #endif + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_VISIBLE ++#define GTK_WIDGET_VISIBLE(wid) (gtk_widget_get_visible(wid)) ++#endif ++ + #include "intl.h" + #include "ti68k_int.h" + #include "struct.h" +--- src/gui/debugger/dbg_mem.c ++++ src/gui/debugger/dbg_mem.c +@@ -33,6 +33,11 @@ + #include + #include + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_VISIBLE ++#define GTK_WIDGET_VISIBLE(wid) (gtk_widget_get_visible(wid)) ++#endif ++ + #include + #include + #include +--- src/gui/debugger/dbg_iop.c ++++ src/gui/debugger/dbg_iop.c +@@ -28,13 +28,18 @@ + # include + #endif + +-#include +-#include + #include + #include + #include + #include ++#include ++#include + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_VISIBLE ++#define GTK_WIDGET_VISIBLE(wid) (gtk_widget_get_visible(wid)) ++#endif ++ + #include "intl.h" + #include "paths.h" + #include "support.h" +--- src/gui/debugger/dbg_stack.c ++++ src/gui/debugger/dbg_stack.c +@@ -28,11 +28,16 @@ + # include + #endif + ++#include + #include + #include + #include +-#include + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_VISIBLE ++#define GTK_WIDGET_VISIBLE(wid) (gtk_widget_get_visible(wid)) ++#endif ++ + #include "intl.h" + #include "paths.h" + #include "support.h" +--- src/gui/debugger/dbg_all.c ++++ src/gui/debugger/dbg_all.c +@@ -38,6 +38,13 @@ + #include + #endif + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_SENSITIVE ++#define GTK_WIDGET_SENSITIVE(wid) (gtk_widget_get_sensitive(wid)) ++#undef GTK_WIDGET_VISIBLE ++#define GTK_WIDGET_VISIBLE(wid) (gtk_widget_get_visible(wid)) ++#endif ++ + #include "ti68k_int.h" + #include "struct.h" + #include "dbg_all.h" +--- src/gui/debugger/dbg_code.c ++++ src/gui/debugger/dbg_code.c +@@ -28,11 +28,16 @@ + # include + #endif + ++#include + #include + #include + #include +-#include + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_SENSITIVE ++#define GTK_WIDGET_SENSITIVE(wid) (gtk_widget_get_sensitive(wid)) ++#endif ++ + #include "intl.h" + #include "paths.h" + #include "support.h" +--- src/gui/debugger/dbg_heap.c ++++ src/gui/debugger/dbg_heap.c +@@ -31,6 +31,11 @@ + #include + #include + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_VISIBLE ++#define GTK_WIDGET_VISIBLE(wid) (gtk_widget_get_visible(wid)) ++#endif ++ + #include "intl.h" + #include "paths.h" + #include "support.h" +--- src/gui/debugger/dbg_dock.c ++++ src/gui/debugger/dbg_dock.c +@@ -37,11 +37,16 @@ + # include + #endif + ++#include + #include + #include + #include +-#include + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_VISIBLE ++#define GTK_WIDGET_VISIBLE(wid) (gtk_widget_get_visible(wid)) ++#endif ++ + #include "intl.h" + #include "paths.h" + #include "support.h" +--- src/gui/calc/calc.c ++++ src/gui/calc/calc.c +@@ -39,6 +39,11 @@ + #include + #include + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_STATE ++#define GTK_WIDGET_STATE(wid) (gtk_widget_get_state(wid)) ++#endif ++ + #include "intl.h" + #include "paths.h" + #include "skinops.h" +--- src/gui/calc/screen.c ++++ src/gui/calc/screen.c +@@ -29,11 +29,16 @@ + # include + #endif /* */ + ++#include + #include + #include + #include +-#include + ++#if GTK_CHECK_VERSION(2,18,0) ++#undef GTK_WIDGET_STATE ++#define GTK_WIDGET_STATE(wid) (gtk_widget_get_state(wid)) ++#endif ++ + #include "intl.h" + #include "paths.h" + #include "skinops.h" diff --git a/sci-calculators/tiemu/tiemu-3.03.ebuild b/sci-calculators/tiemu/tiemu-3.03.ebuild index 29b26ce21a87..312a7170d9d0 100644 --- a/sci-calculators/tiemu/tiemu-3.03.ebuild +++ b/sci-calculators/tiemu/tiemu-3.03.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-calculators/tiemu/tiemu-3.03.ebuild,v 1.2 2009/11/09 11:12:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-calculators/tiemu/tiemu-3.03.ebuild,v 1.3 2010/07/04 08:29:50 xarthisius Exp $ EAPI=2 inherit eutils @@ -30,6 +30,10 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) xinerama? ( x11-proto/xineramaproto )" +src_prepare() { + epatch "${FILESDIR}"/${P}-remove_depreciated_gtk_calls.patch +} + src_configure() { econf \ --disable-rpath \ -- 2.26.2