diff --git a/common/shlibs b/common/shlibs index f9165f28497..007ade1d18b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -559,7 +559,7 @@ libgimpcolor-2.0.so.0 libgimp-2.10.0_1 libgimpmodule-2.0.so.0 libgimp-2.10.0_1 libgmic.so.2 gmic-2.1.8_1 libcgmic.so.2 gmic-2.1.8_1 -libexiv2.so.26 exiv2-0.26_1 +libexiv2.so.27 exiv2-0.27_1 libKF5Holidays.so.5 kholidays-5.47.0_1 libPhabricatorHelpers.so.5 purpose-5.48.0_1 libKF5PurposeWidgets.so.5 purpose-5.48.0_1 diff --git a/srcpkgs/exiv2/patches/5405d616.patch b/srcpkgs/exiv2/patches/5405d616.patch deleted file mode 100644 index 516b9807e74..00000000000 --- a/srcpkgs/exiv2/patches/5405d616.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 5405d61623e82896e498c5c8342dd6f42e689115 Mon Sep 17 00:00:00 2001 -From: clanmills -Date: Tue, 12 Sep 2017 09:14:42 +0100 -Subject: [PATCH] Fix http://dev.exiv2.org/issues/1305 - ---- - src/pentaxmn.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp -index 4fc38be0..b22cb43b 100644 ---- src/pentaxmn.cpp -+++ src/pentaxmn.cpp -@@ -1167,6 +1167,8 @@ namespace Exiv2 { - - std::ostream& PentaxMakerNote::printShutterCount(std::ostream& os, const Value& value, const ExifData* metadata) - { -+ if ( ! metadata ) return os << "undefined" ; -+ - ExifData::const_iterator dateIt = metadata->findKey( - ExifKey("Exif.PentaxDng.Date")); - if (dateIt == metadata->end()) { diff --git a/srcpkgs/exiv2/patches/f9d0be42.patch b/srcpkgs/exiv2/patches/f9d0be42.patch deleted file mode 100644 index f92c0a1c2c6..00000000000 --- a/srcpkgs/exiv2/patches/f9d0be42.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 591dea579ae946972fef14bbf799b2d3a12e82d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C4=81ris=20Narti=C5=A1s?= -Date: Mon, 18 Sep 2017 23:37:40 +0300 -Subject: [PATCH] Fix crash on undefined metadata on some Nikon images. - Identical to commit:5405d61623e82896e498c5c8342dd6f42e689115 - ---- - src/nikonmn.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp -index 92047755..8c42e317 100644 ---- src/nikonmn.cpp -+++ src/nikonmn.cpp -@@ -299,6 +299,8 @@ namespace Exiv2 { - const Value& value, - const ExifData* exifData) - { -+ if ( ! exifData ) return os << "undefined" ; -+ - if ( value.count() >= 9 ) { - ByteOrder bo = getKeyString("Exif.MakerNote.ByteOrder",exifData) == "MM" ? bigEndian : littleEndian; - byte p[4]; diff --git a/srcpkgs/exiv2/patches/musl-mutex-initializer.patch b/srcpkgs/exiv2/patches/musl-mutex-initializer.patch deleted file mode 100644 index 29ba671a9cf..00000000000 --- a/srcpkgs/exiv2/patches/musl-mutex-initializer.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/actions.cpp.orig 2017-09-19 11:49:12.000000000 +0000 -+++ src/actions.cpp 2017-09-19 11:49:26.682396655 +0000 -@@ -2049,7 +2049,11 @@ - /* This is the critical section object (statically allocated). */ - static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER; - #else -- static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+ #if !defined(__GLIBC__) -+ static pthread_mutex_t cs = {{{PTHREAD_MUTEX_RECURSIVE}}}; -+ #else -+ static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+ #endif - #endif - #endif - diff --git a/srcpkgs/exiv2/patches/musl.patch b/srcpkgs/exiv2/patches/musl.patch new file mode 100644 index 00000000000..7baa5ba2b64 --- /dev/null +++ b/srcpkgs/exiv2/patches/musl.patch @@ -0,0 +1,23 @@ +diff --git a/src/futils.cpp b/src/futils.cpp +index a30acd9..24250fa 100644 +--- src/futils.cpp ++++ src/futils.cpp +@@ -54,7 +54,7 @@ + #include + + #ifdef EXV_HAVE_STRERROR_R +-#ifdef _GNU_SOURCE ++#if defined(_GNU_SOURCE) && defined(__GLIBC__) + extern char *strerror_r(int errnum, char *buf, size_t n); + #else + extern int strerror_r(int errnum, char *buf, size_t n); +@@ -348,7 +348,7 @@ namespace Exiv2 { + std::ostringstream os; + #ifdef EXV_HAVE_STRERROR_R + const size_t n = 1024; +-#ifdef _GNU_SOURCE ++#if defined(_GNU_SOURCE) && defined(__GLIBC__) + char *buf = 0; + char buf2[n]; + std::memset(buf2, 0x0, n); + diff --git a/srcpkgs/exiv2/template b/srcpkgs/exiv2/template index b71c3faddcc..3b6280c50f5 100644 --- a/srcpkgs/exiv2/template +++ b/srcpkgs/exiv2/template @@ -1,17 +1,17 @@ # Template file for 'exiv2' pkgname=exiv2 -version=0.26 -revision=2 -build_style=gnu-configure -wrksrc=exiv2-trunk +version=0.27.0 +revision=1 +wrksrc="exiv2-${version}-Source" +build_style=cmake +configure_args="-DEXIV2_BUILD_SAMPLES=OFF" makedepends="zlib-devel expat-devel" short_desc="Image metadata manipulation" -maintainer="Juan RP " -license="GPL-2" +maintainer="Rasmus Thomsen " +license="GPL-2.0-or-later" homepage="http://www.exiv2.org" -distfiles="http://www.exiv2.org/builds/exiv2-${version}-trunk.tar.gz" -checksum=c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb -disable_parallel_build=yes +distfiles="http://www.exiv2.org/builds/exiv2-${version}-Source.tar.gz" +checksum=ee88bc81539b73c65010651785d094fad0b39760a424b3c16c17e1856cfef2d7 exiv2-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}"