* [gentoo-commits] repo/user/gerislay:master commit in: gui-apps/organicmaps/, gui-apps/organicmaps/files/
@ 2023-12-23 0:34 gerion
0 siblings, 0 replies; 2+ messages in thread
From: gerion @ 2023-12-23 0:34 UTC (permalink / raw
To: gentoo-commits
commit: 030a9a9ce6cf205e47d43d603708c9e0b6185240
Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
AuthorDate: Sat Dec 23 00:29:16 2023 +0000
Commit: gerion <gerion.entrup <AT> flump <DOT> de>
CommitDate: Sat Dec 23 00:29:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=030a9a9c
gui-apps/organicmaps: add working version
Oriented on the guru version with additional patches.
Signed-off-by: Gerion Entrup <gerion.entrup <AT> flump.de>
gui-apps/organicmaps/Manifest | 3 +
gui-apps/organicmaps/files/more-3party.patch | 47 ++++++++++++++++
.../organicmaps/files/no-dynamic-download.patch | 15 +++++
gui-apps/organicmaps/organicmaps-9999.ebuild | 65 ++++++++++++++++++++++
4 files changed, 130 insertions(+)
diff --git a/gui-apps/organicmaps/Manifest b/gui-apps/organicmaps/Manifest
new file mode 100644
index 0000000..52b869e
--- /dev/null
+++ b/gui-apps/organicmaps/Manifest
@@ -0,0 +1,3 @@
+AUX more-3party.patch 1385 BLAKE2B 87b5f151b3923f6324192741e243d095898d024c320add5318015b2e7058f9614ec278386250d98f41febd153f8ff9a1a9cd0e868ad94ca7c0bb449e90462378 SHA512 6e2778874fb6b58f76f99cfbb925881c569c0b25c3b9f7f9d5e7017a476eb4e28b251a36d57c9849b4ccd8c5e63023aa9552dabfc29423a385d1051a65dc8150
+AUX no-dynamic-download.patch 772 BLAKE2B 8b29d12cd648625540e379c7aab2d081b12860822ffb37af362355ad7dece4b0e886eaa6a769ebef3a988f2a2c7b3cdf804f9ec61f70615f4802a1bef0b1e72b SHA512 c4dc8a82e78ba314ae9a1972e72ac1a176c3368307044ab6d975b6f10a8b96f0c385b5c596379608ed92927be20307453729136eec8141efecf3c2bc369867e6
+EBUILD organicmaps-9999.ebuild 1788 BLAKE2B a27c907bcffa3b504bbe545c9de3600625b4c4b32a7ef556fb478e4a6cfb18c62360ac59fd36071c0e813aa980d1c1ed434a4d73ea23f6fa3f7ce3265a346fbd SHA512 0f2785bf5865c6ab8195f6343b6987151c9ab67c5b0dae11feda503cb7ec868b1dc64db40a5d0306d4d3042414a44376da735a812a8ed82c12bbe9c99043acc9
diff --git a/gui-apps/organicmaps/files/more-3party.patch b/gui-apps/organicmaps/files/more-3party.patch
new file mode 100644
index 0000000..b1293e8
--- /dev/null
+++ b/gui-apps/organicmaps/files/more-3party.patch
@@ -0,0 +1,47 @@
+From b77c26e242945fe06be94059b87c3c2eebdb78eb Mon Sep 17 00:00:00 2001
+From: Gerion Entrup <gerion.entrup@flump.de>
+Date: Fri, 8 Dec 2023 23:45:56 +0100
+Subject: [PATCH] cmake: use some internal libraries without external
+ alternative
+
+---
+ 3party/CMakeLists.txt | 6 +++---
+ base/CMakeLists.txt | 4 +---
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
+index bd44e1b7b8..4f5cb99807 100644
+--- a/3party/CMakeLists.txt
++++ b/3party/CMakeLists.txt
+@@ -34,11 +34,11 @@ else()
+
+ # Add pugixml library.
+ add_subdirectory(pugixml)
+-
+- # Add protobuf library.
+- add_subdirectory(protobuf)
+ endif()
+
++# Add protobuf library.
++add_subdirectory(protobuf)
++
+ add_subdirectory(agg)
+ add_subdirectory(bsdiff-courgette)
+
+diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
+index 7e762b242a..0d7d6c5d10 100644
+--- a/base/CMakeLists.txt
++++ b/base/CMakeLists.txt
+@@ -111,8 +111,6 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
+ target_link_libraries(${PROJECT_NAME} INTERFACE Threads::Threads)
+
+-if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+- target_include_directories(${PROJECT_NAME} PRIVATE "${OMIM_ROOT}/3party/fast_double_parser/include")
+-endif()
++target_include_directories(${PROJECT_NAME} PRIVATE "${OMIM_ROOT}/3party/fast_double_parser/include")
+
+ omim_add_test_subdirectory(base_tests)
+--
+2.41.0
+
diff --git a/gui-apps/organicmaps/files/no-dynamic-download.patch b/gui-apps/organicmaps/files/no-dynamic-download.patch
new file mode 100644
index 0000000..eb7d021
--- /dev/null
+++ b/gui-apps/organicmaps/files/no-dynamic-download.patch
@@ -0,0 +1,15 @@
+diff --git a/transit/world_feed/world_feed_integration_tests/CMakeLists.txt b/transit/world_feed/world_feed_integration_tests/CMakeLists.txt
+index 9f945568d4..ec9755ab09 100644
+--- a/transit/world_feed/world_feed_integration_tests/CMakeLists.txt
++++ b/transit/world_feed/world_feed_integration_tests/CMakeLists.txt
+@@ -10,7 +10,9 @@ target_link_libraries(${PROJECT_NAME}
+ )
+
+ # This test requires additional data from the other repository
+-set(TEST_DATA_REPO_URL "https://github.com/organicmaps/world_feed_integration_tests_data.git")
++if(NOT TEST_DATA_REPO_URL)
++ set(TEST_DATA_REPO_URL "https://github.com/organicmaps/world_feed_integration_tests_data.git")
++endif()
+ set(DESTINATION_FOLDER "${OMIM_DATA_DIR}/world_feed_integration_tests_data/")
+
+ add_custom_command(
diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
new file mode 100644
index 0000000..3e58685
--- /dev/null
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -0,0 +1,65 @@
+EAPI=8
+
+inherit git-r3 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
+# 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/harfbuzz/harfbuzz
+ 3party/fast_double_parser
+ 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"
+
+RDEPEND="
+ dev-lang/python
+ dev-qt/qtpositioning:6
+ dev-cpp/gflags
+ dev-util/vulkan-headers
+ dev-libs/boost
+ dev-libs/icu
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/more-3party.patch "${FILESDIR}"/no-dynamic-download.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}"
+}
+
+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}"
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+
+ einfo "For dark mode type in search ?dark"
+ einfo "For light mode type in search ?light"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/user/gerislay:master commit in: gui-apps/organicmaps/, gui-apps/organicmaps/files/
@ 2025-03-07 22:18 gerion
0 siblings, 0 replies; 2+ messages in thread
From: gerion @ 2025-03-07 22:18 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-07 22:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-07 22:18 [gentoo-commits] repo/user/gerislay:master commit in: gui-apps/organicmaps/, gui-apps/organicmaps/files/ gerion
-- strict thread matches above, loose matches on Subject: below --
2023-12-23 0:34 gerion
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox