diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2008-09-28 14:00:24 +0000 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2008-09-28 14:00:24 +0000 |
| commit | fbf4878345f001c68c74b18f4924a62a7cf0ceee (patch) | |
| tree | 97854c78021cab6ef5e3e4d627239f2d4c08dbe2 /dev-cpp/gtkmm/files | |
| parent | Fix manpages and docs not being installed to the right place. Fixup mulilib s... (diff) | |
| download | gentoo-2-fbf4878345f001c68c74b18f4924a62a7cf0ceee.tar.gz gentoo-2-fbf4878345f001c68c74b18f4924a62a7cf0ceee.tar.bz2 gentoo-2-fbf4878345f001c68c74b18f4924a62a7cf0ceee.zip | |
Fix compatibility with gtk+-2.14, bug 238698
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'dev-cpp/gtkmm/files')
| -rw-r--r-- | dev-cpp/gtkmm/files/gtkmm-2.12.7-gtk2_14-compatibility.patch | 55 |
1 files changed, 55 insertions, 0 deletions
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 + |