From d1197ab35a88b5840154a7a3ea081adb1c3c0ef4 Mon Sep 17 00:00:00 2001 From: marcus Date: Fri, 18 Jul 2008 18:54:22 +0000 Subject: Update to 2.13.4. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11121 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/gtkmm24/Makefile | 6 +++--- x11-toolkits/gtkmm24/distinfo | 6 +++--- .../gtkmm24/files/patch-gtk_gtkmm_toolbar.cc | 25 ---------------------- x11-toolkits/gtkmm24/pkg-plist | 2 ++ 4 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_toolbar.cc diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index e5e17df77..102f7a6ee 100644 --- a/x11-toolkits/gtkmm24/Makefile +++ b/x11-toolkits/gtkmm24/Makefile @@ -3,12 +3,12 @@ # Whom: Martin Klaffenboeck # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.32 2008/06/14 22:51:32 marcus Exp $ +# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.33 2008/07/09 20:19:56 marcus Exp $ # PORTNAME= gtkmm -PORTVERSION= 2.13.1 -PORTREVISION?= 1 +PORTVERSION= 2.13.4 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo index dec90c1f0..96a785661 100644 --- a/x11-toolkits/gtkmm24/distinfo +++ b/x11-toolkits/gtkmm24/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkmm-2.13.1.tar.bz2) = 1ce65accc81286bf4913defb60498fc9 -SHA256 (gnome2/gtkmm-2.13.1.tar.bz2) = 7bd9be8aedfa3fa63cb8a0d3a534ba216e2bb1fe2cd32cccb815b248c23034e7 -SIZE (gnome2/gtkmm-2.13.1.tar.bz2) = 9490679 +MD5 (gnome2/gtkmm-2.13.4.tar.bz2) = bdd481cc0a3f7918e5db5bb72efc6b6f +SHA256 (gnome2/gtkmm-2.13.4.tar.bz2) = 39149e7c598bfbe0d8458b944693165d019f82684a6f0a07bcda58c0ccd63973 +SIZE (gnome2/gtkmm-2.13.4.tar.bz2) = 9533259 diff --git a/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_toolbar.cc b/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_toolbar.cc deleted file mode 100644 index 082d53f52..000000000 --- a/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_toolbar.cc +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 - #include - #include -@@ -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 - diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist index e405a27dc..878b1da96 100644 --- a/x11-toolkits/gtkmm24/pkg-plist +++ b/x11-toolkits/gtkmm24/pkg-plist @@ -340,6 +340,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/toggletoolbutton_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbar_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbutton_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/toolitem_p.h +include/gtkmm-%%API_VERSION%%/gtkmm/private/toolshell_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltip_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltips_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/treedragdest_p.h @@ -414,6 +415,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/toggletoolbutton.h include/gtkmm-%%API_VERSION%%/gtkmm/toolbar.h include/gtkmm-%%API_VERSION%%/gtkmm/toolbutton.h include/gtkmm-%%API_VERSION%%/gtkmm/toolitem.h +include/gtkmm-%%API_VERSION%%/gtkmm/toolshell.h include/gtkmm-%%API_VERSION%%/gtkmm/tooltip.h include/gtkmm-%%API_VERSION%%/gtkmm/tooltips.h include/gtkmm-%%API_VERSION%%/gtkmm/treedragdest.h -- cgit v1.2.3