gui-apps/organicmaps: fix compilation

Signed-off-by: Vitaly Zdanevich <[email protected]>

Author: vitaly-zdanevich

gui-apps/organicmaps/files/fix-3party.patch

@@ -0,0 +1,24 @@
+diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
+index d4996e302d..953787945b 100644
+--- a/3party/CMakeLists.txt
++++ b/3party/CMakeLists.txt
+@@ -41,9 +41,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+   # Add pugixml library.
+   add_subdirectory(pugixml)
+ 
+-  # Add protobuf library.
+-  add_subdirectory(protobuf)
+-
+   if (NOT PLATFORM_LINUX)
+     add_subdirectory(freetype)
+     add_subdirectory(icu)
+@@ -55,6 +52,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+   target_include_directories(utf8cpp INTERFACE "${OMIM_ROOT}/3party/utfcpp/source")
+ endif()
+ 
++# Add protobuf library.
++add_subdirectory(protobuf)
++
+ add_subdirectory(agg)
+ add_subdirectory(bsdiff-courgette)
+ add_subdirectory(liboauthcpp)

gui-apps/organicmaps/files/fix-jansson.patch

@@ -0,0 +1,31 @@
+commit 905b161487865a200ce4a43fb2c1d96ecb38e102
+Author: Gerion Entrup <[email protected]>
+Date:   Thu Apr 25 10:14:41 2024 +0200
+
+    CMakeLists: import jansson with pkgconfig
+
+    Upstream jansson offers compiling with autotools and CMake.
+    If it is compiled with autotools (the recommended way) it does only
+    provide a pkgconfig file and not a cmake file.
+    This is also the way most distributions provide jansson, so this commit
+    changes the behavior to use pkgconfig, too.
+
+    Signed-off-by: Gerion Entrup <[email protected]>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1902f0e618..975a402f8a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -320,8 +320,11 @@ if (WITH_SYSTEM_PROVIDED_3PARTY)
+   set(GFLAGS_USE_TARGET_NAMESPACE ON)
+   find_package(gflags REQUIRED)
+
++  find_package(PkgConfig)
++  pkg_check_modules(jansson REQUIRED IMPORTED_TARGET jansson)
++  add_library(jansson::jansson ALIAS PkgConfig::jansson)
++
+   find_package(expat CONFIG REQUIRED)
+-  find_package(jansson CONFIG REQUIRED)
+   find_package(pugixml REQUIRED)
+   find_package(utf8cpp REQUIRED)
+ endif()

gui-apps/organicmaps/files/more-3party.patch

@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{7..13} )
 inherit git-r3 python-r1 xdg cmake
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 # this URL is to make the tests compile since organicmaps usually dynamically clones the repo
@@ -29,6 +29,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # depend on sys-libs/zlib[minizip] when it is not pulled in as subproject anymore
 RDEPEND="
+	>dev-cpp/fast_double_parser-0.7.0
 	dev-cpp/gflags
 	dev-db/sqlite
 	dev-lang/python
@@ -45,7 +46,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/more-3party.patch "${FILESDIR}"/no-dynamic-download.patch )
+PATCHES=( "${FILESDIR}"/fix-jansson.patch  "${FILESDIR}"/fix-3party.patch)
 
 WORLD_FEED_TESTS_S="${WORKDIR}/world_feed_integration_tests_data-${PV}"
 
@@ -57,11 +58,6 @@ src_unpack () {
 }
 
 src_configure() {
-	# organicmaps wants a ./configure.sh execution.
-	# However, this setups mainly stuff for Android and XCode builds that we don't need.
-	# We need just this line here
-	cp private_default.h private.h || die
-
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 	local mycmakeargs=(
 		-DWITH_SYSTEM_PROVIDED_3PARTY=yes