gui-apps/organicmaps: fix compilation

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>

Author: vitaly-zdanevich

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

@@ -0,0 +1,31 @@
+commit 905b161487865a200ce4a43fb2c1d96ecb38e102
+Author: Gerion Entrup <gerion.entrup@flump.de>
+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 <gerion.entrup@flump.de>
+
+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

@@ -0,0 +1,42 @@
+diff --git i/3party/CMakeLists.txt w/3party/CMakeLists.txt
+index dd851d7db2..1b4e3ed3c8 100644
+--- i/3party/CMakeLists.txt
++++ w/3party/CMakeLists.txt
+@@ -34,34 +34,34 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+ 
+   # Add gflags library.
+   set(GFLAGS_BUILD_TESTING OFF)
+   set(GFLAGS_BUILD_PACKAGING OFF)
+   add_subdirectory(gflags)
+   target_compile_options(gflags_nothreads_static PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Wno-subobject-linkage>)
+ 
+   # Add pugixml library.
+   add_subdirectory(pugixml)
+ 
+-  # Add protobuf library.
+-  add_subdirectory(protobuf)
+-
+   if (NOT PLATFORM_LINUX)
+     add_subdirectory(freetype)
+     add_subdirectory(icu)
+     add_subdirectory(harfbuzz)
+   endif()
+ 
+   add_library(utf8cpp INTERFACE)
+   add_library(utf8cpp::utf8cpp ALIAS utf8cpp)
+   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(glaze)
+ add_subdirectory(minizip)
+ add_subdirectory(open-location-code)
+ add_subdirectory(opening_hours)
+ add_subdirectory(stb_image)
+ add_subdirectory(succinct)
+ 
+ add_subdirectory(vulkan_wrapper)

gui-apps/organicmaps/files/no-dynamic-download.patch

@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,12 +114,12 @@
+   find_program(LLD_FOUND ld.lld)
+   if (LLD_FOUND)
+     message(STATUS "Using ld.lld linker")
+-    set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=lld")
++    string(APPEND CMAKE_EXE_LINKER_FLAGS " -fuse-ld=lld")
+   else()
+     find_program(GOLD_FOUND ld.gold)
+     if (GOLD_FOUND)
+       message(STATUS "Using ld.gold")
+-      set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=gold")
++      string(APPEND CMAKE_EXE_LINKER_FLAGS " -fuse-ld=gold")
+     endif()
+   endif()
+ endif()

gui-apps/organicmaps/files/protobuf.patch

@@ -1,78 +1,110 @@
-# 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} )
-inherit git-r3 python-r1 xdg cmake
+PYTHON_COMPAT=( python3_{11..14} )
+inherit git-r3 python-any-r1 xdg cmake desktop
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-# this URL is to make the tests compile since organicmaps usually dynamically clones the repo
-# maybe a better way would be to skip the test
+
 EGIT_WORLD_FEED_REPO_URI="https://github.com/${PN}/world_feed_integration_tests_data.git"
+
 # organicmaps gets more and more system libraries, we use as many
 # as currently possible, use submodules for the rest
 EGIT_SUBMODULES=(
+	3party/fast_obj
+	3party/glaze
+	3party/glfw
 	3party/harfbuzz/harfbuzz
-	3party/fast_double_parser
+	3party/imgui/imgui
 	3party/just_gtfs
 	3party/protobuf/protobuf # wait for https://github.com/organicmaps/organicmaps/pull/6310
-	3party/fast_obj
 )
 
 DESCRIPTION="Offline maps and navigation using OpenStreetMap data"
 HOMEPAGE="https://organicmaps.app"
 
 LICENSE="Apache-2.0"
+
 SLOT="0"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/vulkan-headers
+	dev-cpp/fast_double_parser
+	${PYTHON_DEPS}
+	test? ( dev-cpp/gtest )
+"
 
 # depend on sys-libs/zlib[minizip] when it is not pulled in as subproject anymore
 RDEPEND="
-	dev-cpp/gflags
-	dev-db/sqlite
-	dev-lang/python
-	dev-libs/boost
-	dev-libs/icu
-	dev-libs/jansson
+	dev-cpp/gflags:=
+	dev-db/sqlite:=
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/jansson:=
+	dev-libs/pugixml
 	dev-libs/utfcpp
-	dev-qt/qtpositioning:6
-	dev-qt/qtsvg:6
-	dev-util/vulkan-headers
-	media-libs/freetype
-	sys-libs/zlib
-	${PYTHON_DEPS}
+	dev-qt/qtbase:=[gui,network,opengl,widgets]
+	dev-qt/qtpositioning:=
+	dev-qt/qtsvg:=
+	media-libs/freetype:=
+	sys-libs/zlib:=
 "
-DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/more-3party.patch "${FILESDIR}"/no-dynamic-download.patch )
+DEPEND="media-libs/glm"
+
+PATCHES=( "${FILESDIR}"/fix-jansson.patch "${FILESDIR}"/protobuf.patch "${FILESDIR}"/respect-ldflags.patch )
 
 WORLD_FEED_TESTS_S="${WORKDIR}/world_feed_integration_tests_data-${PV}"
 
 src_unpack () {
 	git-r3_fetch
 	git-r3_checkout
-	git-r3_fetch "${EGIT_WORLD_FEED_REPO_URI}"
-	git-r3_checkout "${EGIT_WORLD_FEED_REPO_URI}" "${WORLD_FEED_TESTS_S}"
+
+	if use test; then
+		git-r3_fetch "${EGIT_WORLD_FEED_REPO_URI}"
+		git-r3_checkout "${EGIT_WORLD_FEED_REPO_URI}" "${WORLD_FEED_TESTS_S}"
+	fi
 }
 
 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
 		-DBUILD_SHARED_LIBS=off
-		-DTEST_DATA_REPO_URL="${WORLD_FEED_TESTS_S}"
+		-DTEST_DATA_REPO_URL="$(usex test "${WORLD_FEED_TESTS_S}" "")"
+		-DSKIP_TESTS="$(usex !test)"
 	)
 	cmake_src_configure
 }
 
+src_compile() {
+	cmake_src_compile desktop
+	use test && cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/OMaps
+
+	insinto /usr/share/organicmaps
+	doins -r data
+
+	insinto /usr/share/metainfo
+	doins packaging/app.organicmaps.desktop.metainfo.xml
+	domenu qt/res/linux/app.organicmaps.desktop.desktop
+	newicon -s 512 qt/res/logo.png organicmaps.png
+
+	rm -rf "${ED}"/usr/share/${PN}/data/world_feed_integration_tests_data || die
+}
+
 pkg_postinst() {
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 
 	einfo "For dark  mode type in search ?dark"
 	einfo "For light mode type in search ?light"