commit: a784005b5d5404423fc1ea0ae1eb08410c2d2f9e Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de> AuthorDate: Sat Mar 22 10:15:55 2025 +0000 Commit: gerion <gerion.entrup <AT> flump <DOT> de> CommitDate: Sat Mar 22 10:15:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=a784005b
gui-apps/organicmaps: fix compilation - There is a new desktop tool dev_sandbox which is disabled for now (due to 3party deps) - Disable tests and additional tools (significantly faster build) Signed-off-by: Gerion Entrup <gerion.entrup <AT> flump.de> gui-apps/organicmaps/Manifest | 4 +- .../fix-integration-of-search_tests_support.patch | 27 ++++++++ .../files/make-DEV_SANDBOX-optional.patch | 75 ++++++++++++++++++++++ gui-apps/organicmaps/organicmaps-9999.ebuild | 5 ++ 4 files changed, 110 insertions(+), 1 deletion(-) diff --git a/gui-apps/organicmaps/Manifest b/gui-apps/organicmaps/Manifest index 7925930..03e6790 100644 --- a/gui-apps/organicmaps/Manifest +++ b/gui-apps/organicmaps/Manifest @@ -1,4 +1,6 @@ AUX fix-3party.patch 700 BLAKE2B ea980cb2a53222eb0e276344e12d30689d1705debbb3b8dd1aa09d49d21edabb4dd7dd57107fde85c19f078ba3e486d150afb7f5c35c63e941af1bb524d4cea3 SHA512 838bf26d3d73eb24b8cf2c5efd833e0dd374be307198a8a890669a2a52444efae17450bf4bfb25556e50c146d6f94fdc983883691ecb65d25191c1647831ccab +AUX fix-integration-of-search_tests_support.patch 712 BLAKE2B b2ea45a6047eb90b614d975289a5264d743399f9c6d319c9ec88b75f09049d9f72d5dcae8a6744944b73c3af7550436bf3ea4c2b15bcb23f8af0dff95b41cd13 SHA512 b7243dd041c725992709f1d75ad251394196d201e509a1177d7db0e20eab83cda842956cb44607a331d32c87873216bafa700c7f7c6155d3b588472416a94408 AUX fix-jansson.patch 1119 BLAKE2B 5988c85b94c919dc9c98bb103e0f3c4e6829463aad9e050e99303874d0198611604a5bb9fe7c69d73a2550a23b063302d216187f520bfa7b58421d195fcce3dd SHA512 a796cdc6066e88b20375246f2c4f4ff8b2d5d510f1f2f56b7e9ff8864f31b158795f603cc15eac880bc5ad444dc8aafb822968292ab4ec1315b45c43bea19824 -EBUILD organicmaps-9999.ebuild 2303 BLAKE2B 0c727309b0d7cfc45415dfcc4fefd191500d45e8d4a7f6ce3ccfb8ebd3c7929a6a344e72dc20158fde43b1c7e4f321c8020826fe8635fd9547cc9e477b692eea SHA512 85d5c6f17bcb7ec808f6af69f1b96fd2e14ff9da8876fbc63d41b9dafe37792bf3b24a4401794cb43afcf8565f8214261a57ba6515d6dd04690d7ff1e9fee8a5 +AUX make-DEV_SANDBOX-optional.patch 2608 BLAKE2B 2177625c0e75d46fe883207fceffb882b7ca951b9f88e54d2c3b57696ecb4dec69dd4c8cfb3d9a7ea46d67eca4dce2368d6ecc90d5f6048fac4469fbfc4916be SHA512 109a7c31021790a10c23a83ac7457b67a2c192cc8f3dbde0240fc4ac89cd4c09506cdfb75eef050aee34bc3a6191420fce7a0eb76f6f73d58f7317feea18d1c3 +EBUILD organicmaps-9999.ebuild 2638 BLAKE2B 0b9e8c08038a8fe0e3d34a23024957327d826dd38f3f6e9dd76736cf44623e78d9049259b0371d9741c642d9b0519428aa33ded9eedbc6c3cc0eadbd7e3163eb SHA512 685a501f8197d579cab1b39f46d12af2e00de9a3376eeae6703d8fe4497371a0833d083f98a064285b7e38f981b1604096844f3edff067489434b56fadb40efa MISC metadata.xml 269 BLAKE2B de28959b3090173e0b4fc0b61b311af4af3c51764f0eb173e71874e684eb8b459a0d8cff52018479b58e0e0e9602f27f715c538c7dda9c055c52e97b8c1b14be SHA512 fa1cf7ea32065ae5b70250aa532b1599b89b695dd8eae7e2aa22ef427036c3b6e56d2ab349963fc39115559b92a817bf198424a41264a86fd4c8cec26746c4f9 diff --git a/gui-apps/organicmaps/files/fix-integration-of-search_tests_support.patch b/gui-apps/organicmaps/files/fix-integration-of-search_tests_support.patch new file mode 100644 index 0000000..5196ad7 --- /dev/null +++ b/gui-apps/organicmaps/files/fix-integration-of-search_tests_support.patch @@ -0,0 +1,27 @@ +From c3340258a7f44fdd635872ea0af9f1ab5f103fb3 Mon Sep 17 00:00:00 2001 +From: Gerion Entrup <[email protected]> +Date: Sat, 22 Mar 2025 11:02:37 +0100 +Subject: [PATCH] fix integration of search_tests_support + +--- + search/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/search/CMakeLists.txt b/search/CMakeLists.txt +index 94da4418a2..00d9819aff 100644 +--- a/search/CMakeLists.txt ++++ b/search/CMakeLists.txt +@@ -180,7 +180,9 @@ target_link_libraries(${PROJECT_NAME} + ) + + if(PLATFORM_DESKTOP) +- add_subdirectory(search_tests_support) ++ if (NOT SKIP_TESTS) ++ add_subdirectory(search_tests_support) ++ endif() + add_subdirectory(search_quality) + endif() + +-- +2.48.1 + diff --git a/gui-apps/organicmaps/files/make-DEV_SANDBOX-optional.patch b/gui-apps/organicmaps/files/make-DEV_SANDBOX-optional.patch new file mode 100644 index 0000000..6552585 --- /dev/null +++ b/gui-apps/organicmaps/files/make-DEV_SANDBOX-optional.patch @@ -0,0 +1,75 @@ +From 8e3e310a909017373bccca403eefd3f1074edcef Mon Sep 17 00:00:00 2001 +From: Gerion Entrup <[email protected]> +Date: Sat, 22 Mar 2025 10:36:31 +0100 +Subject: [PATCH 1/2] make DEV_SANDBOX optional + +--- + 3party/CMakeLists.txt | 28 +++++++++++++++------------- + CMakeLists.txt | 6 +++++- + 2 files changed, 20 insertions(+), 14 deletions(-) + +diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt +index d5635d56fb..0bae31b6c6 100644 +--- a/3party/CMakeLists.txt ++++ b/3party/CMakeLists.txt +@@ -67,18 +67,20 @@ add_subdirectory(vulkan_wrapper) + if (PLATFORM_DESKTOP) + add_subdirectory(libtess2) + +- set(GLFW_BUILD_DOCS OFF CACHE BOOL "") +- set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "") +- set(GLFW_BUILD_TESTS OFF CACHE BOOL "") +- set(GLFW_INSTALL OFF CACHE BOOL "") +- set(GLFW_VULKAN_STATIC OFF CACHE BOOL "") +- set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "") +- # Disable ARC for glfw and re-enable after it because it's globally set in the root CMakeLists.txt +- set(CMAKE_OBJC_FLAGS "") +- add_subdirectory(glfw) +- set_target_properties(glfw PROPERTIES UNITY_BUILD OFF) +- set_target_properties(glfw PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO) +- set(CMAKE_OBJC_FLAGS -fobjc-arc) ++ if (DEV_SANDBOX) ++ set(GLFW_BUILD_DOCS OFF CACHE BOOL "") ++ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "") ++ set(GLFW_BUILD_TESTS OFF CACHE BOOL "") ++ set(GLFW_INSTALL OFF CACHE BOOL "") ++ set(GLFW_VULKAN_STATIC OFF CACHE BOOL "") ++ set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "") ++ # Disable ARC for glfw and re-enable after it because it's globally set in the root CMakeLists.txt ++ set(CMAKE_OBJC_FLAGS "") ++ add_subdirectory(glfw) ++ set_target_properties(glfw PROPERTIES UNITY_BUILD OFF) ++ set_target_properties(glfw PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO) ++ set(CMAKE_OBJC_FLAGS -fobjc-arc) + +- add_subdirectory(imgui) ++ add_subdirectory(imgui) ++ endif() + endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 40a056580b..4582362ac9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -103,6 +103,8 @@ if(${PLATFORM_MAC}) + endif() + endif() + ++option(DEV_SANDBOX "Enable compilation of the developer sandbox when on desktop (not QT based)" ON) ++ + # Sanitizer + if (PLATFORM_DESKTOP) + # https://clang.llvm.org/docs/UsersManual.html#controlling-code-generation +@@ -397,7 +399,9 @@ if (PLATFORM_DESKTOP) + add_subdirectory(qt) + omim_add_tool_subdirectory(skin_generator) + endif() +- add_subdirectory(dev_sandbox) ++ if (DEV_SANDBOX) ++ add_subdirectory(dev_sandbox) ++ endif() + endif() + + omim_add_test_subdirectory(qt_tstfrm) +-- +2.48.1 + diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild index 22a9dfa..2a83c0a 100644 --- a/gui-apps/organicmaps/organicmaps-9999.ebuild +++ b/gui-apps/organicmaps/organicmaps-9999.ebuild @@ -51,6 +51,8 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/fix-3party.patch # upstream PR #6310 "${FILESDIR}"/fix-jansson.patch # upstream PR #7982 + "${FILESDIR}"/make-DEV_SANDBOX-optional.patch + "${FILESDIR}"/fix-integration-of-search_tests_support.patch ) WORLD_FEED_TESTS_S="${WORKDIR}/world_feed_integration_tests_data-${PV}" @@ -66,6 +68,9 @@ src_configure() { CMAKE_BUILD_TYPE="RelWithDebInfo" local mycmakeargs=( -DWITH_SYSTEM_PROVIDED_3PARTY=yes + -DDEV_SANDBOX=off # TODO: uses a bunch of other dependencies, package and enable it with a use flag + -DSKIP_TOOLS=yes # TODO: mostly tests, enable with use flag + -DSKIP_TESTS=yes # TODO: mostly tests, enable with use flag -DBUILD_SHARED_LIBS=off -DTEST_DATA_REPO_URL="${WORLD_FEED_TESTS_S}" )
