[arch-commits] Commit in merkaartor/trunk (PKGBUILD merkaartor-exiv2-0.27.1.patch)

[Antonio Rojas]

    Date: Saturday, May 18, 2019 @ 09:20:34
  Author: arojas
Revision: 467849

Fix build with exiv2 0.27.1

Added:
  merkaartor/trunk/merkaartor-exiv2-0.27.1.patch
Modified:
  merkaartor/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |    7 +++++--
 merkaartor-exiv2-0.27.1.patch |   12 ++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-18 09:14:57 UTC (rev 467848)
+++ PKGBUILD	2019-05-18 09:20:34 UTC (rev 467849)
@@ -15,14 +15,17 @@
 makedepends=('qt5-tools')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/openstreetmap/$pkgname/archive/$pkgver.tar.gz"
         merkaartor.appdata.xml
-        nowebkit.patch)
+        nowebkit.patch
+        merkaartor-exiv2-0.27.1.patch)
 sha256sums=('d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947'
             '4082cae211a5480501abb95c302608c45363cc3152a70746a3f41f57c4252df6'
-            'f976a3bb6bcd0f0ef8723dcc8597f5ae9789c93143e7ef47f24f43c67913129b')
+            'f976a3bb6bcd0f0ef8723dcc8597f5ae9789c93143e7ef47f24f43c67913129b'
+            '4627728ba02a35fc678c05e801e2499f069f4273af8dbb246040e5dc6f61d487')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../nowebkit.patch
+  patch -p1 -i ../merkaartor-exiv2-0.27.1.patch # Fix build with exiv2 0.27.1
 }
 
 build() {

Added: merkaartor-exiv2-0.27.1.patch
===================================================================
--- merkaartor-exiv2-0.27.1.patch	                        (rev 0)
+++ merkaartor-exiv2-0.27.1.patch	2019-05-18 09:20:34 UTC (rev 467849)
@@ -0,0 +1,12 @@
+--- merkaartor-0.18.3/src/Docks/GeoImageDock.h.orig	2019-05-18 09:17:08.759836141 +0000
++++ merkaartor-0.18.3/src/Docks/GeoImageDock.h	2019-05-18 09:17:23.353374620 +0000
+@@ -7,8 +7,7 @@
+ #include <QDockWidget>
+ #include <QMouseEvent>
+ #include <QShortcut>
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <QDrag>
+ 
+ class ImageView;