From 5bca247eb9567840aec6b9f37be5ad31be9f3b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Tue, 17 Sep 2019 23:28:42 +0200 Subject: [PATCH] exiv2: update to 0.27.2, move cmake files to -devel package --- srcpkgs/exiv2/patches/musl.patch | 23 ----------------------- srcpkgs/exiv2/template | 13 +++++++------ 2 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/exiv2/patches/musl.patch diff --git a/srcpkgs/exiv2/patches/musl.patch b/srcpkgs/exiv2/patches/musl.patch deleted file mode 100644 index 7baa5ba2b64..00000000000 --- a/srcpkgs/exiv2/patches/musl.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 7bd2e2be5db..90696f471ca 100644 --- a/srcpkgs/exiv2/template +++ b/srcpkgs/exiv2/template @@ -1,6 +1,6 @@ # Template file for 'exiv2' pkgname=exiv2 -version=0.27.0 +version=0.27.2 revision=1 wrksrc="exiv2-${version}-Source" build_style=cmake @@ -9,17 +9,18 @@ makedepends="zlib-devel expat-devel" short_desc="Image metadata manipulation" maintainer="Enno Boland " license="GPL-2.0-or-later" -homepage="http://www.exiv2.org" -distfiles="http://www.exiv2.org/releases/exiv2-${version}-Source.tar.gz" -checksum=ee88bc81539b73c65010651785d094fad0b39760a424b3c16c17e1856cfef2d7 +homepage="https://www.exiv2.org" +distfiles="https://www.exiv2.org/builds/exiv2-${version}-Source.tar.gz" +checksum=2652f56b912711327baff6dc0c90960818211cf7ab79bb5e1eb59320b78d153f exiv2-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } }