projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0bc23a3)
Fix build w/ GCC-4.1. Thanks to Steve Everson in bug #164997.
authorRyan Hill <rhill@gentoo.org>
Fri, 30 Mar 2007 04:45:38 +0000 (04:45 +0000)
committerRyan Hill <rhill@gentoo.org>
Fri, 30 Mar 2007 04:45:38 +0000 (04:45 +0000)
Package-Manager: portage-2.1.2.3

dev-cpp/gtkmm/ChangeLog patch | blob | history
dev-cpp/gtkmm/Manifest patch | blob | history
dev-cpp/gtkmm/files/gtkmm-2.2.12-gcc41.patch [new file with mode: 0644] patch | blob
dev-cpp/gtkmm/gtkmm-2.2.12.ebuild patch | blob | history

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index 30e6da0bcb07373f42b60a7ef00dc181d420f2c1..12620dd6698c8d5a4357d50375e3686096765290 100644 (file)
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.110 2007/03/19 15:51:06 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.111 2007/03/30 04:45:38 dirtyepic Exp $
+
+  30 Mar 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/gtkmm-2.2.12-gcc41.patch, gtkmm-2.2.12.ebuild:
+  Fix build w/ GCC-4.1.  Thanks to Steve Everson in bug #164997.
 
 *gtkmm-2.10.8 (19 Mar 2007)
 
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 5cf5e3fd11b8301f4dcfbf99aece630b3a154a4a..25a5adcd59b1395dce9efa74a187543a589e5b89 100644 (file)
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gtkmm-1.2.9-gcc3.1-gentoo.patch 518 RMD160 2c516c51c0b97d26638150a9741f9f196a0b037e SHA1 d6330370dac2f9a6cf08db9be3d5c6ee36c28b5e SHA256 be2e4bb78de8d55824a3564427e6078bb65a525ed05164128b4857dffc487705
 MD5 53f860d6754e3cb516cc67a11c36fc7f files/gtkmm-1.2.9-gcc3.1-gentoo.patch 518
 RMD160 2c516c51c0b97d26638150a9741f9f196a0b037e files/gtkmm-1.2.9-gcc3.1-gentoo.patch 518
@@ -17,6 +14,10 @@ AUX gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch 955 RMD160 1e72a0
 MD5 de89a3d8c295586042b38d376f522329 files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch 955
 RMD160 1e72a0a44c0241022382dd3d84a7e43fa658c2c5 files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch 955
 SHA256 94e9df33e8ca5b284f309e0d6b8013509437d5ea523a733e0786e7bb11e1a96e files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch 955
+AUX gtkmm-2.2.12-gcc41.patch 3418 RMD160 7893ea3ea8aebfcc8b8c296d1ccb407658dc6d56 SHA1 e2fb943fa1277da0735bbd08acbd6602aca0e6a4 SHA256 28b21d7ba79a19cea0df01546b58dcbe5a0577b2d9c7c07bde8010cb2b1e7158
+MD5 daecb7f6bbf344035df96f81fd0d7857 files/gtkmm-2.2.12-gcc41.patch 3418
+RMD160 7893ea3ea8aebfcc8b8c296d1ccb407658dc6d56 files/gtkmm-2.2.12-gcc41.patch 3418
+SHA256 28b21d7ba79a19cea0df01546b58dcbe5a0577b2d9c7c07bde8010cb2b1e7158 files/gtkmm-2.2.12-gcc41.patch 3418
 DIST gtkmm-1.2.9.tar.gz 716656 RMD160 d5248981343fea5f3c0b7e59b190f7fe9273021a SHA1 42c87bba55fa72452bf3fcc18b169478a825fbf6 SHA256 fb8e59cee2d9825e4060b72937461bde488f673362bab258f6fe78e9db93925c
 DIST gtkmm-2.10.2.tar.bz2 7056116 RMD160 7c9dc8d9d45efc073c6036bd3a5e3c04518ccee2 SHA1 da960e7acbd24c98d53ddb1ba2485f9486070127 SHA256 57e95e857dc37be8a2813e618f627f4986c073aa8b6f1ce9bcd07193545f358b
 DIST gtkmm-2.10.6.tar.bz2 7303407 RMD160 53b6e13bfb68abe34bdc67c2767cf270425c5c7e SHA1 7e29e70c7ccb66b5c75e3fd4ca7b8d73d635e482 SHA256 cc41d1e50749a5fb5d18dd76cdd581f0c0c737dbe7c5dc5b51d6e532a2aadb35
