[Midnightbsd-cvs] mports [18858] trunk/x11-toolkits/gtkmm20: fix plist for gtk20

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat May 9 10:10:46 EDT 2015 

Revision: 18858
          http://svnweb.midnightbsd.org/mports/?rev=18858
Author:   laffer1
Date:     2015-05-09 10:10:46 -0400 (Sat, 09 May 2015)
Log Message:
-----------
fix plist for gtk20

Modified Paths:
--------------
    trunk/x11-toolkits/gtkmm20/Makefile
    trunk/x11-toolkits/gtkmm20/distinfo
    trunk/x11-toolkits/gtkmm20/pkg-plist

Added Paths:
-----------
    trunk/x11-toolkits/gtkmm20/files/patch-gtk_gtkmm_scale.cc
    trunk/x11-toolkits/gtkmm20/files/patch-gtk_gtkmm_treeview.h

Modified: trunk/x11-toolkits/gtkmm20/Makefile
===================================================================
--- trunk/x11-toolkits/gtkmm20/Makefile	2015-05-09 14:09:12 UTC (rev 18857)
+++ trunk/x11-toolkits/gtkmm20/Makefile	2015-05-09 14:10:46 UTC (rev 18858)
@@ -3,7 +3,7 @@
 PORTNAME=	gtkmm
 PKGNAMESUFFIX=	20
 PORTVERSION=	2.2.12
-PORTREVISION?=	9
+PORTREVISION?=	10
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME/sources/${PORTNAME}/2.2
 DIST_SUBDIR=	gnome2
@@ -12,22 +12,22 @@
 COMMENT=	C++ wrapper for Gtk+, Pango, Atk, and Glib
 LICENSE=	lgpl
 
-USE_BZIP2=	yes
-LATEST_LINK=	gtkmm2
+USES+=		tar:bzip2
 
+PORTSCOUT=	ignore:1
+
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
+LIB_DEPENDS=	libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
-USE_XORG=	x11
+USES+=		gmake libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack lthack gtk20
+USE_GNOME=	gtk20
 CONFIGURE_ARGS=	--enable-static=yes \
 		--with-sigc-prefix=${LOCALBASE}
+INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/gmessages.h|glib/gtestutils.h|g' \
@@ -34,6 +34,9 @@
 		${WRKSRC}/glib/src/*.ccg ${WRKSRC}/glib/glibmm/*.* \
 		${WRKSRC}/gtk/src/*.* ${WRKSRC}/gtk/gtkmm/*.* \
 		${WRKSRC}/demos/gtk-demo/*.cc
+	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
+		${WRKSRC}/glib/glibmm/*.cc ${WRKSRC}/glib/glibmm/*.h \
+		${WRKSRC}/gtk/gtkmm/textbuffer.cc
 .for d in docs examples tests
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/${d}//' ${WRKSRC}/Makefile.in
 .endfor

Modified: trunk/x11-toolkits/gtkmm20/distinfo
===================================================================
--- trunk/x11-toolkits/gtkmm20/distinfo	2015-05-09 14:09:12 UTC (rev 18857)
+++ trunk/x11-toolkits/gtkmm20/distinfo	2015-05-09 14:10:46 UTC (rev 18858)
@@ -1,4 +1,2 @@
-MD5 (gnome2/gtkmm-2.2.12.tar.bz2) = d72986a00006aad01c9f5c2566a6f671
 SHA256 (gnome2/gtkmm-2.2.12.tar.bz2) = 8aa93a899f7aa55617041107dd3290ccbd3b2b81348a745a66557b159617bb57
-RMD160 (gnome2/gtkmm-2.2.12.tar.bz2) = 009c6af3c638f2e55eaf82e5d9cdf468ca0a62ad
 SIZE (gnome2/gtkmm-2.2.12.tar.bz2) = 3846586

Added: trunk/x11-toolkits/gtkmm20/files/patch-gtk_gtkmm_scale.cc
===================================================================
--- trunk/x11-toolkits/gtkmm20/files/patch-gtk_gtkmm_scale.cc	                        (rev 0)
+++ trunk/x11-toolkits/gtkmm20/files/patch-gtk_gtkmm_scale.cc	2015-05-09 14:10:46 UTC (rev 18858)
@@ -0,0 +1,10 @@
+--- gtk/gtkmm/scale.cc.orig	2013-08-31 20:43:53.000000000 +0200
++++ gtk/gtkmm/scale.cc	2013-08-31 20:49:39.000000000 +0200
+@@ -31,6 +31,7 @@
+ #include <gtk/gtkhscale.h>
+ #include <gtk/gtkvscale.h>
+ #include <math.h>
++#include <cstdlib>
+ 
+ namespace Gtk
+ {


Property changes on: trunk/x11-toolkits/gtkmm20/files/patch-gtk_gtkmm_scale.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-toolkits/gtkmm20/files/patch-gtk_gtkmm_treeview.h
===================================================================
--- trunk/x11-toolkits/gtkmm20/files/patch-gtk_gtkmm_treeview.h	                        (rev 0)
+++ trunk/x11-toolkits/gtkmm20/files/patch-gtk_gtkmm_treeview.h	2015-05-09 14:10:46 UTC (rev 18858)
@@ -0,0 +1,19 @@
+--- gtk/gtkmm/treeview.h.orig	2013-08-31 15:49:24.000000000 +0200
++++ gtk/gtkmm/treeview.h	2013-08-31 15:59:45.000000000 +0200
+@@ -3,6 +3,7 @@
+ #ifndef _GTKMM_TREEVIEW_H
+ #define _GTKMM_TREEVIEW_H
+ 
++#include <cstdlib>
+ #include <glibmm.h>
+ 
+ /* $Id: treeview.hg,v 1.71 2004/06/03 09:38:35 murrayc Exp $ */
+@@ -1296,7 +1297,7 @@
+     
+     //Convert the text to a number, using the same logic used by GtkCellRendererText when it stores numbers.
+     char* pchEnd = 0;
+-    ColumnType new_value = static_cast<ColumnType>( strtod(new_text.c_str(), &pchEnd) );
++    ColumnType new_value = static_cast<ColumnType>( std::strtod(new_text.c_str(), &pchEnd) );
+ 
+     //Store the user's new text in the model:
+     Gtk::TreeRow row = *iter;


