gentoo resync : 21.06.2020

3 files changed, 53 insertions, 4 deletions

diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index a3a63262388a..6f929a52d5ab 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,6 @@
+AUX marble-20.04.2-missing-dep.patch 1418 BLAKE2B bcca0c09e82d43aaad47935e41115d46c3d03254f6b252f1ef39be8d1b92d8b162da69741bfab0681eb0411543bbb55674482463e59a16d4d03cc33731b64677 SHA512 3afb8de9ccbef619512628bc12a73cbc5d0a2050c6db09a3177c1880734b033ad3b42fc4c4ce6f0f54a782fdbc71717d23c80b91f39732093f597b5dd88fd18c
 DIST marble-19.12.3.tar.xz 52306988 BLAKE2B 728b731b066c8fbec442059dbbe5697d610218b7733f365a655462f05d49f84497c6e7c4425929d2972201680d6b705f6a77652953cba937f55218d430a5bc1f SHA512 e6b693b15be53f590bbfbd97648113bad696339544350640699e890bc4f891c4a06215ee09f21cf4968dc8d2cb104c06f43380470145397fc5abc7daa0e02639
-DIST marble-20.04.1.tar.xz 52197400 BLAKE2B 33bc482ecda8d831a7f9912039587a3bd02440d71754005df295d47f51667bc5b42913e44e4593cb922459068cf4768fb62c0235e64f475157e377303e914d01 SHA512 4eb9bd5df71f0ad9d15309e43a7d12856e382bab4eecf7050451776e7fb97307b664ffe70f5c96fc589df33a1be884c68f0ed8717010545e699e3d4fb16b098f
+DIST marble-20.04.2.tar.xz 52206460 BLAKE2B ad7f9a30a8c75b4978fa5f015c9bc38a6bd16c95f4f92a9fb73f5f0126cf11a4b985aafd249052aa141365c498549db2265f50a894b4b8a95944394340cbcf75 SHA512 44a0a6ad7aa77452482d86ffc88083ed1adc187b1ecb34dd5d5c211e6a692019cfa06579647a7943c423fdc911300e0efb8352de95da84ce9c27aeb4f1365b55
 EBUILD marble-19.12.3.ebuild 2650 BLAKE2B 74ea18fbbc9a91e4ace3fc87be077d3b76e8e3086df78878e978dfdaf947b1b189593d0c147fd60fdda7e36a85cd5f255c69122dd77ee8071c0453a428072b77 SHA512 cfaa829d737ed2a6bac80cf46b650bf253735bfecda213249fc239a11d0fdeb9759fcbdc452f49bf769a41961d6efb0486723c4f817d74810dace0e83e5808eb
-EBUILD marble-20.04.1.ebuild 2653 BLAKE2B 2507aecef80f71e58bd4563a3a26e2235d0a1655dee869186a9dcab954457f433329d55bc1d1f4fed851c3c0938bfdfe9c792bfe88a4fda2fbba9a19534abe5a SHA512 670bdb263d15b5cd93e6cf2b7700c0f5dfa742839ab01c7df22026c29cfc8973fed78f764b618502782e72fd3970c85a970d08dcf43b89d9455092bcde89447f
+EBUILD marble-20.04.2-r1.ebuild 2741 BLAKE2B 4329de8269d99c2679f884c617bead47f6ab5f1462bc4834a55e9c556c13b1d492a4d94041c0d92da1366fefb98d8eaf90d94f76dd1f094ed4820012dac57ce4 SHA512 1cd23a12aa0849ba464a846f6cc399e6c8bf2513fba2bd347bf33b961bbd3d2ec2fb6a0881aa57fc82f92c6e0ce2fe1290234b89ec9187720aff528709a2b2b4
 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/files/marble-20.04.2-missing-dep.patch b/kde-apps/marble/files/marble-20.04.2-missing-dep.patch
new file mode 100644
index 000000000000..f4f71bdf1ccb
--- /dev/null
+++ b/kde-apps/marble/files/marble-20.04.2-missing-dep.patch
@@ -0,0 +1,43 @@
+From c062504a2864680fee9c81ea46e7613315de038a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Jun 2020 11:24:32 +0200
+Subject: [PATCH] Add missing Qt5WebChannel dependency
+
+QWebChannel header is used in src/lib/marble/MarbleLegendBrowser.cpp
+since commit b42ee5c8 but apparently not always implicitly included.
+
+Downstream report: https://bugs.gentoo.org/728234
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                | 1 +
+ src/lib/marble/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 631a5b7d7..a3b2139dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -126,6 +126,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android)
+ 
+    set ( MARBLE_NO_WEBKITWIDGETS TRUE )
+ else()
++    find_package(Qt5WebChannel ${REQUIRED_QT_VERSION})
+     find_package(Qt5WebEngine ${REQUIRED_QT_VERSION})
+     find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION})
+ 
+diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
+index e02c7d160..7d27be94b 100644
+--- a/src/lib/marble/CMakeLists.txt
++++ b/src/lib/marble/CMakeLists.txt
+@@ -395,6 +395,7 @@ target_link_libraries(marblewidget
+ if (NOT MARBLE_NO_WEBKITWIDGETS)
+     target_link_libraries(marblewidget
+         LINK_PUBLIC
++            Qt5::WebChannel
+             Qt5::WebEngineWidgets
+             Qt5::WebEngine
+     )
+-- 
+2.27.0
+
diff --git a/kde-apps/marble/marble-20.04.1.ebuild b/kde-apps/marble/marble-20.04.2-r1.ebuild
index 98dfaa6d9129..1e9c7aff9dbe 100644
--- a/kde-apps/marble/marble-20.04.1.ebuild
+++ b/kde-apps/marble/marble-20.04.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
 ECM_TEST="forceoptional"
 KFMIN=5.70.0
-QTMIN=5.12.3
+QTMIN=5.14.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -54,13 +54,18 @@ DEPEND="
 	)
 	phonon? ( media-libs/phonon[qt5(+)] )
 	shapefile? ( sci-libs/shapelib:= )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+	webengine? (
+		>=dev-qt/qtwebchannel-${QTMIN}:5
+		>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	)
 "
 RDEPEND="${DEPEND}"
 
 # bug 588320
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-missing-dep.patch" )
+
 src_prepare() {
 	ecm_src_prepare