@@ -44,10 +45,10 @@ EBUILD gtkmm-2.10.8.ebuild 862 RMD160 7273da0f77106bfef8d59b141e5b70f87a74f1a0 S
 MD5 31826158879110881d302cad54557a21 gtkmm-2.10.8.ebuild 862
 RMD160 7273da0f77106bfef8d59b141e5b70f87a74f1a0 gtkmm-2.10.8.ebuild 862
 SHA256 b0989e02ba6226937228e312c04dd8a918043c0f1205f389e62cefba55e50a0f gtkmm-2.10.8.ebuild 862
-EBUILD gtkmm-2.2.12.ebuild 618 RMD160 9c94a6281450172d667c517ddfd9f47d09649d63 SHA1 340bb33a00c93c045665872290bd4964525fabe9 SHA256 abda28bcede5e2e5b1ccc957a81cb5ed4406e2743a7b85b331ec127c1daf5b9d
-MD5 847d8937f39bde3c20ce67139aa95eda gtkmm-2.2.12.ebuild 618
-RMD160 9c94a6281450172d667c517ddfd9f47d09649d63 gtkmm-2.2.12.ebuild 618
-SHA256 abda28bcede5e2e5b1ccc957a81cb5ed4406e2743a7b85b331ec127c1daf5b9d gtkmm-2.2.12.ebuild 618
+EBUILD gtkmm-2.2.12.ebuild 710 RMD160 58f093feb239ccc351f0f44bbbf5e9ba44dfa175 SHA1 0a085860fcc8fe6637401616183fb909e893afb5 SHA256 6a9ab28bfdecbffb875b1f5eaa9d5bc04471e250a0c7eaf7adf4598b2d063b68
+MD5 06011f67f57f3c667c9f0f7aea8ffe1b gtkmm-2.2.12.ebuild 710
+RMD160 58f093feb239ccc351f0f44bbbf5e9ba44dfa175 gtkmm-2.2.12.ebuild 710
+SHA256 6a9ab28bfdecbffb875b1f5eaa9d5bc04471e250a0c7eaf7adf4598b2d063b68 gtkmm-2.2.12.ebuild 710
 EBUILD gtkmm-2.4.11.ebuild 644 RMD160 e3f5d817f681341c4b3682878229b1a7b02bec25 SHA1 54c7dc1d1985dbe963742cf4eadcd5bb06656dab SHA256 49c0e07ec3c9d53d9b89a67e4bd7a91d652cfc7185828338a51f0a8c90a7e4b0
 MD5 94356bf22f7af3a2dc879a6dbbe70ede gtkmm-2.4.11.ebuild 644
 RMD160 e3f5d817f681341c4b3682878229b1a7b02bec25 gtkmm-2.4.11.ebuild 644
@@ -56,10 +57,10 @@ EBUILD gtkmm-2.8.3.ebuild 660 RMD160 bea889f9583930e6e060639c8e4d2aaf792e7e8c SH
 MD5 9bee8e83c3174b232a1033ecaa3184d1 gtkmm-2.8.3.ebuild 660
 RMD160 bea889f9583930e6e060639c8e4d2aaf792e7e8c gtkmm-2.8.3.ebuild 660
 SHA256 9875c0bc1f0d33efc62a93061eb9743f396e937f74e46ca04f8acb9912948a51 gtkmm-2.8.3.ebuild 660
