Merge pull request #5463 from lazka/gexiv2-0.12.0

gexiv2: Update to 0.12.0

mingw-w64-gexiv2/0001-gioio-implement-wpath-to-fix-build-on-Windows.patch

@@ -0,0 +1,38 @@
+From 9f0e0b985eeeabd60aab236f99eb104927578253 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Mon, 3 Jun 2019 08:18:17 +0200
+Subject: [PATCH] gioio: implement wpath() to fix build on Windows
+
+On Windows the BasicIo class has an additional pure virtual function
+called wpath() guarded by EXV_UNICODE_PATH.
+
+GioIo was missing an implementation and that made the build fail on Windows.
+
+Fixes #41
+---
+ gexiv2/gexiv2-metadata.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/gexiv2/gexiv2-metadata.cpp b/gexiv2/gexiv2-metadata.cpp
+index ab8e091..fb32a6b 100644
+--- a/gexiv2/gexiv2-metadata.cpp
++++ b/gexiv2/gexiv2-metadata.cpp
+@@ -206,6 +206,15 @@ public:
+         return "GIO Wrapper";
+     }
+ 
++#ifdef EXV_UNICODE_PATH
++    std::wstring wpath() const {
++        std::string p = path();
++        std::wstring w(p.length(), L' ');
++        std::copy(p.begin(), p.end(), w.begin());
++        return w;
++    }
++#endif
++
+ #if EXIV2_TEST_VERSION(0,27,99)
+     Exiv2::BasicIo::UniquePtr temporary() const {
+         return Exiv2::BasicIo::UniquePtr(nullptr);
+-- 
+2.21.0
+

mingw-w64-gexiv2/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=gexiv2
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.10.10
+pkgver=0.12.0
 pkgrel=1
 arch=('any')
 pkgdesc="GObject-based wrapper around the Exiv2 library (mingw-w64)"
@@ -19,11 +19,16 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
 options=('strip' 'staticlibs')
 license=("LGPL 2.1")
 url="https://www.gnome.org/"
-source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz)
-sha256sums=('7d9ad7147ab51ab691edf043c44a0a44de4088c48a12d9c23c26939710e66ce1')
+source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz
+        '0001-gioio-implement-wpath-to-fix-build-on-Windows.patch')
+sha256sums=('58f539b0386f36300b76f3afea3a508de4914b27e78f58ee4d142486a42f926a'
+            'cecc971c94b967f97e5166a699b685b1e747b2cda249cf1cfe8bf66056229ba9')
 
 prepare() {
   cd ${_realname}-${pkgver}
+
+  # https://gitlab.gnome.org/GNOME/gexiv2/merge_requests/11
+  patch -Np1 -i "${srcdir}"/0001-gioio-implement-wpath-to-fix-build-on-Windows.patch
 }
 
 build() {
@@ -33,7 +38,7 @@ build() {
 
   ${MINGW_PREFIX}/bin/meson \
     --buildtype plain \
-    -Dpython2-girdir=no \
+    -Dpython2_girdir=no \
     ../${_realname}-${pkgver}
 
   ninja