gentoo resync : 18.08.2019

4 files changed, 102 insertions, 7 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index fd87d4e0fd3f..8cd14dfa580e 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,8 @@
 AUX digikam-6.0.0-cmake.patch 1972 BLAKE2B 103f282e8cdc33d6e7cc3982bb15b290ff2381846d6262005922b97df1b54d9dd7572fb95eee01a3cf413dda9eed28e0201123bfedddc7beda6dc4ddc99e5d55 SHA512 8efe171f763692efd7c8449e1365e2d531a4d1b6da79fe1f5048dbe1b328f70b6e923298015f2a162751843eb88db2dd1af744a2b2cd3219e0f44aea4d3a569a
+AUX digikam-6.2.0-cmake.patch 2011 BLAKE2B da9e459cd8c7f89d986166cf19dde36d599565f573831057c0d68706c05f4b49240215e159d36e377f16b178c7de04e713bdfb3214bd83e114cbbd5b40f4f37a SHA512 44a63a08da538bee35efc965789b463455646c3ee9ed8fbe6f22591155c20b623e48838af52f8b521a35b3548fe44909516a15a4d815347e61de71d07bbfad17
+AUX digikam-6.2.0-googlephoto-upload.patch 1072 BLAKE2B 5384a259b2fdd15cf195fed8f5aa1a16a0af3932af1e2226b3bfd2be95d19f6fee003fd9d3344c0921ff5655d22ea4f30f98e8ed7c1e5dee1d4b91d4d031562e SHA512 c71ab51371e45538f33ba9603eabdc8e3e518f7e38aa274407d90f216a14f6071066f388291d072fca46eb6589e3cafe0eb5b78f3bb3520ca9aa85add092d265
 DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
-DIST digikam-6.1.0.tar.xz 332466544 BLAKE2B 2f9aad537108a905d42bd218052287ccdb76a75e4883990c19a4c12318dbf019fa37b547e1adf4394dad14ab6f2a38d5f0c397060382d525ef7c1cabafa649d6 SHA512 36cffce4fdb751dafc45b2d447fbbd1134b7dc59c19eb6f7aebcf8d66327f6d8a49e787e346984cc842c81dc033ff8f7f8614a81073d99a0c6902770a26053da
+DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
 EBUILD digikam-6.0.0.ebuild 3951 BLAKE2B b7bcf74012b240e5864298c82e18e5f1d3a52f0df16c90896b9d2ba295e396f757f10e3c4a14dd8359086acfde797013d68bcfae57f4105de933d16790d0fd24 SHA512 50c11d1925a65f4d9c307bc1a32fb615176b7c14dd4ec3b30b4080b30f93845b732f725cae2a6fc188ea43982396a44acaf6e4fc64c1f47b95a4070f39ef8913
-EBUILD digikam-6.1.0.ebuild 4175 BLAKE2B 0a961685332a190169cde6f672b4f61cc43192cbeb892b3775f38bad0a3c713efe45d1026ffa55c2a88ec35251aab69dfe7e2f528b1f6108f224db3830c60830 SHA512 3d9de925e7ee5e4b8aca9625a4960223a4c6010a2bfb91bb296d8f3f89d71deab43551a6e9be65e74cc797250a453d410aa4227549990d4bc3e9f2bd0c786e55
+EBUILD digikam-6.2.0.ebuild 4121 BLAKE2B 36f16c7a7168d1bedf989377b4886c94d7660d7f86f79287d688cb29db19c3cb8751beca6d68b4b47006c78b7aaf4623ee32d8a2e16138856de95e5fdbbc188c SHA512 f052bedfdbe74291228db64118db730314ac371dc06efe85485826638c385cf44e438aba9a91532b1f6b132957844ca707378dd4170cf83add81385ea74f8cd6
 MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
diff --git a/media-gfx/digikam/digikam-6.1.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild
index 9ea4daced62d..4478b85ae239 100644
--- a/media-gfx/digikam/digikam-6.1.0.ebuild
+++ b/media-gfx/digikam/digikam-6.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="emake" # keep until CMAKE_MIN_VERSION=3.13.4
+CMAKE_MIN_VERSION=3.14.3
 inherit kde5 toolchain-funcs
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
@@ -20,7 +20,7 @@ DESCRIPTION="Digital photo management application"
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2"
-IUSE="addressbook calendar dnn +imagemagick gphoto2 jpeg2k +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
 
 BDEPEND="
 	sys-devel/gettext
@@ -68,7 +68,6 @@ COMMON_DEPEND="
 	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
 	gphoto2? ( media-libs/libgphoto2:= )
 	imagemagick? ( media-gfx/imagemagick:= )
-	jpeg2k? ( media-libs/jasper:= )
 	lensfun? ( media-libs/lensfun )
 	marble? (
 		$(add_frameworks_dep kbookmarks)
@@ -107,7 +106,10 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test"
 # bug 366505
 
-PATCHES=( "${FILESDIR}/${PN}-6.0.0-cmake.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-googlephoto-upload.patch"
+	"${FILESDIR}/${P}-cmake.patch"
+)
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -123,12 +125,12 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_APPSTYLES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
 		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
 		$(cmake-utils_use_find_package calendar KF5CalendarCore)
 		-DENABLE_FACESENGINE_DNN=$(usex dnn)
 		$(cmake-utils_use_find_package gphoto2 Gphoto2)
 		$(cmake-utils_use_find_package imagemagick ImageMagick)
-		$(cmake-utils_use_find_package jpeg2k Jasper)
 		$(cmake-utils_use_find_package lensfun LensFun)
 		$(cmake-utils_use_find_package marble Marble)
 		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
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
+