From 8d456380f50164618c0f205f442707fb5fc93f89 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 18 Nov 2020 00:06:22 +1000
Subject: [PATCH] digiKam: bump version

---
 ...ikam-7.0.0.recipe => digikam-7.1.0.recipe} |  6 ++--
 ...-7.0.0.patchset => digikam-7.1.0.patchset} | 31 ++-----------------
 2 files changed, 6 insertions(+), 31 deletions(-)
 rename media-gfx/digikam/{digikam-7.0.0.recipe => digikam-7.1.0.recipe} (98%)
 rename media-gfx/digikam/patches/{digikam-7.0.0.patchset => digikam-7.1.0.patchset} (80%)

diff --git a/media-gfx/digikam/digikam-7.0.0.recipe b/media-gfx/digikam/digikam-7.1.0.recipe
similarity index 98%
rename from media-gfx/digikam/digikam-7.0.0.recipe
rename to media-gfx/digikam/digikam-7.1.0.recipe
index 8951a6370..8ce41090c 100644
--- a/media-gfx/digikam/digikam-7.0.0.recipe
+++ b/media-gfx/digikam/digikam-7.1.0.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="2010-2020 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digikam-$portVersion.tar.xz"
-CHECKSUM_SHA256="dc0718e30031e692d7f05367b44e797fed61f12d27063641b6a5cf4d8b26e911"
+CHECKSUM_SHA256="b103c8463adf04939583199e13f8e83015d8a4a9ad79ebfd502d2a50b5a5abbe"
 SOURCE_DIR="digikam-$portVersion"
 PATCHES="digikam-$portVersion.patchset"
 ADDITIONAL_FILES="
@@ -192,10 +192,10 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:flex
 	cmd:g++$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix >= 5
+	cmd:lrelease$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
+	cmd:qdbuscpp2xml$secondaryArchSuffix
 	"
 
 BUILD()
diff --git a/media-gfx/digikam/patches/digikam-7.0.0.patchset b/media-gfx/digikam/patches/digikam-7.1.0.patchset
similarity index 80%
rename from media-gfx/digikam/patches/digikam-7.0.0.patchset
rename to media-gfx/digikam/patches/digikam-7.1.0.patchset
index e30e648d8..97bd1fe53 100644
--- a/media-gfx/digikam/patches/digikam-7.0.0.patchset
+++ b/media-gfx/digikam/patches/digikam-7.1.0.patchset
@@ -1,6 +1,6 @@
-From e96351bed55dcd5f0833b7000aac616a20a1a5c5 Mon Sep 17 00:00:00 2001
+From 4a9539d3972626948cc232bf602ead6141a984f5 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 29 Jul 2020 14:26:47 +1000
+Date: Tue, 17 Nov 2020 21:28:37 +1000
 Subject: Fix build for Haiku
 
 
@@ -132,30 +132,5 @@ index 874e7bb..cff1f55 100644
  
  // LibGphoto2 includes
 -- 
-2.27.0
-
-
-From 80832f6839a0ba7810aff88368bcbb0e4a22ee52 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 29 Jul 2020 17:04:12 +1000
-Subject: Fix build for gcc8
-
-
-diff --git a/core/libs/rawengine/libraw/src/write/file_write.cpp b/core/libs/rawengine/libraw/src/write/file_write.cpp
-index de2e0ff..e4866af 100644
---- a/core/libs/rawengine/libraw/src/write/file_write.cpp
-+++ b/core/libs/rawengine/libraw/src/write/file_write.cpp
-@@ -120,8 +120,8 @@ void LibRaw::tiff_head(struct tiff_hdr *th, int full)
-   tiff_set(th, &th->nexif, 37386, 5, 1, TOFF(th->rat[8]));
-   if (gpsdata[1])
-   {
--    uchar latref[2] = { uchar(gpsdata[29]),0 },
--          lonref[2] = { uchar(gpsdata[30]),0 };
-+    uchar latref[2] = { (uchar)(gpsdata[29]),0 },
-+          lonref[2] = { (uchar)(gpsdata[30]),0 };
-     tiff_set(th, &th->ntag, 34853, 4, 1, TOFF(th->ngps));
-     tiff_set(th, &th->ngps, 0, 1, 4, 0x202);
-     tiff_set(th, &th->ngps, 1, 2, 2, TOFF(latref));
--- 
-2.27.0
+2.28.0