diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-10 04:19:56 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-10 04:19:56 +0800 |
| commit | c63b6ae94f28ce18cc988bb322edf77a20f4339a (patch) | |
| tree | 28e43ce3b48fe56d09bd0d3d176a8778d73019dd /x11-toolkits | |
| parent | 56ecd61ed56f7c88237690c5239d1736f6026df2 (diff) | |
| download | marcuscom-ports-c63b6ae94f28ce18cc988bb322edf77a20f4339a.tar marcuscom-ports-c63b6ae94f28ce18cc988bb322edf77a20f4339a.tar.gz marcuscom-ports-c63b6ae94f28ce18cc988bb322edf77a20f4339a.tar.bz2 marcuscom-ports-c63b6ae94f28ce18cc988bb322edf77a20f4339a.tar.lz marcuscom-ports-c63b6ae94f28ce18cc988bb322edf77a20f4339a.tar.xz marcuscom-ports-c63b6ae94f28ce18cc988bb322edf77a20f4339a.tar.zst marcuscom-ports-c63b6ae94f28ce18cc988bb322edf77a20f4339a.zip | |
Fix build with the new GTK+.
Reported by: Pawel Worach <pawel.worach@gmail.com>
Obtained from: GNOME SVN
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11111 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtkmm24/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_toolbar.cc | 25 |
2 files changed, 27 insertions, 2 deletions
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index ffcd500c6..e5e17df77 100644 --- a/x11-toolkits/gtkmm24/Makefile +++ b/x11-toolkits/gtkmm24/Makefile @@ -3,12 +3,12 @@ # Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/gtkmm24/Makefile,v 1.1 2007/12/02 00:20:21 mezz Exp $ +# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.32 2008/06/14 22:51:32 marcus Exp $ # PORTNAME= gtkmm PORTVERSION= 2.13.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_toolbar.cc b/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_toolbar.cc new file mode 100644 index 000000000..082d53f52 --- /dev/null +++ b/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_toolbar.cc @@ -0,0 +1,25 @@ +--- gtk/gtkmm/toolbar.cc.orig 2008-07-09 15:36:27.000000000 -0400 ++++ gtk/gtkmm/toolbar.cc 2008-07-09 15:37:10.000000000 -0400 +@@ -26,13 +26,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> +@@ -102,7 +95,7 @@ void Toolbar::unset_drop_highlight_item( + 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 + |