[Midnightbsd-cvs] mports [24403] trunk/deskutils/gnote: remove legacy patch

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Sep 26 19:43:38 EDT 2018


Revision: 24403
          http://svnweb.midnightbsd.org/mports/?rev=24403
Author:   laffer1
Date:     2018-09-26 19:43:38 -0400 (Wed, 26 Sep 2018)
Log Message:
-----------
remove legacy patch

Modified Paths:
--------------
    trunk/deskutils/gnote/Makefile

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

Modified: trunk/deskutils/gnote/Makefile
===================================================================
--- trunk/deskutils/gnote/Makefile	2018-09-26 23:34:47 UTC (rev 24402)
+++ trunk/deskutils/gnote/Makefile	2018-09-26 23:43:38 UTC (rev 24403)
@@ -14,12 +14,12 @@
 LICENSE=	gpl3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3 \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libgtkspell3-3.so:textproc/gtkspell3 \
+		libboost_filesystem.so:devel/boost-libs \
+		libsecret-1.so:security/libsecret \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 USE_GNOME=	gtk30 gtkmm30 intltool libxml2 libxslt
 USES=		desktop-file-utils compiler:c++11-lib gettext gmake \
@@ -40,8 +40,6 @@
 
 .include <bsd.mport.options.mk>
 
-EXTRA_PATCHES=	${FILESDIR}/extra-src_base_macros.hpp
-
 post-install:
 	@${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}

Deleted: trunk/deskutils/gnote/files/extra-src_base_macros.hpp
===================================================================
--- trunk/deskutils/gnote/files/extra-src_base_macros.hpp	2018-09-26 23:34:47 UTC (rev 24402)
+++ trunk/deskutils/gnote/files/extra-src_base_macros.hpp	2018-09-26 23:43:38 UTC (rev 24403)
@@ -1,46 +0,0 @@
-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



More information about the Midnightbsd-cvs mailing list