media-gfx/digikam: 6.2.0 version bump

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

2 files changed, 91 insertions, 0 deletions

diff --git a/media-gfx/digikam/files/digikam-6.2.0-cmake.patch b/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
new file mode 100644
index 000000000000..f25dd6306afa
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
@@ -0,0 +1,66 @@
+From d915828e4db2e7b40e799abc01a6fdb683d2b921 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 17 Feb 2019 23:51:03 +0100
+Subject: [PATCH] Un-break optional Qt5 detection
+
+---
+ core/CMakeLists.txt | 26 ++++++++++----------------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index c04ee1a9c3..c3762437e6 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
+ )
+ 
+ if(ENABLE_QWEBENGINE)
+-    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets)
++    find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE)
+ else()
+-    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets)
++    find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE)
+ endif()
+ 
+-find_package(Qt5 ${QT_MIN_VERSION}
+-             OPTIONAL_COMPONENTS
+-             DBus
+-             OpenGL
+-)
++find_package(Qt5DBus ${QT_MIN_VERSION})
++
++find_package(Qt5OpenGL ${QT_MIN_VERSION})
+ 
+ if(ENABLE_DBUS)
+     if(NOT Qt5DBus_FOUND)
+@@ -156,14 +154,10 @@ endif()
+ # Dependencies For unit tests and CLI test tools
+ 
+ if(BUILD_TESTING)
+-    find_package(Qt5 ${QT_MIN_VERSION}
+-                 NO_MODULE COMPONENTS
+-                 Test
+-    )
+-    find_package(Qt5 ${QT_MIN_VERSION}
+-                 OPTIONAL_COMPONENTS
+-                 Qml WebView  # Optional, for 'sialis' O2 library test tool.
+-    )
++    find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
++    # Optional, for 'sialis' O2 library test tool.
++    find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE)
++    find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE)
+ endif()
+ 
+ find_package(KF5 ${KF5_MIN_VERSION}
+@@ -335,7 +329,7 @@ endif()
+ find_package(X11)
+ 
+ if(X11_FOUND)
+-    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
++    find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
+     set(HAVE_X11 TRUE)
+ else()
+     set(HAVE_X11 FALSE)
+-- 
+2.22.0
+
diff --git a/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch b/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
new file mode 100644
index 000000000000..1c182ed7c9e7
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
@@ -0,0 +1,25 @@
+From 19490eb10de0444219e8b525bb75513c046d184d Mon Sep 17 00:00:00 2001
+From: Maik Qualmann <metzpinguin@gmail.com>
+Date: Wed, 7 Aug 2019 19:52:13 +0200
+Subject: [PATCH] fix upload error to Google Photo when description contains
+ quotes BUGS: 410692 FIXED-IN: 6.3.0
+
+---
+ core/dplugins/generic/webservices/google/gswindow.cpp | 1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp
+index a03e683e65..a80eac5cdb 100644
+--- a/core/dplugins/generic/webservices/google/gswindow.cpp
++++ b/core/dplugins/generic/webservices/google/gswindow.cpp
+@@ -594,6 +594,7 @@ void GSWindow::slotStartTransfer()
+                 QStringList descriptions = QStringList() << info.title() << info.comment();
+                 descriptions.removeAll(QLatin1String(""));
+                 temp.description         = descriptions.join(QLatin1String("\n\n"));
++                temp.description.replace(QLatin1Char('"'), QLatin1String("\\\""));
+                 break;
+         }
+ 
+-- 
+2.22.0
+