Index: head/graphics/gexiv2/files/patch-gexiv2_meson.build =================================================================== --- head/graphics/gexiv2/files/patch-gexiv2_meson.build (revision 497370) +++ head/graphics/gexiv2/files/patch-gexiv2_meson.build (nonexistent) @@ -1,16 +0,0 @@ ---- gexiv2/meson.build.orig 2018-12-01 18:58:21.005598000 +0100 -+++ gexiv2/meson.build 2018-12-01 19:01:56.566055000 +0100 -@@ -35,10 +35,10 @@ - - # Static map file - mapfile = 'gexiv2.map' --if host_machine.system() == 'darwin' -- vflag = '' -+if host_machine.system() == 'darwin' or host_machine.system() == 'freebsd' -+ vflag = [] - else -- vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile) -+ vflag = ['-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)] - endif - - gexiv2 = library('gexiv2', Property changes on: head/graphics/gexiv2/files/patch-gexiv2_meson.build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/gexiv2/files/patch-git_d8f966 =================================================================== --- head/graphics/gexiv2/files/patch-git_d8f966 (revision 497370) +++ head/graphics/gexiv2/files/patch-git_d8f966 (nonexistent) @@ -1,181 +0,0 @@ -From d8f96634e1df693eb0393cf82893a86dd2a92d2b Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Tue, 20 Nov 2018 12:43:21 +0100 -Subject: [PATCH] Replace single-file includes - -To improve compatibility with exiv2 0.27 as recommended in - -Fixes #34 - -https://github.com/Exiv2/exiv2/issues/555#issuecomment-440023260 ---- - gexiv2/gexiv2-metadata-exif.cpp | 2 +- - gexiv2/gexiv2-metadata-gps.cpp | 2 +- - gexiv2/gexiv2-metadata-iptc.cpp | 2 +- - gexiv2/gexiv2-metadata-private.h | 6 +----- - gexiv2/gexiv2-metadata-xmp.cpp | 2 +- - gexiv2/gexiv2-metadata.cpp | 9 ++------- - gexiv2/gexiv2-preview-image-private.h | 2 +- - gexiv2/gexiv2-preview-properties-private.h | 2 +- - gexiv2/gexiv2-startup.cpp | 2 +- - gexiv2/gexiv2-stream-io.cpp | 2 +- - gexiv2/gexiv2-stream-io.h | 2 +- - 11 files changed, 12 insertions(+), 21 deletions(-) - -diff --git gexiv2/gexiv2-metadata-exif.cpp gexiv2/gexiv2-metadata-exif.cpp -index c87a460..f931b95 100644 ---- gexiv2/gexiv2-metadata-exif.cpp -+++ gexiv2/gexiv2-metadata-exif.cpp -@@ -12,7 +12,7 @@ - #include "gexiv2-metadata-private.h" - #include - #include --#include -+#include - - G_BEGIN_DECLS - -diff --git gexiv2/gexiv2-metadata-gps.cpp gexiv2/gexiv2-metadata-gps.cpp -index d49d97c..47592ec 100644 ---- gexiv2/gexiv2-metadata-gps.cpp -+++ gexiv2/gexiv2-metadata-gps.cpp -@@ -15,7 +15,7 @@ - #include - #include - #include --#include -+#include - - #include - -diff --git gexiv2/gexiv2-metadata-iptc.cpp gexiv2/gexiv2-metadata-iptc.cpp -index 2371708..aeac1c7 100644 ---- gexiv2/gexiv2-metadata-iptc.cpp -+++ gexiv2/gexiv2-metadata-iptc.cpp -@@ -12,7 +12,7 @@ - #include "gexiv2-metadata-private.h" - #include - #include --#include -+#include - - G_BEGIN_DECLS - -diff --git gexiv2/gexiv2-metadata-private.h gexiv2/gexiv2-metadata-private.h -index d85453c..8818c22 100644 ---- gexiv2/gexiv2-metadata-private.h -+++ gexiv2/gexiv2-metadata-private.h -@@ -11,11 +11,7 @@ - #define GEXIV2_METADATA_PRIVATE_H - - #include --#include --#include --#include --#include --#include -+#include - - G_BEGIN_DECLS - -diff --git gexiv2/gexiv2-metadata-xmp.cpp gexiv2/gexiv2-metadata-xmp.cpp -index e4900f2..6f60cd0 100644 ---- gexiv2/gexiv2-metadata-xmp.cpp -+++ gexiv2/gexiv2-metadata-xmp.cpp -@@ -12,7 +12,7 @@ - #include "gexiv2-metadata-private.h" - #include - #include --#include -+#include - - G_BEGIN_DECLS - -diff --git gexiv2/gexiv2-metadata.cpp gexiv2/gexiv2-metadata.cpp -index 98ded9d..9c791ef 100644 ---- gexiv2/gexiv2-metadata.cpp -+++ gexiv2/gexiv2-metadata.cpp -@@ -22,13 +22,8 @@ - #include - #include - #include --#include --#include --#include --#include --#include --#include --#include -+ -+#include - - - G_BEGIN_DECLS -diff --git gexiv2/gexiv2-preview-image-private.h gexiv2/gexiv2-preview-image-private.h -index 810304c..b52a84f 100644 ---- gexiv2/gexiv2-preview-image-private.h -+++ gexiv2/gexiv2-preview-image-private.h -@@ -11,7 +11,7 @@ - #define GEXIV2_PREVIEW_IMAGE_PRIVATE_H - - #include --#include -+#include - - G_BEGIN_DECLS - -diff --git gexiv2/gexiv2-preview-properties-private.h gexiv2/gexiv2-preview-properties-private.h -index bacb392..b057604 100644 ---- gexiv2/gexiv2-preview-properties-private.h -+++ gexiv2/gexiv2-preview-properties-private.h -@@ -11,7 +11,7 @@ - #define GEXIV2_PREVIEW_PROPERTIES_PRIVATE_H - - #include --#include -+#include - - G_BEGIN_DECLS - -diff --git gexiv2/gexiv2-startup.cpp gexiv2/gexiv2-startup.cpp -index 179b6c7..de438de 100644 ---- gexiv2/gexiv2-startup.cpp -+++ gexiv2/gexiv2-startup.cpp -@@ -7,7 +7,7 @@ - * This is free software. See COPYING for details. - */ - --#include -+#include - #include "gexiv2-startup.h" - #include "gexiv2-version.h" - -diff --git gexiv2/gexiv2-stream-io.cpp gexiv2/gexiv2-stream-io.cpp -index b772b74..454305d 100644 ---- gexiv2/gexiv2-stream-io.cpp -+++ gexiv2/gexiv2-stream-io.cpp -@@ -13,7 +13,7 @@ - #include "gexiv2-stream-io.h" - #include "gexiv2-managed-stream.h" - --#include -+#include - #include - #include - #include -diff --git gexiv2/gexiv2-stream-io.h gexiv2/gexiv2-stream-io.h -index 430ac01..8d1fe76 100644 ---- gexiv2/gexiv2-stream-io.h -+++ gexiv2/gexiv2-stream-io.h -@@ -16,7 +16,7 @@ - #define GEXIV2_STREAM_IO_H - - #include --#include -+#include - #include - - --- -2.18.1 - Property changes on: head/graphics/gexiv2/files/patch-git_d8f966 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/gexiv2/Makefile =================================================================== --- head/graphics/gexiv2/Makefile (revision 497370) +++ head/graphics/gexiv2/Makefile (revision 497371) @@ -1,39 +1,38 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= gexiv2 -PORTVERSION= 0.10.9 -PORTREVISION= 4 +PORTVERSION= 0.12.0 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 +DOCS_CONFIGURE_ON= -Dgtk_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/gexiv2/distinfo =================================================================== --- head/graphics/gexiv2/distinfo (revision 497370) +++ head/graphics/gexiv2/distinfo (revision 497371) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542994417 -SHA256 (gexiv2-0.10.9.tar.xz) = 8806234aa6fd1c345d46bf07a14e82771415071ca5ff63615b1ea62bd2fec0ed -SIZE (gexiv2-0.10.9.tar.xz) = 380348 +TIMESTAMP = 1553963156 +SHA256 (gexiv2-0.12.0.tar.xz) = 58f539b0386f36300b76f3afea3a508de4914b27e78f58ee4d142486a42f926a +SIZE (gexiv2-0.12.0.tar.xz) = 370816 Index: head/graphics/gexiv2/pkg-plist =================================================================== --- head/graphics/gexiv2/pkg-plist (revision 497370) +++ head/graphics/gexiv2/pkg-plist (revision 497371) @@ -1,38 +1,38 @@ include/gexiv2/gexiv2.h include/gexiv2/gexiv2-enums.h include/gexiv2/gexiv2-log.h include/gexiv2/gexiv2-metadata.h include/gexiv2/gexiv2-managed-stream.h include/gexiv2/gexiv2-preview-properties.h include/gexiv2/gexiv2-preview-image.h include/gexiv2/gexiv2-startup.h include/gexiv2/gexiv2-version.h lib/girepository-1.0/GExiv2-0.10.typelib lib/libgexiv2.so lib/libgexiv2.so.2 lib/libgexiv2.so.2.0.0 libdata/pkgconfig/gexiv2.pc share/gir-1.0/GExiv2-0.10.gir +%%DOCS%%share/gtk-doc/html/gexiv2/GExiv2Metadata.html +%%DOCS%%share/gtk-doc/html/gexiv2/GExiv2PreviewImage.html +%%DOCS%%share/gtk-doc/html/gexiv2/GExiv2PreviewProperties.html %%DOCS%%share/gtk-doc/html/gexiv2/annotation-glossary.html %%DOCS%%share/gtk-doc/html/gexiv2/api-index-0-10-6.html %%DOCS%%share/gtk-doc/html/gexiv2/api-index-full.html %%DOCS%%share/gtk-doc/html/gexiv2/ch01.html %%DOCS%%share/gtk-doc/html/gexiv2/deprecated-api-index.html -%%DOCS%%share/gtk-doc/html/gexiv2/gexiv2-GExiv2Metadata.html -%%DOCS%%share/gtk-doc/html/gexiv2/gexiv2-GExiv2PreviewImage.html -%%DOCS%%share/gtk-doc/html/gexiv2/gexiv2-GExiv2PreviewProperties.html %%DOCS%%share/gtk-doc/html/gexiv2/gexiv2-Library-initialisation.html %%DOCS%%share/gtk-doc/html/gexiv2/gexiv2-Logging-functionality.html %%DOCS%%share/gtk-doc/html/gexiv2/gexiv2-gexiv2-version.html %%DOCS%%share/gtk-doc/html/gexiv2/gexiv2.devhelp2 %%DOCS%%share/gtk-doc/html/gexiv2/home.png %%DOCS%%share/gtk-doc/html/gexiv2/index.html %%DOCS%%share/gtk-doc/html/gexiv2/left-insensitive.png %%DOCS%%share/gtk-doc/html/gexiv2/left.png %%DOCS%%share/gtk-doc/html/gexiv2/right-insensitive.png %%DOCS%%share/gtk-doc/html/gexiv2/right.png %%DOCS%%share/gtk-doc/html/gexiv2/style.css %%DOCS%%share/gtk-doc/html/gexiv2/up-insensitive.png %%DOCS%%share/gtk-doc/html/gexiv2/up.png share/vala/vapi/gexiv2.deps share/vala/vapi/gexiv2.vapi Index: head/graphics/shotwell/Makefile =================================================================== --- head/graphics/shotwell/Makefile (revision 497370) +++ head/graphics/shotwell/Makefile (revision 497371) @@ -1,69 +1,69 @@ # Created by: Mario Sergio Fujikawa Ferreira et al. # $FreeBSD$ PORTNAME= shotwell PORTVERSION= 0.30.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics gnome MASTER_SITES= GNOME MAINTAINER= cmt@FreeBSD.org COMMENT= Open source photo manager for GNOME LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= vala>=0.20.1:lang/vala \ itstool:textproc/itstool LIB_DEPENDS= libgio-2.0.so:devel/glib20 \ libjson-glib-1.0.so:devel/json-glib \ libgdata.so:devel/libgdata \ libgee-0.8.so:devel/libgee \ libsoup-2.4.so:devel/libsoup \ libexiv2.so:graphics/exiv2 \ libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2 \ libgexiv2.so:graphics/gexiv2 \ libexif.so:graphics/libexif \ libgphoto2.so:graphics/libgphoto2 \ libraw.so:graphics/libraw \ libgstreamer-1.0.so:multimedia/gstreamer1 \ libgstapp-1.0.so:multimedia/gstreamer1-plugins \ libgcr-ui-3.so:security/gcr \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libxml2.so:textproc/libxml2 USES= gettext desktop-file-utils gnome meson ninja pkgconfig \ python:3.4+,build shebangfix sqlite tar:xz USE_GNOME= cairo dconf gtk30 gnomedocutils USE_GSTREAMER1= yes USE_LDCONFIG= yes USE_XORG= x11 SHEBANG_FILES= build-aux/meson/postinstall.py python_OLD_CMD= "/usr/bin/env python3" python_CMD= ${SETENV} ${PYTHON_VERSION} MESON_ARGS= -Dudev=false -Dextra-plugins=true -Dinstall-apport-hook=false \ -Dpublishers=facebook,flickr,gallery3,picasa,piwigo,rajce,tumblr,yandex,youtube INSTALLS_ICONS= yes PORTSCOUT= limitw:1,even MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= FACED OPENMP OPTIONS_SUB= yes FACED_DESC= Face Detection OPENMP_DESC= libraw uses OpenMP (implies GCC) FACED_CONFIGURE_ON= -Dface-detection=true FACED_CONFIGURE_OFF= -Dface-detection=false FACED_LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \ libopencv_photo.so:graphics/opencv OPENMP_USES= compiler:openmp OPENMP_USES_OFF= compiler:c++11-lib PLIST_SUB= DISTVERSION=${DISTVERSION} GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml .include Index: head/graphics/shotwell/files/patch-src_photos_PhotoMetadata.vala =================================================================== --- head/graphics/shotwell/files/patch-src_photos_PhotoMetadata.vala (nonexistent) +++ head/graphics/shotwell/files/patch-src_photos_PhotoMetadata.vala (revision 497371) @@ -0,0 +1,22 @@ +--- src/photos/PhotoMetadata.vala.orig 2019-03-30 21:05:25 UTC ++++ src/photos/PhotoMetadata.vala +@@ -276,7 +276,7 @@ public class PhotoMetadata : MediaMetadata { + exiv2 = new GExiv2.Metadata(); + exif = null; + +- exiv2.open_buf(buffer, length); ++ exiv2.open_buf(buffer[0:length]); + exif = Exif.Data.new_from_data(buffer, length); + source_name = "".printf(length); + } +@@ -285,8 +285,8 @@ public class PhotoMetadata : MediaMetadata { + exiv2 = new GExiv2.Metadata(); + exif = null; + +- exiv2.from_app1_segment(buffer.get_data(), (long) buffer.get_size()); +- exif = Exif.Data.new_from_data(buffer.get_data(), buffer.get_size()); ++ exiv2.from_app1_segment(buffer.get_data()); ++ exif = Exif.Data.new_from_data(buffer.get_data(), (long) buffer.get_size()); + source_name = "".printf(buffer.get_size()); + } + Property changes on: head/graphics/shotwell/files/patch-src_photos_PhotoMetadata.vala ___________________________________________________________________ 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