Index: head/graphics/exiv2/Makefile =================================================================== --- head/graphics/exiv2/Makefile (revision 497187) +++ head/graphics/exiv2/Makefile (revision 497188) @@ -1,38 +1,39 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= exiv2 DISTVERSION= 0.27.0 DISTVERSIONSUFFIX= a-Source +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.exiv2.org/builds/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Exif, IPTC, and XMP metadata manipulation library and tools LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 USES= cmake compiler:c++11-lang cpe gettext iconv pathfix localbase:ldflags USE_LDCONFIG= yes LDFLAGS+= -lintl CMAKE_ON= EXIV2_ENABLE_VIDEO \ EXIV2_BUILD_PO CMAKE_OFF= EXIV2_ENABLE_LIBXMP OPTIONS_DEFINE= SAMPLE OPTIONS_SUB= yes SAMPLE_DESC= Include sample applications SAMPLE_CMAKE_BOOL= EXIV2_BUILD_SAMPLES PATHFIX_CMAKELISTSTXT= CMakeChecks.txt WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-Source .include Index: head/graphics/exiv2/files/patch-git_04c9b1 =================================================================== --- head/graphics/exiv2/files/patch-git_04c9b1 (nonexistent) +++ head/graphics/exiv2/files/patch-git_04c9b1 (revision 497188) @@ -0,0 +1,88 @@ +Slightly modified: + +From 04c9b181cc2c7741fcb134ccc43f2bafc1f86f19 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= +Date: Sat, 12 Jan 2019 12:15:27 +0000 +Subject: [PATCH] Fix #644. Export specializations of BasicError + +- Only export BasicError::setMsg which is the only implementation present in the .cpp +- Only export BasicError specialization on __APPLE__ + +It seems that gcc automatically adds the attribute when the visibility +settings are set to hidden. See this link for more information: +https://reviews.llvm.org/D35388 +--- + cmake/mainSetup.cmake | 6 ++++-- + include/exiv2/error.hpp | 3 ++- + src/error.cpp | 6 ++++-- + 3 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/cmake/mainSetup.cmake b/cmake/mainSetup.cmake +index 05c16004d..a4d983d4c 100644 +--- cmake/mainSetup.cmake ++++ cmake/mainSetup.cmake +@@ -13,8 +13,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + +-set(CMAKE_CXX_VISIBILITY_PRESET hidden) +-set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) ++if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++ set(CMAKE_CXX_VISIBILITY_PRESET hidden) ++ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) ++endif() + + set(CMAKE_CXX_STANDARD 98) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +diff --git a/include/exiv2/error.hpp b/include/exiv2/error.hpp +index 0f9714e5b..42a0959c4 100644 +--- include/exiv2/error.hpp ++++ include/exiv2/error.hpp +@@ -315,7 +315,7 @@ namespace Exiv2 { + std::basic_string arg3_; //!< Third argument + std::string msg_; //!< Complete error message + #ifdef EXV_UNICODE_PATH +- std::wstring wmsg_; //!< Complete error message as a wide string ++ std::wstring wmsg_; //!< Complete error message as a wide string + #endif + }; // class BasicError + +@@ -389,6 +389,7 @@ namespace Exiv2 { + return wmsg_.c_str(); + } + #endif ++ + #ifdef _MSC_VER + # pragma warning( default : 4275 ) + #endif +diff --git a/src/error.cpp b/src/error.cpp +index 6d3a24bd8..c8e2d9e0d 100644 +--- src/error.cpp ++++ src/error.cpp +@@ -224,7 +224,6 @@ namespace Exiv2 { + { + } + +- //! @cond IGNORE + template<> + void BasicError::setMsg() + { +@@ -257,7 +256,9 @@ namespace Exiv2 { + wmsg_ = s2ws(msg); + #endif + } +- //! @endcond ++#ifdef __FreeBSD__ ++ template class EXIV2API BasicError; ++#endif + + #ifdef EXV_UNICODE_PATH + template<> +@@ -291,6 +292,7 @@ namespace Exiv2 { + wmsg_ = wmsg; + msg_ = ws2s(wmsg); + } ++ template class EXIV2API BasicError; + #endif + + const char* errMsg(int code) Property changes on: head/graphics/exiv2/files/patch-git_04c9b1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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 Index: head/graphics/gexiv2/Makefile =================================================================== --- head/graphics/gexiv2/Makefile (revision 497187) +++ head/graphics/gexiv2/Makefile (revision 497188) @@ -1,39 +1,39 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= gexiv2 PORTVERSION= 0.10.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= GNOME MAINTAINER= cmt@FreeBSD.org COMMENT= GObject-based wrapper around Exiv2 library LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gm4:devel/m4 \ vala>=0:lang/vala LIB_DEPENDS= libexiv2.so:graphics/exiv2 USES= compiler:c++11-lang gnome libtool:build meson pathfix \ pkgconfig tar:xz USE_GNOME= glib20 introspection:build USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc DOCS_CONFIGURE_ON= -Denable-gtk-doc=true .include pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/vala/vapi post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgexiv2.so ${RM} -r ${STAGEDIR}${PREFIX}/lib/python* .include Index: head/graphics/gimp-app/Makefile =================================================================== --- head/graphics/gimp-app/Makefile (revision 497187) +++ head/graphics/gimp-app/Makefile (revision 497188) @@ -1,139 +1,139 @@ # Created by: erich@FreeBSD.org # $FreeBSD$ PORTNAME?= gimp-app PORTVERSION= 2.10.8 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= GIMP/gimp/v${PORTVERSION:R} DISTNAME= gimp-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= GNU Image Manipulation Program LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ glib-networking>=0:net/glib-networking \ mypaint-brushes>0:graphics/mypaint-brushes LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libasound.so:audio/alsa-lib \ liblcms2.so:graphics/lcms2 \ libgegl-0.4.so:graphics/gegl \ libbabl-0.1.so:x11/babl \ libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig \ libpoppler-glib.so:graphics/poppler-glib \ libgexiv2.so:graphics/gexiv2 \ libjson-c.so:devel/json-c \ libmypaint.so:graphics/libmypaint \ libfreetype.so:print/freetype2 RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ glib-networking>=0:net/glib-networking \ mypaint-brushes>0:graphics/mypaint-brushes GNU_CONFIGURE= yes USES+= compiler:c++14-lang cpe gettext gmake gnome jpeg libtool \ localbase pkgconfig shebangfix tar:bzip2 USE_XORG= ice sm x11 xcursor xext xfixes xmu xpm xt USE_GNOME+= cairo gtk20 intltool librsvg2 USE_LDCONFIG= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip TEST_TARGET= check .if !defined(XAUTHORITY) TEST_ENV= XAUTHORITY=${HOME}/.Xauthority .endif CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \ --disable-gtk-doc \ --without-linux-input \ --with-print \ --without-gudev \ --enable-default-binary \ --disable-gimp-console \ --disable-python \ --without-appdata-test \ --with-desktop-dir=${PREFIX}/share \ --docdir=${PREFIX}/share/doc/gimp \ --with-icc-directory=${LOCALBASE}/share/color/icc \ --without-webkit \ --enable-default-binary CONFIGURE_ENV= GIMP_THREAD_LIBS=-lpthread LIBS+= -lexecinfo CPE_PRODUCT= gimp CPE_VENDOR= gnu SHEBANG_FILES= plug-ins/pygimp/plug-ins/*.py PLIST_SUB+= LIBVER=0.1000.${PORTVERSION:E} .if !defined(GIMP_SLAVE) USES+= desktop-file-utils OPTIONS_DEFINE?= AA GHOSTSCRIPT \ LIBHEIF LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF OPTIONS_DEFAULT= AA LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF OPTIONS_SUB= yes .endif .if defined(GIMP_SLAVE) PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config GIMP_LIBS= `${PKG_CONFIG} --libs gimp-2.0` GIMP_THUMB_LIBS=`${PKG_CONFIG} --libs gimpthumb-2.0` GIMP_UI_LIBS= `${PKG_CONFIG} --libs gimpui-2.0` LIB_DEPENDS+= libgimp-2.0.so:graphics/gimp-app .else DEBUG_CONFIGURE_ON= --enable-debug AA_DESC= Ascii-art Plug-in AA_LIB_DEPENDS= libaa.so:graphics/aalib AA_CONFIGURE_WITH= aa LIBHEIF_DESC= ISO/IEC 23008-12:2017 HEIF file format support LIBHEIF_LIB_DEPENDS= libheif.so:graphics/libheif LIBHEIF_CONFIGURE_WITH= libheif GHOSTSCRIPT_USES= ghostscript GHOSTSCRIPT_CONFIGURE_WITH= gs LIBMNG_LIB_DEPENDS= libmng.so:graphics/libmng LIBMNG_CONFIGURE_WITH= libmng OPENEXR_CONFIGURE_WITH= openexr OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \ libIex-2_3.so:graphics/ilmbase OPENJPEG_DESC= Enhanced JPEG (jpeg2000) graphics support OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_CONFIGURE_WITH=jpeg2000 SIMD_CONFIGURE_OFF= --disable-mmx \ --disable-sse \ --disable-altivec WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WMF_LIB_DEPENDS= libwmf.so:graphics/libwmf WMF_CONFIGURE_WITH= wmf .endif post-patch: @${REINPLACE_CMD} -e 's|%%GIMP_LIBS%%|${GIMP_LIBS}|; \ s|%%GIMP_THUMB_LIBS%%|${GIMP_THUMB_LIBS}|; \ s|%%GIMP_UI_LIBS%%|${GIMP_UI_LIBS}|' \ ${WRKSRC}/plug-ins/pygimp/Makefile.in @${REINPLACE_CMD} \ -e 's|x86_64|amd64|g' \ ${WRKSRC}/configure .include