-MISC ChangeLog 15917 RMD160 a0057a5edc73aadd1f3289f309e3600fefbfe776 SHA1 48cef444f399bf295e45a66243c466dcbea8256f SHA256 5ee87d62460a607193bec1661b6ab57c72de03d68f7132ff707e2348cdfd4348
-MD5 b49ef2cd3397d6cfc8fc41226ea5379a ChangeLog 15917
-RMD160 a0057a5edc73aadd1f3289f309e3600fefbfe776 ChangeLog 15917
-SHA256 5ee87d62460a607193bec1661b6ab57c72de03d68f7132ff707e2348cdfd4348 ChangeLog 15917
+MISC ChangeLog 16092 RMD160 b6d923f0bb649b3158296edcc3ba2aad145c6fc6 SHA1 2157bd0bbadd74ef0c9ccc079e4c4bb966949f3d SHA256 cddd4b8a83149b1f9553d3666bea5349934d142da4c2ddcfc989ef23c0029b8d
+MD5 9f2dcdf10805d1201d34079c6bdaa871 ChangeLog 16092
+RMD160 b6d923f0bb649b3158296edcc3ba2aad145c6fc6 ChangeLog 16092
+SHA256 cddd4b8a83149b1f9553d3666bea5349934d142da4c2ddcfc989ef23c0029b8d ChangeLog 16092
 MISC metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a SHA1 b034f3d668b50c57826ead5cfd17fcd2b68d19d6 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6
 MD5 d55015f2e0ee69e92ab287320c27c5b2 metadata.xml 161
 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a metadata.xml 161
@@ -88,10 +89,3 @@ SHA256 61c1d7ad6bf4eee4d59d8ae60b8368f5da4636568cf1a67d47373663724412d7 files/di
 MD5 df83fd28d052bf5d370abed96c17ab66 files/digest-gtkmm-2.8.3 241
 RMD160 ad95715bd14fb6cda5d8311111631dda160d9559 files/digest-gtkmm-2.8.3 241
 SHA256 1218796717f977f128ad2bc8e9f9ad8213a909d19dcf60d0d63a3ddc9c0a3a4c files/digest-gtkmm-2.8.3 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF/rFvomPajV0RnrERAmCBAJ97o8LZ2b8arx5dRP0MWUuZjQWzkwCdEb0u
