aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui-apps/organicmaps/Manifest3
-rw-r--r--gui-apps/organicmaps/files/more-3party.patch47
-rw-r--r--gui-apps/organicmaps/files/no-dynamic-download.patch15
-rw-r--r--gui-apps/organicmaps/organicmaps-9999.ebuild74
-rw-r--r--sets/ara2
-rw-r--r--sets/vim-dev2
6 files changed, 2 insertions, 141 deletions
diff --git a/gui-apps/organicmaps/Manifest b/gui-apps/organicmaps/Manifest
deleted file mode 100644
index 7eb2d40..0000000
--- a/gui-apps/organicmaps/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX more-3party.patch 1385 BLAKE2B 87b5f151b3923f6324192741e243d095898d024c320add5318015b2e7058f9614ec278386250d98f41febd153f8ff9a1a9cd0e868ad94ca7c0bb449e90462378 SHA512 6e2778874fb6b58f76f99cfbb925881c569c0b25c3b9f7f9d5e7017a476eb4e28b251a36d57c9849b4ccd8c5e63023aa9552dabfc29423a385d1051a65dc8150
-AUX no-dynamic-download.patch 772 BLAKE2B 8b29d12cd648625540e379c7aab2d081b12860822ffb37af362355ad7dece4b0e886eaa6a769ebef3a988f2a2c7b3cdf804f9ec61f70615f4802a1bef0b1e72b SHA512 c4dc8a82e78ba314ae9a1972e72ac1a176c3368307044ab6d975b6f10a8b96f0c385b5c596379608ed92927be20307453729136eec8141efecf3c2bc369867e6
-EBUILD organicmaps-9999.ebuild 2005 BLAKE2B 8c23c2e686b81ce8583939b338a7a2c8a616a3673f9d306db9ffe1e83eda085767f46d9e09bcf0878ad3755bc11d279c11fec80772c115a699880935b02a8c38 SHA512 d5d0827260f03098102fced7e8282d6202973865cc7e2edc97fc10acbd833ba5c2106cc39ca822c4ca108cacc9b627e3d49980e4fcda811cea21ee7ac60d9e24
diff --git a/gui-apps/organicmaps/files/more-3party.patch b/gui-apps/organicmaps/files/more-3party.patch
deleted file mode 100644
index b1293e8..0000000
--- a/gui-apps/organicmaps/files/more-3party.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index eb7d021..0000000
--- a/gui-apps/organicmaps/files/no-dynamic-download.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index fcfd194..0000000
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-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"
-
-# depend on sys-libs/zlib[minizip] when it is not pulled in as subproject anymore
-RDEPEND="
- dev-cpp/gflags
- dev-cpp/gtest
- dev-db/sqlite
- dev-lang/python
- 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
-"
-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"
-}
diff --git a/sets/ara b/sets/ara
index bd8ce1c..e1afdc2 100644
--- a/sets/ara
+++ b/sets/ara
@@ -1,5 +1,5 @@
dev-python/cython
-dev-util/meson
+dev-build/meson
dev-libs/boost
dev-python/graph-tool
dev-python/pydot
diff --git a/sets/vim-dev b/sets/vim-dev
index 1594fc0..6cba848 100644
--- a/sets/vim-dev
+++ b/sets/vim-dev
@@ -3,7 +3,7 @@ dev-lua/StyLua
dev-python/debugpy
dev-python/python-lsp-server
dev-tex/texlab
-dev-util/lldb
+dev-debug/lldb
app-text/ltex-ls
dev-util/lua-language-server
# not possible to express || dev-lang/rust[rust-analyzer] dev-lang/rust-bin[rust-analyzer]