[Midnightbsd-cvs] mports [22053] trunk/deskutils/gnote: gnome 3.18.1

[laffer1 at midnightbsd.org]

Revision: 22053
          http://svnweb.midnightbsd.org/mports/?rev=22053
Author:   laffer1
Date:     2016-10-31 11:24:14 -0400 (Mon, 31 Oct 2016)
Log Message:
-----------
gnome 3.18.1

Modified Paths:
--------------
    trunk/deskutils/gnote/Makefile
    trunk/deskutils/gnote/distinfo
    trunk/deskutils/gnote/pkg-plist

Added Paths:
-----------
    trunk/deskutils/gnote/files/extra-src_base_macros.hpp

Modified: trunk/deskutils/gnote/Makefile
===================================================================
--- trunk/deskutils/gnote/Makefile	2016-10-31 15:17:28 UTC (rev 22052)
+++ trunk/deskutils/gnote/Makefile	2016-10-31 15:24:14 UTC (rev 22053)
@@ -1,8 +1,9 @@
 # Created by: Gustau Perez i Querol <gustau.perez at gmail.com>
-# $FreeBSD: head/deskutils/gnote/Makefile 394208 2015-08-14 13:21:50Z amdmi3 $
+# $FreeBSD: head/deskutils/gnote/Makefile 412346 2016-04-01 14:00:51Z mat $
+# $MidnightBSD$
 
 PORTNAME=	gnote
-PORTVERSION=	3.16.2
+PORTVERSION=	3.18.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 
@@ -20,8 +21,8 @@
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 
 USE_GNOME=	gtk30 gtkmm30 intltool libxml2 libxslt
-USES=		desktop-file-utils gettext gmake libtool \
-		pathfix pkgconfig tar:xz
+USES=		desktop-file-utils compiler:c++11-lib gettext gmake \
+		gnome libtool pathfix pkgconfig tar:xz
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -36,6 +37,10 @@
 
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
+.include <bsd.mport.options.mk>
+
+EXTRA_PATCHES=	${FILESDIR}/extra-src_base_macros.hpp
+
 post-install:
 	@${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}

Modified: trunk/deskutils/gnote/distinfo
===================================================================
--- trunk/deskutils/gnote/distinfo	2016-10-31 15:17:28 UTC (rev 22052)
+++ trunk/deskutils/gnote/distinfo	2016-10-31 15:24:14 UTC (rev 22053)
@@ -1,2 +1,2 @@
-SHA256 (gnote-3.16.2.tar.xz) = 5c5b55b5c548d15e344d59fdd2a0260b1acbd13a9fa4cf9bfc1fe6e68a041e07
-SIZE (gnote-3.16.2.tar.xz) = 3068136
+SHA256 (gnote-3.18.1.tar.xz) = 5da4ec9e7852b09af1067311fc6ee18a2c64384f4f5943b71ac37665144be58d
+SIZE (gnote-3.18.1.tar.xz) = 3310004

Added: trunk/deskutils/gnote/files/extra-src_base_macros.hpp
===================================================================
--- trunk/deskutils/gnote/files/extra-src_base_macros.hpp	                        (rev 0)
+++ trunk/deskutils/gnote/files/extra-src_base_macros.hpp	2016-10-31 15:24:14 UTC (rev 22053)
@@ -0,0 +1,46 @@
+Working around c++11 issues with the port compiler used on 9.3.
+
+--- src/base/macros.hpp.orig	2016-01-06 21:33:38.207318000 +0100
++++ src/base/macros.hpp	2016-01-06 21:45:25.932524000 +0100
+@@ -29,14 +29,16 @@
+ #ifndef __BASE_MACROS_
+ #define __BASE_MACROS_
+ 
+-#if __cplusplus < 201103L
++//#if __cplusplus < 201103L
+   #include <tr1/memory>
+   #include <boost/foreach.hpp>
+   #include <boost/lexical_cast.hpp>
++/*
+ #else
+   #include <memory>
+   #include <string>
+ #endif
++*/
+ 
+ #if __GNUC__
+ #define _PRINTF_FORMAT(f,a) \
+@@ -46,7 +48,7 @@
+ #endif
+ 
+ // define 'final' and 'override' for pre-C++11 compilers
+-#if __cplusplus < 201103L
++//#if __cplusplus < 201103L
+   #define final
+   #define override
+   #define FOREACH(var, container) BOOST_FOREACH(var, container)
+@@ -58,6 +60,7 @@
+   using std::tr1::enable_shared_from_this;
+   using std::tr1::dynamic_pointer_cast;
+   using std::tr1::static_pointer_cast;
++/*
+ #else
+   #define FOREACH(var, container) for(var : container)
+   #define TO_STRING(x) std::to_string(x)
+@@ -69,5 +72,6 @@
+   using std::dynamic_pointer_cast;
+   using std::static_pointer_cast;
+ #endif
++*/
+ 
+ #endif


Property changes on: trunk/deskutils/gnote/files/extra-src_base_macros.hpp
___________________________________________________________________
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/deskutils/gnote/pkg-plist
===================================================================
--- trunk/deskutils/gnote/pkg-plist	2016-10-31 15:17:28 UTC (rev 22052)
+++ trunk/deskutils/gnote/pkg-plist	2016-10-31 15:24:14 UTC (rev 22053)
@@ -39,8 +39,8 @@
 lib/gnote/addins/%%VERSION%%/underline.so
 lib/gnote/addins/%%VERSION%%/webdavsyncservice.desktop
 lib/gnote/addins/%%VERSION%%/webdavsyncservice.so
-lib/libgnote-3.16.so.0
-lib/libgnote-3.16.so.0.1.1
+lib/libgnote-3.18.so.0
+lib/libgnote-3.18.so.0.0.1
 lib/libgnote.so
 man/man1/gnote.1.gz
 share/appdata/gnote.appdata.xml