diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2018-01-10 21:12:42 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2018-01-10 21:12:42 +0000 |
| commit | 13847df2122d3e0bc7a4e43920b53d7543a9abc8 (patch) | |
| tree | 30368af472e31c26b7579e37b5a94230fbf60c4e /textproc/libmwaw03 | |
| parent | ee359f1bd7c4079f2a774eed597d907e9fcb0971 (diff) | |
| download | ports-13847df2122d3e0bc7a4e43920b53d7543a9abc8.tar.gz ports-13847df2122d3e0bc7a4e43920b53d7543a9abc8.zip | |
Update to 0.3.13.
Notes
Notes:
svn path=/head/; revision=458695
Diffstat (limited to 'textproc/libmwaw03')
| -rw-r--r-- | textproc/libmwaw03/Makefile | 16 | ||||
| -rw-r--r-- | textproc/libmwaw03/distinfo | 6 | ||||
| -rw-r--r-- | textproc/libmwaw03/files/patch-src_lib_libmwaw__internal.hxx | 26 | ||||
| -rw-r--r-- | textproc/libmwaw03/pkg-plist | 2 |
4 files changed, 17 insertions, 33 deletions
diff --git a/textproc/libmwaw03/Makefile b/textproc/libmwaw03/Makefile index 0a53c15b4a34..662354b20d13 100644 --- a/textproc/libmwaw03/Makefile +++ b/textproc/libmwaw03/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libmwaw -PORTVERSION= 0.3.12 -PORTREVISION= 2 +PORTVERSION= 0.3.13 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 03 @@ -19,17 +18,8 @@ CONFIGURE_ARGS= --disable-werror --without-docs CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes -USES= compiler:features libtool pathfix pkgconfig tar:xz +USES= compiler:c++11-lib libtool pathfix pkgconfig tar:xz USE_LDCONFIG= yes INSTALL_TARGET= install-strip -.include <bsd.port.pre.mk> - -.if ${COMPILER_FEATURES:Mlibc++} -CONFIGURE_ARGS+= --with-sharedptr=c++11 -.else -BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs -CONFIGURE_ARGS+= --with-sharedptr=boost -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/libmwaw03/distinfo b/textproc/libmwaw03/distinfo index 2ecb15613b49..8a7ef4436079 100644 --- a/textproc/libmwaw03/distinfo +++ b/textproc/libmwaw03/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501607789 -SHA256 (libmwaw-0.3.12.tar.xz) = 7691a6e6e7221d61c40e3f630a8907e3e516b99a587e47d09ec53f8ac60ed1e7 -SIZE (libmwaw-0.3.12.tar.xz) = 1258972 +TIMESTAMP = 1515615392 +SHA256 (libmwaw-0.3.13.tar.xz) = db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea +SIZE (libmwaw-0.3.13.tar.xz) = 1258220 diff --git a/textproc/libmwaw03/files/patch-src_lib_libmwaw__internal.hxx b/textproc/libmwaw03/files/patch-src_lib_libmwaw__internal.hxx index c871fdf59406..6602033940cf 100644 --- a/textproc/libmwaw03/files/patch-src_lib_libmwaw__internal.hxx +++ b/textproc/libmwaw03/files/patch-src_lib_libmwaw__internal.hxx @@ -1,17 +1,11 @@ ---- src/lib/libmwaw_internal.hxx.orig 2017-07-03 08:10:43 UTC +--- src/lib/libmwaw_internal.hxx.orig 2017-11-13 09:08:03 UTC +++ src/lib/libmwaw_internal.hxx -@@ -119,9 +119,11 @@ struct MWAW_shared_ptr_noop_deleter { - /** fall through attributes */ - #define MWAW_FALLTHROUGH - #if defined(__clang__) --# if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough) --# undef MWAW_FALLTHROUGH --# define MWAW_FALLTHROUGH [[clang::fallthrough]] -+# if defined(__has_cpp_attribute) -+# if __has_cpp_attribute(clang::fallthrough) -+# undef MWAW_FALLTHROUGH -+# define MWAW_FALLTHROUGH [[clang::fallthrough]] -+# endif - # endif - #elif defined(__GNUC__) - # if __GNUC__>=7 +@@ -1027,7 +1027,7 @@ template <class T> class MWAWBox2 (public) + } + //! generic constructor + template <class U> explicit MWAWBox2(MWAWBox2<U> const &p) +- : m_data(p.min(), p.max()) ++ : m_data(MWAWVec2<T>(p.min()), MWAWVec2<T>(p.max())) + { + } + diff --git a/textproc/libmwaw03/pkg-plist b/textproc/libmwaw03/pkg-plist index bcdf30754d2c..597e048fcc7d 100644 --- a/textproc/libmwaw03/pkg-plist +++ b/textproc/libmwaw03/pkg-plist @@ -9,5 +9,5 @@ include/libmwaw-0.3/libmwaw/MWAWDocument.hxx include/libmwaw-0.3/libmwaw/libmwaw.hxx lib/libmwaw-0.3.so lib/libmwaw-0.3.so.3 -lib/libmwaw-0.3.so.3.0.12 +lib/libmwaw-0.3.so.3.0.13 libdata/pkgconfig/libmwaw-0.3.pc |