gentoo resync : 16.09.2021

4 files changed, 86 insertions, 4 deletions

diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index 1c6f6ca9e1e0..5d45b2ad73bf 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,6 +1,7 @@
+AUX kexi-3.2.0-fix-find-marble.patch 2537 BLAKE2B a78cbaa2edcdc8f424c366b9d8dcdf930db685155bff343828bc8c4c18993ba86a64025893aa0e1505d3955e4fcc836f8eb7f87a8640f786177c08c1ff47739a SHA512 4a579862f9941163d47e7bd5e7cd36f35419499e34381627963149b9e5a9ab82d6c673651e5303f68c5be1a733e7315b51711e6fe45841175a11eee3a1d5af02
 AUX kexi-3.2.0-glib-2.68.patch 1223 BLAKE2B 354fbb183b30bf678eb0b896fee5ae607bf873b915245a9765738b2ef07bf4fd1838c869287de365d544aec25bbce97f2a4320a620e1e49d36d4f9320f14c624 SHA512 e9a75f4f7aaf93fc1bc6d08705d1e3389b5e24611aa5f903c033ad55824ac912f1d6cb31674c2af8c097b91e4007c7b62de82305f061be447f119004ccce98bc
 AUX kexi-3.2.0-missing-header.patch 739 BLAKE2B da09cf24f4852222040112a7774bd5d0463f85d52d52c352b453f4d0502085a0faa67ae3ae8fd44102c2fa3b8840525929e53c9ad1a05acfb5c23747cdbb6d91 SHA512 14779c27e47d7e3c0f3f8de917deae8fed7b38673bcc5ec53fa0ca7c89c354a3601af80c6fe17ab3231f633852c47c0dcd2858834cee79a961fc3d02a1043fa1
 AUX kexi-3.2.0-postgresql-9.12.patch 1094 BLAKE2B ac9ba4ff8f5c29ae8ebdcfa6820ed8663aa0f13a9fb55f4eff85265fa3d76a3e33e6c1000400a7a21721e9f45ba58006dbb97c312fd4b96f9d0e9e49dfd88690 SHA512 cfde38090e163ff441477c7f8262629589c9ab49c2687eefe7e0a107f4d70fd447cc35e1031612a6ce970e3b3ec3b9394f13e6e2876c29614cb43ba0b9fc9fbd
 DIST kexi-3.2.0.tar.xz 3624956 BLAKE2B 8d0b3712f07d13f606c4c0d714b3d4ea0fe9f56e4d4a3aeeb144ffda56cd5ef89e4f08d5660550364103c86acd60923ddc74fcea135a23fffbae87853a7c00f4 SHA512 5cb9e0747c8e7ea19020b62345571ba10f65278dcc718bb0772827721bf8812d0ffee3c35d53b57285884c66e0406520835c7b00789fbe5459717722dff13e93