-nV6id8Dz1zKZdq7QXiabYHc=
-=ffea
------END PGP SIGNATURE-----
diff --git a/dev-cpp/gtkmm/files/gtkmm-2.2.12-gcc41.patch b/dev-cpp/gtkmm/files/gtkmm-2.2.12-gcc41.patch
new file mode 100644 (file)
index 0000000..9983ef6
--- /dev/null
+++ b/dev-cpp/gtkmm/files/gtkmm-2.2.12-gcc41.patch
@@ -0,0 +1,68 @@
+diff -Naur gtkmm-2.2.12-orig/gtk/gtkmm/notebook.cc gtkmm-2.2.12/gtk/gtkmm/notebook.cc
+--- gtkmm-2.2.12-orig/gtk/gtkmm/notebook.cc    2004-06-03 10:05:24.000000000 -0600
++++ gtkmm-2.2.12/gtk/gtkmm/notebook.cc 2007-02-14 13:46:28.000000000 -0600
+@@ -796,7 +796,7 @@
+   return RType();
+ }
+ 
+-void Notebook_Class::change_current_page_callback(GtkNotebook* self, gint p0)
++gboolean Notebook_Class::change_current_page_callback(GtkNotebook* self, gint p0)
+ {
+   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+       Glib::ObjectBase::_get_current_wrapper((GObject*)self));
+@@ -829,6 +829,9 @@
+     if(base && base->change_current_page)
+       (*base->change_current_page)(self, p0);
+   }
++
++  typedef gboolean RType;
++  return RType();
+ }
+ 
+ void Notebook_Class::move_focus_out_callback(GtkNotebook* self, GtkDirectionType p0)
+diff -Naur gtkmm-2.2.12-orig/gtk/gtkmm/private/notebook_p.h gtkmm-2.2.12/gtk/gtkmm/private/notebook_p.h
+--- gtkmm-2.2.12-orig/gtk/gtkmm/private/notebook_p.h   2004-01-24 09:56:44.000000000 -0600
++++ gtkmm-2.2.12/gtk/gtkmm/private/notebook_p.h        2007-02-14 13:46:40.000000000 -0600
+@@ -36,7 +36,7 @@
+   static void switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0, guint p1);
+   static gboolean select_page_callback(GtkNotebook* self, gboolean p0);
+   static gboolean focus_tab_callback(GtkNotebook* self, GtkNotebookTab p0);
+-  static void change_current_page_callback(GtkNotebook* self, gint p0);
++  static gboolean change_current_page_callback(GtkNotebook* self, gint p0);
+   static void move_focus_out_callback(GtkNotebook* self, GtkDirectionType p0);
+ 
+   //Callbacks (virtual functions):
+diff -Naur gtkmm-2.2.12-orig/gtk/gtkmm/private/scrolledwindow_p.h gtkmm-2.2.12/gtk/gtkmm/private/scrolledwindow_p.h
+--- gtkmm-2.2.12-orig/gtk/gtkmm/private/scrolledwindow_p.h     2004-01-24 09:57:15.000000000 -0600
++++ gtkmm-2.2.12/gtk/gtkmm/private/scrolledwindow_p.h  2007-02-14 13:46:46.000000000 -0600
+@@ -33,7 +33,7 @@
+   //Callbacks (default signal handlers):
+   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
+   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+-  static void scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1);
++  static gboolean scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1);
+   static void move_focus_out_callback(GtkScrolledWindow* self, GtkDirectionType p0);
+ 
+   //Callbacks (virtual functions):
+diff -Naur gtkmm-2.2.12-orig/gtk/gtkmm/scrolledwindow.cc gtkmm-2.2.12/gtk/gtkmm/scrolledwindow.cc
+--- gtkmm-2.2.12-orig/gtk/gtkmm/scrolledwindow.cc      2004-06-03 10:05:50.000000000 -0600
++++ gtkmm-2.2.12/gtk/gtkmm/scrolledwindow.cc   2007-02-14 13:46:52.000000000 -0600
+@@ -166,7 +166,7 @@
+ }
+ 
+ 
+-void ScrolledWindow_Class::scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1)
++gboolean ScrolledWindow_Class::scroll_child_callback(GtkScrolledWindow* self, GtkScrollType p0, gboolean p1)
+ {
+   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+       Glib::ObjectBase::_get_current_wrapper((GObject*)self));
+@@ -200,6 +200,9 @@
+     if(base && base->scroll_child)
+       (*base->scroll_child)(self, p0, p1);
+   }
++
++  typedef gboolean RType;
++  return RType();
+ }
+ 
+ void ScrolledWindow_Class::move_focus_out_callback(GtkScrolledWindow* self, GtkDirectionType p0)
diff --git a/dev-cpp/gtkmm/gtkmm-2.2.12.ebuild b/dev-cpp/gtkmm/gtkmm-2.2.12.ebuild
index 892dcdb830e5b967866c7a4653bdf13cc160b57d..62e28c94b8c0e50d4f9ac55f7d6d3bcce01e72d5 100644 (file)
--- a/dev-cpp/gtkmm/gtkmm-2.2.12.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.2.12.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.2.12.ebuild,v 1.14 2007/01/22 12:31:01 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.2.12.ebuild,v 1.15 2007/03/30 04:45:38 dirtyepic Exp $
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="C++ interface for GTK+2"
 HOMEPAGE="http://gtkmm.sourceforge.net/"
@@ -20,3 +20,10 @@ DEPEND="${RDEPEND}
        !=sys-devel/gcc-3.3.0*"
 
 DOCS="AUTHORS CHANGES ChangeLog HACKING PORTING NEWS README TODO"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}"/${P}-gcc41.patch
+}
Unnamed repository; edit this file 'description' to name the repository.