commit: 3b0590d53e9d2aa2ebc3d0a805576a827083d547
Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
AuthorDate: Fri Mar 7 22:16:50 2025 +0000
Commit: gerion <gerion.entrup <AT> flump <DOT> de>
CommitDate: Fri Mar 7 22:16:50 2025 +0000
URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=3b0590d5
gui-apps/organicmaps: update
- fix 3party patch
- no init step required anymore
- fix test data deletion
Signed-off-by: Gerion Entrup <gerion.entrup <AT> flump.de>
gui-apps/organicmaps/Manifest | 4 ++--
gui-apps/organicmaps/files/fix-3party.patch | 8 ++++----
gui-apps/organicmaps/organicmaps-9999.ebuild | 13 ++++---------
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/gui-apps/organicmaps/Manifest b/gui-apps/organicmaps/Manifest
index b8a847b..7925930 100644
--- a/gui-apps/organicmaps/Manifest
+++ b/gui-apps/organicmaps/Manifest
@@ -1,4 +1,4 @@
-AUX fix-3party.patch 704 BLAKE2B
be92ac6d473c1712ae3978e06af8a80451821af8bbe8cf5ebe31ba87022735173f164a19f46ec1d4557ad5f68fd0a5375e87e7fc858853dd9e013891ce588ae0
SHA512
ba2e9ea92651e50ec885b649568fb2668c46d742d5231a26515e5a3c5ba8e24a3cf00803e563b6a363f479e628a5752906bb0dec52b6cdb7474e465215c7aae4
+AUX fix-3party.patch 700 BLAKE2B
ea980cb2a53222eb0e276344e12d30689d1705debbb3b8dd1aa09d49d21edabb4dd7dd57107fde85c19f078ba3e486d150afb7f5c35c63e941af1bb524d4cea3
SHA512
838bf26d3d73eb24b8cf2c5efd833e0dd374be307198a8a890669a2a52444efae17450bf4bfb25556e50c146d6f94fdc983883691ecb65d25191c1647831ccab
AUX fix-jansson.patch 1119 BLAKE2B
5988c85b94c919dc9c98bb103e0f3c4e6829463aad9e050e99303874d0198611604a5bb9fe7c69d73a2550a23b063302d216187f520bfa7b58421d195fcce3dd
SHA512
a796cdc6066e88b20375246f2c4f4ff8b2d5d510f1f2f56b7e9ff8864f31b158795f603cc15eac880bc5ad444dc8aafb822968292ab4ec1315b45c43bea19824
-EBUILD organicmaps-9999.ebuild 2443 BLAKE2B
31dcff21e5ca6145d612b7043d681fe4d609454f5938b76060fab0f4d5b9f749c8337213a4e6d35e51429a8f52ea3a9bef714ef5ddb109295c956dd6eba4c5dc
SHA512
e03fc6fe2974ba4696cfbf443dc9d0ffa5944b7b64ef9c95d94dd849fbe9b9d81e8840c85b92ff3e9a9bd913a80346b74bdfafd0d980a1ac481843ade0e2c495
+EBUILD organicmaps-9999.ebuild 2303 BLAKE2B
0c727309b0d7cfc45415dfcc4fefd191500d45e8d4a7f6ce3ccfb8ebd3c7929a6a344e72dc20158fde43b1c7e4f321c8020826fe8635fd9547cc9e477b692eea
SHA512
85d5c6f17bcb7ec808f6af69f1b96fd2e14ff9da8876fbc63d41b9dafe37792bf3b24a4401794cb43afcf8565f8214261a57ba6515d6dd04690d7ff1e9fee8a5
MISC metadata.xml 269 BLAKE2B
de28959b3090173e0b4fc0b61b311af4af3c51764f0eb173e71874e684eb8b459a0d8cff52018479b58e0e0e9602f27f715c538c7dda9c055c52e97b8c1b14be
SHA512
fa1cf7ea32065ae5b70250aa532b1599b89b695dd8eae7e2aa22ef427036c3b6e56d2ab349963fc39115559b92a817bf198424a41264a86fd4c8cec26746c4f9
diff --git a/gui-apps/organicmaps/files/fix-3party.patch
b/gui-apps/organicmaps/files/fix-3party.patch
index 9117f64..fa4d6a1 100644
--- a/gui-apps/organicmaps/files/fix-3party.patch
+++ b/gui-apps/organicmaps/files/fix-3party.patch
@@ -1,8 +1,8 @@
diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
-index d4996e302d..953787945b 100644
+index 57d0592dc3..264d7738d4 100644
--- a/3party/CMakeLists.txt
+++ b/3party/CMakeLists.txt
-@@ -41,9 +41,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+@@ -40,9 +40,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
# Add pugixml library.
add_subdirectory(pugixml)
@@ -12,7 +12,7 @@ index d4996e302d..953787945b 100644
if (NOT PLATFORM_LINUX)
add_subdirectory(freetype)
add_subdirectory(icu)
-@@ -55,6 +52,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+@@ -54,6 +51,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
target_include_directories(utf8cpp INTERFACE
"${OMIM_ROOT}/3party/utfcpp/source")
endif()
@@ -21,4 +21,4 @@ index d4996e302d..953787945b 100644
+
add_subdirectory(agg)
add_subdirectory(bsdiff-courgette)
- add_subdirectory(liboauthcpp)
+ add_subdirectory(minizip)
diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild
b/gui-apps/organicmaps/organicmaps-9999.ebuild
index 5c4fe93..22a9dfa 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{7..12} )
+PYTHON_COMPAT=( python3_{11..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
@@ -12,9 +12,9 @@
EGIT_WORLD_FEED_REPO_URI="https://github.com/${PN}/world_feed_integration_tests_
# organicmaps gets more and more system libraries, we use as many
# as currently possible, use submodules for the rest
EGIT_SUBMODULES=(
- 3party/just_gtfs
+ 3party/just_gtfs # header contains #include 3party/just_gtfs
3party/protobuf/protobuf # wait for
https://github.com/organicmaps/organicmaps/pull/6310
- 3party/fast_obj
+ 3party/fast_obj # header contains #include 3party/fast_obj
)
DESCRIPTION="Offline maps and navigation using OpenStreetMap data"
@@ -63,11 +63,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
@@ -81,7 +76,7 @@ src_install() {
cmake_src_install
# Remove test data
- rm -rf "${ED}"/usr/share/${PN}/data/world_feed_integration_tests_data
|| die
+ rm -rf "${ED}"/usr/share/${PN}/data/test_data || die
}
pkg_postinst() {
