From a1943dd68e09ba71157483ce73b7540207745bef Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 8 Nov 2016 09:04:19 +0000 Subject: [PATCH] Update to shotwell-0.25.0.1. --- graphics/shotwell/Makefile | 27 ++++++++++--------- graphics/shotwell/distinfo | 4 +-- .../shotwell/patches/patch-vapi_misc_vapi | 19 ------------- 3 files changed, 16 insertions(+), 34 deletions(-) delete mode 100644 graphics/shotwell/patches/patch-vapi_misc_vapi diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 72a2d9e26aa..81722ec3235 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.63 2016/10/26 08:39:07 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.64 2016/11/08 09:04:19 ajacoutot Exp $ COMMENT = digital photo organizer -GNOME_VERSION = 0.25.0 +GNOME_VERSION = 0.25.0.1 GNOME_PROJECT = shotwell CATEGORIES = graphics @@ -20,16 +20,17 @@ WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject dbus-1 drm WANTLIB += enchant epoxy estdc++ exif exiv2 expat ffi fontconfig WANTLIB += freetype gbm gck-1 gcr-base-3 gcr-ui-3 gcrypt gdk-3 WANTLIB += gdk_pixbuf-2.0 gee-0.8 gexiv2 gio-2.0 glapi glib-2.0 -WANTLIB += gmodule-2.0 gobject-2.0 gpg-error gphoto2 gphoto2_port -WANTLIB += graphite2 gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstfft-1.0 -WANTLIB += gstpbutils-1.0 gstreamer-1.0 gsttag-1.0 gstvideo-1.0 -WANTLIB += gthread-2.0 gtk-3 harfbuzz harfbuzz-icu hyphen iconv -WANTLIB += icudata icui18n icuuc intl jasper javascriptcoregtk-4.0 -WANTLIB += jpeg json-glib-1.0 lcms2 ltdl lzma m notify orc-0.4 -WANTLIB += p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre -WANTLIB += pixman-1 png pthread pthread-stubs raw secret-1 soup-2.4 -WANTLIB += sqlite3 stdc++ webkit2gtk-4.0 webp xcb xcb-dri2 xcb-glx -WANTLIB += xcb-render xcb-shm xcb-xfixes xml2 xslt z +WANTLIB += gmodule-2.0 gmp gnutls gobject-2.0 gpg-error gphoto2 +WANTLIB += gphoto2_port graphite2 gstapp-1.0 gstaudio-1.0 gstbase-1.0 +WANTLIB += gstfft-1.0 gstpbutils-1.0 gstreamer-1.0 gsttag-1.0 +WANTLIB += gstvideo-1.0 gthread-2.0 gtk-3 harfbuzz harfbuzz-icu +WANTLIB += hogweed hyphen iconv icudata icui18n icuuc idn intl +WANTLIB += jasper javascriptcoregtk-4.0 jpeg json-glib-1.0 lcms2 +WANTLIB += ltdl lzma m nettle notify orc-0.4 p11-kit pango-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread +WANTLIB += pthread-stubs raw secret-1 soup-2.4 sqlite3 stdc++ +WANTLIB += tasn1 webkit2gtk-4.0 webp xcb xcb-dri2 xcb-glx xcb-render +WANTLIB += xcb-shm xcb-xfixes xml2 xslt z MODULES = devel/dconf \ x11/gnome @@ -38,7 +39,7 @@ MODGNOME_TOOLS = desktop-file-utils gtk-update-icon-cache vala yelp LIB_DEPENDS = devel/json-glib \ devel/libgee \ - graphics/libgexiv2>=0.10.4 \ + graphics/libgexiv2 \ graphics/libgphoto2 \ graphics/libraw \ www/webkitgtk4 diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo index bb4a6a25e4b..f4b0c244462 100644 --- a/graphics/shotwell/distinfo +++ b/graphics/shotwell/distinfo @@ -1,2 +1,2 @@ -SHA256 (shotwell-0.25.0.tar.xz) = 8JT/j5nNHnkasGBMCml1C6XP+sR6K0D043gO3+3xdDg= -SIZE (shotwell-0.25.0.tar.xz) = 5397076 +SHA256 (shotwell-0.25.0.1.tar.xz) = 5pyWs+5lCu2Pg9/gmeAdhfg6sZ9WmVqQ1IaB/fJkAKY= +SIZE (shotwell-0.25.0.1.tar.xz) = 5398404 diff --git a/graphics/shotwell/patches/patch-vapi_misc_vapi b/graphics/shotwell/patches/patch-vapi_misc_vapi deleted file mode 100644 index 7aa75f8e7d9..00000000000 --- a/graphics/shotwell/patches/patch-vapi_misc_vapi +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-vapi_misc_vapi,v 1.1 2016/10/26 08:39:07 ajacoutot Exp $ - -XXX Not included in the tarball. -From 9218b13bd7ef86e8f3f7de7e98b6ac64f6dd162a Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Tue, 20 Sep 2016 21:19:31 +0200 -Subject: Support acdsee tags - ---- vapi/misc.vapi.orig Wed Oct 26 10:26:05 2016 -+++ vapi/misc.vapi Wed Oct 26 10:26:05 2016 -@@ -0,0 +1,8 @@ -+namespace Workaround { -+[CCode (cheader_filename = "glib.h", cname = "g_markup_collect_attributes", sentinel = "G_MARKUP_COLLECT_INVALID")] -+extern bool markup_collect_attributes(string element_name, -+ [CCode (array_length = false, array_null_terminated = true)] -+ string[] attribute_names, -+ [CCode (array_length = false, array_null_terminated = true)] -+ string[] attribute_values, ...) throws GLib.MarkupError; -+}