gentoo auto-resync : 01:07:2024 - 08:00:50

3 files changed, 87 insertions, 1 deletions

diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index bfcd3fecd94a..31f59998f49e 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,5 +1,6 @@
+AUX kosmindoormap-24.05.1-cmake.patch 2566 BLAKE2B 0002710f3130df5b5e0c61489ec86a73ba4b422a2bf2e1ac2bf39aacefeb14342baa7748cd562016bf93cf57a7805242660bbadd6fd5db38d9778c3f131e54d0 SHA512 e24f5b4d0705818d23632a43ef95fdc813bec4f00a44eb92b5cc53496d9319efb8f7972b06cba0c375ae3bccd79563f2ac182511f4fb425314c4812e12bbab14
 DIST kosmindoormap-23.08.5.tar.xz 384948 BLAKE2B 0936fe42b0c370dc0c57d475aa771784c75e8350e2d563140c027d047514840f99d6697e36fde027da11e22a92239b6403cf1b18a37aa8e09a3f8814cb6931c8 SHA512 9128cccbd56f51b1e8ad7f7151db0de8952a8348fb74afe3eefeb085979b26d95d1699f260d744c4f3ea5d815109f998829625db480194a8539e782e8c32537c
 DIST kosmindoormap-24.05.1.tar.xz 645860 BLAKE2B 73e7e8bf2511e59c06d43f9264ec0733bc10e7cce338174ce5b52f64fdb27b198ccfe10d3722e155367830489577e36691bd2cb861f53725e2cf45434e514d16 SHA512 ab96b13ba9f5ffb9fb7dae1bc4803dcc95525214fe54058634a0c3063dff5191831b1778ac6c758c860e84c923f9e14d1d3edeeacb6b309aab170c608503bb2e
 EBUILD kosmindoormap-23.08.5.ebuild 1065 BLAKE2B 63fa69636fc24a5f6d9c81fd8751f1932ad96dd88e5b26a77c47d95bda6cd181f25e061ff215b36231979873c580f46e8e4141cf98d17920f52acf2cbc685fa4 SHA512 6932f6c69a5536aca67470eaab9b2a36a274f906a7d5f3934077211696d18d5677185d7308d6c9c893fa549c29e4a56adc3d3e27770ec15ccdfceb16db57ec03
-EBUILD kosmindoormap-24.05.1.ebuild 1081 BLAKE2B 791d6e29f5c3253cf6e22a64f35d0fac281e7321b055fa6ad5dd27ffb8da1dd1f308da83cc4f3ff578cff29f4110725652a5fc36e723341afe30cc91d9330881 SHA512 72ddec12fe76f2f83e39804307cf2d69fcf3d022f621a05e2924f363c3efc726948552b06ed365252811c2b83eb9b99a6c1a9d4cec49c4f9ffb2d0f94f4de088
+EBUILD kosmindoormap-24.05.1.ebuild 1203 BLAKE2B 5692f8c9869430a5e9048af07468ae5fd02d0f1b13b4d2782db5b7638b0efe431dfe9bcbd1d5692133a86e1265946770c4aee7fdb97aff0db491b2f76aa99e22 SHA512 4a6b99c337de97f0e9ca42f2a72f1d6d5633337e0ca4b83766cb184cc76b053402f303db777c944f223d110dbe564fb31c48a4c2013370925ae7b3c80348e56a
 MISC metadata.xml 503 BLAKE2B f01510925e1ee73762bc7568ecf8667e428d454329426253875917175fbbc3311490b7639c3113d0826f2cdecb8abb2aa7020de159e7a8cdfc93bd74a0503023 SHA512 63ece480304c55a91352b8f9029ceffa9a5a0d28a4c6b4ae8cb8c0ff5973b834a884d425e9139b446fc7e4d823c57a653bc7eae6549c121b62f94472dfd6bbc3
diff --git a/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch b/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch
new file mode 100644
index 000000000000..77d51d1da9be
--- /dev/null
+++ b/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch
@@ -0,0 +1,82 @@
+From 88cdec4c0bc40f4e98105a0b69c968fdd94ac7f4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 30 Jun 2024 23:17:00 +0200
+Subject: [PATCH 1/3] Fix/simplify BUILD_STANDALONE_APP decisionmaking
+
+BUILD_STANDALONE_APP=ON guarantees Qt::Widgets so no need for this check.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 79f07df..cdd99e1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -10,7 +10,7 @@ if (TARGET Qt::Quick)
+     add_subdirectory(map-quick)
+     add_subdirectory(map-publictransport-integration)
+ endif()
+-if ((NOT ANDROID AND TARGET Qt::Widgets) OR BUILD_STANDALONE_APP)
++if (BUILD_STANDALONE_APP)
+     add_subdirectory(app)
+ endif()
+ if (NOT CROSS_COMPILING)
+-- 
+2.45.2
+
+
+From 09d0bda83e6de957ad8883926d8b9f9b3adfe762 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 30 Jun 2024 23:23:22 +0200
+Subject: [PATCH 2/3] Use more QT_MIN_VERSION
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bbf417f..6da25de 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,7 +54,7 @@ if (NOT BUILD_TOOLS_ONLY)
+ endif()
+ 
+ if (BUILD_TESTING)
+-    find_package(Qt6 6.5 REQUIRED COMPONENTS Test Widgets)
++    find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Test Widgets)
+ endif()
+ 
+ if (BUILD_STANDALONE_APP)
+-- 
+2.45.2
+
+
+From 74c3516e698a4fc53e45585a5846a170a8f25e2f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 30 Jun 2024 23:25:46 +0200
+Subject: [PATCH 3/3] Add missing KF6I18n dependency for BUILD_STANDALONE_APP
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6da25de..dd55077 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -61,7 +61,7 @@ if (BUILD_STANDALONE_APP)
+     if (NOT ANDROID)
+         find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Widgets)
+     else()
+-        find_package(KF6 REQUIRED COMPONENTS Kirigami2)
++        find_package(KF6 6.3 REQUIRED COMPONENTS I18n Kirigami)
+         find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS QuickControls2 Svg)
+         find_package(OpenSSL REQUIRED)
+         if (NOT DEFINED BREEZEICONS_DIR AND EXISTS ${CMAKE_SOURCE_DIR}/../breeze-icons)
+-- 
+2.45.2
+
diff --git a/dev-libs/kosmindoormap/kosmindoormap-24.05.1.ebuild b/dev-libs/kosmindoormap/kosmindoormap-24.05.1.ebuild
index 5c6de80c8c36..0e69029f54fc 100644
--- a/dev-libs/kosmindoormap/kosmindoormap-24.05.1.ebuild
+++ b/dev-libs/kosmindoormap/kosmindoormap-24.05.1.ebuild
@@ -39,6 +39,9 @@ BDEPEND="
 	app-alternatives/yacc
 "
 
+# Pending: https://invent.kde.org/libraries/kosmindoormap/-/merge_requests/40
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TOOLS_ONLY=$(usex !gui)