Fix compatibility with gtk+-2.14, bug 238698

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

5 files changed, 78 insertions, 7 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index 93c4dbf561a2..c05f15a47642 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.150 2008/08/12 19:32:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.151 2008/09/28 14:00:23 leio Exp $
+
+  28 Sep 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/gtkmm-2.12.7-gtk2_14-compatibility.patch, gtkmm-2.12.1.ebuild,
+  gtkmm-2.12.7.ebuild:
+  Fix compatibility with gtk+-2.14, bug 238698
 
   12 Aug 2008; Raúl Porcel <armin76@gentoo.org> gtkmm-2.12.7.ebuild:
   alpha/ia64/sparc stable wrt #229709
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index e37a188d9c5f..c9864785dc94 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -2,14 +2,15 @@ AUX gtkmm-1.2.9-gcc3.1-gentoo.patch 518 RMD160 2c516c51c0b97d26638150a9741f9f196
 AUX gtkmm-1.2.9-gcc3.4-gentoo.patch 2197 RMD160 a3ababae65054054ff790dadf825fc7dd263926a SHA1 fe9376c71de04a23fc0413befee521d6cae8cc38 SHA256 918f1f1774901699a4c64749e4dc2965895b018c47c707308b65033db9586ceb
 AUX gtkmm-1.2.9-gcc4.3.patch 538 RMD160 1355108436b34d25a0b66c043354f8079953a567 SHA1 aea11193c3da443853091261b3af3c1df016fd43 SHA256 26a75270f3e70b975effc966721be5fcc1000519ad5dca395b7dbb934a0be468
 AUX gtkmm-1.2.9-gcc4.patch 1382 RMD160 681cb464e36f0ad7d89029fd384bb7496c48eeb3 SHA1 c0c4c2370d5552394926a03ba6b1ede093a8f4fe SHA256 45a907630a651e8bd1355b837253a75ecd6e1e8f9e80d8e6668669a85c2d5a41
+AUX gtkmm-2.12.7-gtk2_14-compatibility.patch 2205 RMD160 3d65c0edd8a697648bf941da7ad48879008d1665 SHA1 150a24d053a7f8dbc7900e3de455bc630facd376 SHA256 093b450d90c7c672f0235fa005a0a6197b7b3a45b9a45410c6e906b580df9088
 AUX gtkmm-2.2.12-gcc41.patch 3418 RMD160 7893ea3ea8aebfcc8b8c296d1ccb407658dc6d56 SHA1 e2fb943fa1277da0735bbd08acbd6602aca0e6a4 SHA256 28b21d7ba79a19cea0df01546b58dcbe5a0577b2d9c7c07bde8010cb2b1e7158
 DIST gtkmm-1.2.9.tar.gz 716656 RMD160 d5248981343fea5f3c0b7e59b190f7fe9273021a SHA1 42c87bba55fa72452bf3fcc18b169478a825fbf6 SHA256 fb8e59cee2d9825e4060b72937461bde488f673362bab258f6fe78e9db93925c
 DIST gtkmm-2.12.1.tar.bz2 13325799 RMD160 8dd06a1b6537cc8b02cb91aacc1d7e5d8c8fb5c1 SHA1 9f20a32b2e0a3c43efb5732a0917db69ac9493a9 SHA256 6b26d4e0d614bee8285c299d7550cb58799e6fba19a5db4a5e3d83258c24f610
 DIST gtkmm-2.12.7.tar.bz2 15198578 RMD160 0363b0c03e56e965d1d25f1bbed80476af809f3c SHA1 ee7211c99e860c4b22091e81e6d1676d12fbb23c SHA256 4e58c9ad827759a2375b3c0d39952b5b2983111ab16ee329b10a34792fb1d9eb
 DIST gtkmm-2.2.12.tar.bz2 3846586 RMD160 009c6af3c638f2e55eaf82e5d9cdf468ca0a62ad SHA1 ea6f130f68b837bd042e8e84ab6708467dd8ba08 SHA256 8aa93a899f7aa55617041107dd3290ccbd3b2b81348a745a66557b159617bb57
 EBUILD gtkmm-1.2.9-r2.ebuild 1381 RMD160 b60bac2742371d7933e62a0656aa2b1d97113ad9 SHA1 fa39331e5d6b2ea0c8b5e2d2421b1e466470a613 SHA256 73ae87e764c6e556d8594e0e17531f8c54bf8c796f8af4ab4e9c3f2a1db87fea
-EBUILD gtkmm-2.12.1.ebuild 859 RMD160 4373907644a5587499748b02c4f37afb62f7c3a3 SHA1 b46c1c3f4086193cf6bd3a739d9b1b61c366ed7c SHA256 f6e5dff76beca94f7cd3242a051b2d39b8e54f3f44b6b8d31355f7a2451378bf
-EBUILD gtkmm-2.12.7.ebuild 1029 RMD160 8038a11d4cf842018e8211b8bc9dfc6b6867af70 SHA1 e84e06d78b6eaea7b5e6f9da571906302934bb07 SHA256 338d9bbee96f616058cf3a2a5ca0aa50c03957f5b49810454991a3af87f4d73a
+EBUILD gtkmm-2.12.1.ebuild 988 RMD160 c7e4524ec1791bbd1d5e69dea0f81fa5251c59fc SHA1 df5ad2ddfc07b4ddf75056b09b84dc968bab2275 SHA256 901a6b2e3ab80102ac7cd0e72bdcf879edee5b412a36241bcc878e5b16c23fb1
+EBUILD gtkmm-2.12.7.ebuild 1117 RMD160 9dfcad372daf02810af95c93530e0226095a9eeb SHA1 fe1011a9104f04e1c7213494eb051b9c288a4828 SHA256 c7b0366a4daab222b43dfe9c5ea22972c50bcd8d2766e9ac87604dc1f387c4e0
 EBUILD gtkmm-2.2.12.ebuild 696 RMD160 0e82e332757fe5ee3351c95067ebcbfc5d7c0814 SHA1 33e63d772ec1ba56b5a17b36b60bca1b01748c0a SHA256 3b5c0822d282ea2ed69fd74512e056577317dcb9c66798d0f22c92a5ebebfee7