Property changes on: trunk/x11-toolkits/gtkmm20/files/patch-gtk_gtkmm_treeview.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11-toolkits/gtkmm20/pkg-plist
===================================================================
--- trunk/x11-toolkits/gtkmm20/pkg-plist	2015-05-09 14:09:12 UTC (rev 18857)
+++ trunk/x11-toolkits/gtkmm20/pkg-plist	2015-05-09 14:10:46 UTC (rev 18858)
@@ -458,46 +458,35 @@
 lib/libatkmm-1.0.a
 lib/libatkmm-1.0.la
 lib/libatkmm-1.0.so
-lib/libatkmm-1.0.so.6
+lib/libatkmm-1.0.so.1
+lib/libatkmm-1.0.so.1.5.11
 lib/libgdkmm-2.0.a
 lib/libgdkmm-2.0.la
 lib/libgdkmm-2.0.so
-lib/libgdkmm-2.0.so.6
+lib/libgdkmm-2.0.so.1
+lib/libgdkmm-2.0.so.1.5.11
 lib/libglibmm-2.0.a
 lib/libglibmm-2.0.la
 lib/libglibmm-2.0.so
-lib/libglibmm-2.0.so.6
+lib/libglibmm-2.0.so.1
+lib/libglibmm-2.0.so.1.5.11
 lib/libgtkmm-2.0.a
 lib/libgtkmm-2.0.la
 lib/libgtkmm-2.0.so
-lib/libgtkmm-2.0.so.6
+lib/libgtkmm-2.0.so.1
+lib/libgtkmm-2.0.so.1.5.11
 lib/libgtkmm_generate_extra_defs-2.0.a
 lib/libgtkmm_generate_extra_defs-2.0.la
 lib/libgtkmm_generate_extra_defs-2.0.so
-lib/libgtkmm_generate_extra_defs-2.0.so.6
+lib/libgtkmm_generate_extra_defs-2.0.so.1
+lib/libgtkmm_generate_extra_defs-2.0.so.1.5.11
 lib/libpangomm-1.0.a
 lib/libpangomm-1.0.la
 lib/libpangomm-1.0.so
-lib/libpangomm-1.0.so.6
+lib/libpangomm-1.0.so.1
+lib/libpangomm-1.0.so.1.5.11
 libdata/pkgconfig/atkmm-1.0.pc
 libdata/pkgconfig/gdkmm-2.0.pc
 libdata/pkgconfig/glibmm-2.0.pc
 libdata/pkgconfig/gtkmm-2.0.pc
 libdata/pkgconfig/pangomm-1.0.pc
- at dirrm lib/gtkmm-2.0/proc/pm
- at dirrm lib/gtkmm-2.0/proc/m4
- at dirrm lib/gtkmm-2.0/proc
- at dirrm lib/gtkmm-2.0/include
- at dirrm lib/gtkmm-2.0
- at dirrm include/gtkmm-2.0/pangomm/private
- at dirrm include/gtkmm-2.0/pangomm
- at dirrm include/gtkmm-2.0/gtkmm_generate_extra_defs
- at dirrm include/gtkmm-2.0/gtkmm/private
- at dirrm include/gtkmm-2.0/gtkmm
- at dirrm include/gtkmm-2.0/glibmm/private
- at dirrm include/gtkmm-2.0/glibmm
- at dirrm include/gtkmm-2.0/gdkmm/private
- at dirrm include/gtkmm-2.0/gdkmm
- at dirrm include/gtkmm-2.0/atkmm/private
- at dirrm include/gtkmm-2.0/atkmm
- at dirrm include/gtkmm-2.0

More information about the Midnightbsd-cvs mailing list