From 31d49f6cf3d6d0868f740c8f34b9f4ecab9892f7 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Tue, 1 Jan 2019 23:33:37 +0100 Subject: [PATCH] gthumb: rebuild against exiv2-0.27.0_1 [ci skip] --- srcpkgs/gthumb/patches/exiv-0.27.patch | 25 +++++++++++++++++++++++++ srcpkgs/gthumb/template | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gthumb/patches/exiv-0.27.patch diff --git a/srcpkgs/gthumb/patches/exiv-0.27.patch b/srcpkgs/gthumb/patches/exiv-0.27.patch new file mode 100644 index 00000000000..1531c0e0eda --- /dev/null +++ b/srcpkgs/gthumb/patches/exiv-0.27.patch @@ -0,0 +1,25 @@ +diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp +--- extensions/exiv2_tools/exiv2-utils.cpp 2018-06-17 08:24:44.000000000 +0200 ++++ extensions/exiv2_tools/exiv2-utils.cpp 2018-12-31 15:51:50.912329232 +0100 +@@ -32,7 +32,8 @@ + #include + #include + #include +-#include ++#include ++#include + #include + #include "exiv2-utils.h" + +@@ -1073,7 +1074,11 @@ + + try { + if (exifData.empty()) { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file"); ++#else + throw Exiv2::Error(1, " No Exif data found in the file"); ++#endif + } + Exiv2::ExifData::const_iterator end = exifData.end(); + for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) { diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template index 3dea6a63768..870498afc28 100644 --- a/srcpkgs/gthumb/template +++ b/srcpkgs/gthumb/template @@ -1,7 +1,7 @@ # Template file for 'gthumb' pkgname=gthumb version=3.6.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static $(vopt_enable tiff) $(vopt_enable clutter) @@ -15,8 +15,8 @@ makedepends="webkit2gtk-devel json-glib-devel gnome-desktop-devel $(vopt_if brasero brasero-devel)" short_desc='An image viewer and browser for the GNOME Desktop' maintainer="Enguerrand de Rochefort " -homepage="http://live.gnome.org/gthumb" license="GPL-2.0-or-later" +homepage="http://live.gnome.org/gthumb" distfiles="${GNOME_SITE}/gthumb/${version%.*}/gthumb-${version}.tar.xz" checksum=c9bf6bb7502659f5e990069527584bb96193f7f5f9492f0bf5f65828f5024b66