-EBUILD kexi-3.2.0-r1.ebuild 2601 BLAKE2B 5ae522733df3d337adeece30f5a52cec7982c8eb52234ecd50edbd56556ff879f08252b7908b8567e86fb6c4832a0f068001f2c8efe704dc124989f987d862b8 SHA512 c8b25e537ac32f3d8969b915aaac413d035ec8847cc493c709e033847b5028f709140e1b2fb0d428bb4f47df1d07690e7bc13421731f204acc2e956eeab145dd
-MISC metadata.xml 668 BLAKE2B de1fddea1f4630354862fe895c1b81765e7b6c6b5de86f199addc709fefd3b0255b4683ee681e4b893a95e2b0d4c11977e31c26392af866b6c48dee930280464 SHA512 751a1a2fdff0bf80023431950aad42e49ef3b3dc9a9de291590f542dbfcabd0232a4c3a7ff76be9f4c8d1ebd97f3defc063d8318fc128309fbaabce5eb73f2ad
+EBUILD kexi-3.2.0-r1.ebuild 2652 BLAKE2B 060e32dc624c379239e5a81d583680f1b0eeb56a9f64eb98956067e3fd0cceafee2e31802140ebe91c246bc362ef9f0bde5820fdc7f0e0ddb6db4abf08945ae7 SHA512 fdda26265e612cbed8fb9c100c037d9ea7c1865623c56baf7f3fa86354420c6d420494e1985ff22c3aa8b3fbedf74b07fe884d7ee874625bda7ad96b8677c067
+MISC metadata.xml 669 BLAKE2B ecf2f08c0dd3c05e493d5c53a9d0c611597ff726bee44a5a866281f87c6582a950622df802b0c4fba0dcf2b9d45cb3731554f118e6f68acc47e6602b254f5a5a SHA512 3ed78fb68314239b786e5905fd776fa27573a2c7a19f3e3f28c81ad39df873415b4f0d9283bf2a3293410702cdca5876897f2020e385a9bcc3a98e6f37d91cb6
diff --git a/app-office/kexi/files/kexi-3.2.0-fix-find-marble.patch b/app-office/kexi/files/kexi-3.2.0-fix-find-marble.patch
new file mode 100644
index 000000000000..74716a2c37f3
--- /dev/null
+++ b/app-office/kexi/files/kexi-3.2.0-fix-find-marble.patch
@@ -0,0 +1,80 @@
+From 3280c5ec9940f329dc75b2b8d9a52285b20209f0 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
+Date: Wed, 5 May 2021 00:09:49 +0200
+Subject: [PATCH] Use plain Marble package instead of KexiMarble
+
+Marble has shipped with a MarbleConfig.cmake file since ~2016. Kexi
+already depends on KF5 versions that are much newer than that.
+
+* asturm 2021-09-14: Backported to 3.2.0.
+  - s/KEXI/Kexi/ in set_package_properties(Marble ...) to fix patch context
+  - partially merging d09be29f56b94d6a522fa30a5b661926baca973c (drop MARBLE_MIN_VERSION)
+
+---
+ CMakeLists.txt                                |   8 +-
+ src/plugins/forms/widgets/CMakeLists.txt      |   2 +-
+ .../forms/widgets/mapbrowser/CMakeLists.txt   |   3 +-
+ 3 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 97c58fa10..548b2708f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -196,17 +196,14 @@ endif()
+ ##
+ ## Test for marble
+ ##
+-set(MARBLE_MIN_VERSION "0.19.2")
+-find_package(KexiMarble ${MARBLE_MIN_VERSION})
+-set_package_properties(KexiMarble PROPERTIES
++find_package(Marble CONFIG)
++set_package_properties(Marble PROPERTIES
+     DESCRIPTION "KDE World Globe Widget library"
+     URL "https://marble.kde.org"
+     TYPE RECOMMENDED
+     PURPOSE "Required by Kexi form map widget"
+ )
+-if(NOT MARBLE_FOUND)
+-    set(MARBLE_INCLUDE_DIR "")
+-else()
++if(Marble_FOUND)
+     set(HAVE_MARBLE TRUE)
+ endif()
+ set_package_properties(GLIB2 PROPERTIES TYPE RECOMMENDED PURPOSE "${_REQUIRED_BY_MDB}")
+diff --git a/src/plugins/forms/widgets/CMakeLists.txt b/src/plugins/forms/widgets/CMakeLists.txt
+index 107d578a8..109341fe0 100644
+--- a/src/plugins/forms/widgets/CMakeLists.txt
++++ b/src/plugins/forms/widgets/CMakeLists.txt
+@@ -11,7 +11,7 @@ endmacro()
+ # the main widgets plugin
+ add_subdirectory(main)
+ 
+-if(MARBLE_FOUND)
++if(Marble_FOUND)
+ #TODO  add_subdirectory(mapbrowser)
+ endif()
+ 
+diff --git a/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt b/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt
+--- a/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt
++++ b/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ include_directories(
+     ${CMAKE_SOURCE_DIR}/src/formeditor
+     ${CMAKE_SOURCE_DIR}/src/core
+-    ${MARBLE_INCLUDE_DIR}
+ )
+ 
+ set(kexiforms_mapwidgetplugin_SRCS
+@@ -20,8 +19,8 @@ target_link_libraries(kexiforms_mapwidgetplugin
+     kexiextendedwidgets
+     kexiformutils
+     kexidataviewcommon
+-    ${MARBLE_LIBRARIES}
+ 
++    Marble
+     Qt5::Xml
+ )
+ 
+-- 
+GitLab
+
diff --git a/app-office/kexi/kexi-3.2.0-r1.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild
index 73ce61cd4464..89fe7316eccd 100644
--- a/app-office/kexi/kexi-3.2.0-r1.ebuild
+++ b/app-office/kexi/kexi-3.2.0-r1.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-missing-header.patch
 	"${FILESDIR}"/${P}-postgresql-9.12.patch
 	"${FILESDIR}"/${P}-glib-2.68.patch # bug 784974
+	"${FILESDIR}"/${P}-fix-find-marble.patch # bug 812392
 )
 
 src_prepare() {
@@ -84,7 +85,7 @@ src_configure() {
 		-DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
 		-DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
 		-DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
-		$(cmake_use_find_package marble KexiMarble)
+		$(cmake_use_find_package marble Marble)
 		$(cmake_use_find_package mdb GLIB2)
 		$(cmake_use_find_package mysql MySQL)
 		$(cmake_use_find_package postgres PostgreSQL)
diff --git a/app-office/kexi/metadata.xml b/app-office/kexi/metadata.xml
index 7cb965ff067d..e1ee5c33cbb2 100644
--- a/app-office/kexi/metadata.xml
+++ b/app-office/kexi/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>