[gentoo-commits] repo/gentoo:master commit in: dev-libs/kosmindoormap/files/, dev-libs/kosmindoormap/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/kosmindoormap/files/, dev-libs/kosmindoormap/

[Andreas Sturmlechner]

commit:     e1b78fe7fbe91f171bf2ff36af6b345913ca80e0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 19:27:41 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 19:35:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b78fe7

dev-libs/kosmindoormap: Fix build against >=dev-libs/protobuf-23.3

Bug: https://bugs.gentoo.org/909081
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kosmindoormap-23.04.3-protobuf-23-1.patch      | 31 +++++++++++++++++++
 .../kosmindoormap-23.04.3-protobuf-23-2.patch      | 35 ++++++++++++++++++++++
 .../kosmindoormap/kosmindoormap-23.04.3.ebuild     |  2 ++
 3 files changed, 68 insertions(+)

diff --git a/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-1.patch b/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-1.patch
new file mode 100644
index 000000000000..427abde08a81
--- /dev/null
+++ b/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-1.patch
@@ -0,0 +1,31 @@
+From eac8c57528b5ef8e694df4072ed7a60be799c270 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 5 Jul 2023 16:16:02 +0200
+Subject: [PATCH] Use protobuf's cmake config if available
+
+---
+ CMakeLists.txt | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 466c9add..da9881cd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,7 +73,13 @@ find_package(BISON REQUIRED)
+ set_package_properties(BISON PROPERTIES PURPOSE "MapCSS parser for indoor map rendering.")
+ 
+ if (NOT WIN32)
+-    find_package(Protobuf)
++    # try upstream cmake config first
++    set(protobuf_MODULE_COMPATIBLE ON)
++    find_package(Protobuf CONFIG)
++    if(NOT Protobuf_FOUND)
++    # fall back to cmake's protobuf module
++       find_package(Protobuf)
++    endif()
+     set_package_properties(Protobuf PROPERTIES TYPE OPTIONAL PURPOSE "Parsing of OSM PBF files.")
+ endif()
+ 
+-- 
+GitLab
+

diff --git a/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-2.patch b/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-2.patch
new file mode 100644
index 000000000000..965a8a9d82de
--- /dev/null
+++ b/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-2.patch
@@ -0,0 +1,35 @@
+From 6dfceab2bacef67ea27b4d1045100b6e0d2be430 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 5 Jul 2023 14:00:29 +0200
+Subject: [PATCH] Use protobuf cmake targets instead of variables
+
+Makes it compatible with protobuf's upstream cmake config, which is required for protobuf>=22 as the cmake provided module is broken with it.
+---
+ src/osm/io/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/osm/io/CMakeLists.txt b/src/osm/io/CMakeLists.txt
+index bf1d02c9..ec95f7e5 100644
+--- a/src/osm/io/CMakeLists.txt
++++ b/src/osm/io/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # SPDX-FileCopyrightText: 2020-2022 Volker Krause <vkrause@kde.org>
+ # SPDX-License-Identifier: BSD-2-Clause
+ 
+-if (Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE)
++if (Protobuf_FOUND AND TARGET protobuf::protoc)
+     PROTOBUF_GENERATE_CPP(pbf_srcs pbf_hdrs
+         ../pbf/fileformat.proto
+         ../pbf/osmformat.proto
+@@ -19,7 +19,7 @@ if (Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE)
+     set_target_properties(KOSM_pbfioplugin PROPERTIES POSITION_INDEPENDENT_CODE ON)
+     target_link_libraries(KOSM_pbfioplugin
+         PUBLIC KOSM
+-        PRIVATE ${Protobuf_LIBRARIES} ZLIB::ZLIB
++        PRIVATE protobuf::libprotobuf ZLIB::ZLIB
+     )
+ endif()
+ 
+-- 
+GitLab
+

diff --git a/dev-libs/kosmindoormap/kosmindoormap-23.04.3.ebuild b/dev-libs/kosmindoormap/kosmindoormap-23.04.3.ebuild
index 7d84056f235e..a6f7915d7011 100644
--- a/dev-libs/kosmindoormap/kosmindoormap-23.04.3.ebuild
+++ b/dev-libs/kosmindoormap/kosmindoormap-23.04.3.ebuild
@@ -38,6 +38,8 @@ BDEPEND="
 	sys-devel/flex
 "
 
+PATCHES=( "${FILESDIR}"/${P}-protobuf-23-{1,2}.patch ) # bug 909081, in 23.08.0
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it

[gentoo-commits] repo/gentoo:master commit in: dev-libs/kosmindoormap/files/, dev-libs/kosmindoormap/

[Andreas Sturmlechner]

commit:     94c4ffc04a3db04235218cc802bae6bf6dc08b77
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 21:39:30 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 21:40:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c4ffc0

dev-libs/kosmindoormap: Make sure IUSE=-gui builds

Pending upstream MR:
https://invent.kde.org/libraries/kosmindoormap/-/merge_requests/40

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kosmindoormap-24.05.1-cmake.patch        | 82 ++++++++++++++++++++++
 .../kosmindoormap/kosmindoormap-24.05.1.ebuild     |  3 +
 2 files changed, 85 insertions(+)

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)