-MISC ChangeLog 20658 RMD160 07f23a775a446e3c611155b019739b09fe07a562 SHA1 0f6f6f28530ae3c2d535efdefb24d9d9b3b67c05 SHA256 eceae6248c887e3814801ef70e2a550eeeb1fd03f96acfe2fa78035430a2a518
+MISC ChangeLog 20845 RMD160 364f053567285944d136292aaa489e648fce989c SHA1 644c86fab7215b8edd9bb7f1bdfcbdb8a4580717 SHA256 670bf488b61ba30fc3eb9db7f714d171c03a15808ae371dc72a1bd57b1f228e2
 MISC metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a SHA1 b034f3d668b50c57826ead5cfd17fcd2b68d19d6 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6
diff --git a/dev-cpp/gtkmm/files/gtkmm-2.12.7-gtk2_14-compatibility.patch b/dev-cpp/gtkmm/files/gtkmm-2.12.7-gtk2_14-compatibility.patch
new file mode 100644
index 000000000000..aeb3a7acfc9b
--- /dev/null
+++ b/dev-cpp/gtkmm/files/gtkmm-2.12.7-gtk2_14-compatibility.patch
@@ -0,0 +1,55 @@
+http://svn.gnome.org/viewvc/gtkmm/trunk/gtk/src/toolbar.ccg?r1=869&r2=999&view=patch
+with the same repeated for gtk/gtkmm generated sources
+
+Fixes build against gtk+-2.14 to allow gtkmm to be stabled later than gtk+
+
+--- trunk/gtk/src/toolbar.ccg	2007/07/12 12:41:04	869
++++ trunk/gtk/src/toolbar.ccg	2008/07/03 15:09:41	999
+@@ -20,13 +20,6 @@
+  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-//Define this to make sure that we don't use any of the deprecated GtkToolbar API.
+-//Normally we just deprecate it in gtkmm too,
+-//but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
+-//In future, this GTK_DISABLE_DEPRECATED might be inappropriate because it might cover extra GTK+ API. Just remove it then.
+-
+-#define GTK_DISABLE_DEPRECATED
+-
+ #include <glib.h>
+ #include <gtkmm/button.h>
+ #include <gtkmm/togglebutton.h>
+@@ -96,7 +89,7 @@
+ Tooltips* Toolbar::get_tooltips_object() const
+ {
+   //Note that the _tooltips field is deprecated and broken since GTK+ 2.12:
+-  return Glib::wrap((GtkTooltips*)gobj()->_tooltips);
++  return 0; //Glib::wrap((GtkTooltips*)gobj()->_tooltips);
+ }
+ #endif //GTKMM_DISABLE_DEPRECATED
+ 
+--- trunk/gtk/gtkmm/toolbar.cc	2007/07/12 12:41:04	869
++++ trunk/gtk/gtkmm/toolbar.cc	2008/07/03 15:09:41	999
+@@ -20,13 +20,6 @@
+  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-//Define this to make sure that we don't use any of the deprecated GtkToolbar API.
+-//Normally we just deprecate it in gtkmm too,
+-//but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
+-//In future, this GTK_DISABLE_DEPRECATED might be inappropriate because it might cover extra GTK+ API. Just remove it then.
+-
+-#define GTK_DISABLE_DEPRECATED
+-
+ #include <glib.h>
+ #include <gtkmm/button.h>
+ #include <gtkmm/togglebutton.h>
+@@ -96,7 +89,7 @@
+ Tooltips* Toolbar::get_tooltips_object() const
+ {
+   //Note that the _tooltips field is deprecated and broken since GTK+ 2.12:
+-  return Glib::wrap((GtkTooltips*)gobj()->_tooltips);
++  return 0; //Glib::wrap((GtkTooltips*)gobj()->_tooltips);
+ }
+ #endif //GTKMM_DISABLE_DEPRECATED
+ 
diff --git a/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild b/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild
index 97f2a805ef7e..da65bc0f61f1 100644
--- a/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild,v 1.11 2008/07/10 15:16:28 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild,v 1.12 2008/09/28 14:00:23 leio Exp $
 
 inherit gnome2 autotools
 
@@ -30,3 +30,10 @@ pkg_setup() {
 			$(use_enable examples)
 			$(use_enable examples demos)"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix build with gtk+-2.14
+	epatch "${FILESDIR}/${PN}-2.12.7-gtk2_14-compatibility.patch"
+}
diff --git a/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild b/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild
index f997ed9b35ba..aa3d0684844a 100644
--- a/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild,v 1.7 2008/08/12 19:32:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild,v 1.8 2008/09/28 14:00:23 leio Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="C++ interface for GTK+2"
 HOMEPAGE="http://www.gtkmm.org"
@@ -34,6 +34,9 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
+	# Fix build with gtk+-2.14
+	epatch "${FILESDIR}/${P}-gtk2_14-compatibility.patch"
+
 	if ! use test; then
 		# don't waste time building tests
 		sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die "sed failed"