gui-apps/organicmaps: new (non-live) ebuild

Signed-off-by: Adam Pimentel <adam.pimentel@protonmail.com>
This commit is contained in:
Adam Pimentel
2026-07-05 23:27:15 -04:00
parent b17c57afbd
commit 3eb417aa1c
3 changed files with 179 additions and 0 deletions

View File

@@ -1 +1,3 @@
DIST organicmaps-2026.06.24.16-fast_obj-d620667f10a548dee94dbc8c144bb22f79162176.tar.gz 29932 BLAKE2B bb631fe5ec8243d1f86678026916dac25847af9f3273d0aba4dc266e2f7c48b26c563eb7ac83ac707a35356ac3bd31c150bf1bd243a7c1b2b77bec5d27884bcf SHA512 a24920f2574ded1471ff96070f6a82e98b7437b036de67ec03d8e46a0aa75e1be82cae1daf4b5582d1198ca2750761a5450bd5c0a5e461bdf4625ff5d7291572
DIST organicmaps-2026.06.24.16-just_gtfs-7516753825500f90ac2de6f18c256d5abec1ff33.tar.gz 16181 BLAKE2B 64ca9f94fc7aa0d9aac6faebf8b7c281af910d6969da04c24f117f4b48061916bdf49d9e6d19668551476638a5a0723b4b0802944b23eb45249b9598f087632d SHA512 b1095b4cf0e5268c49344a9d64a5d805b5b2923657dd1bde72e5a097453b83b3cfdac3e8c032ec492da57c39700ea3f2e0ad53a4ddf4f23244fe8564776378a8
DIST organicmaps-2026.06.24.16.tar.gz 224108349 BLAKE2B 69d81f721c994234a1c8c994480e76a7d80f8604ef316a65c1c5833bfa6e2e0d98b6b0d3a5788741898fd3fdd4771fb0977c0055702b2099206c0d6489227750 SHA512 cc03bf8bce7a9fd2acaa0811bb2756822a8f309a3cd7872142d7cb5ba3c584363a50b66564b62a2fa6e70853b1a787758fb150c9dcdfde1f99ef1919e90fbdfe

View File

@@ -0,0 +1,95 @@
diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
index 0160603c82..0c1a7cea7c 100644
--- a/3party/CMakeLists.txt
+++ b/3party/CMakeLists.txt
@@ -43,10 +43,18 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
target_include_directories(utf8cpp SYSTEM INTERFACE "${OMIM_ROOT}/3party/utfcpp/source")
endif()
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(BLAKE3 REQUIRED IMPORTED_TARGET GLOBAL libblake3)
+add_library(BLAKE3::blake3 ALIAS PkgConfig::BLAKE3)
+
+find_package(glaze CONFIG REQUIRED)
+set_target_properties(glaze::glaze PROPERTIES IMPORTED_GLOBAL TRUE)
+if (NOT TARGET glaze::glaze)
+ add_library(glaze::glaze ALIAS glaze)
+endif()
+
add_subdirectory(agg)
-add_subdirectory(BLAKE3/c)
add_subdirectory(bsdiff-courgette)
-add_subdirectory(glaze)
add_subdirectory(minizip)
add_subdirectory(open-location-code)
add_subdirectory(opening_hours)
@@ -57,19 +65,4 @@ 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)
-
- add_subdirectory(imgui)
endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d32429e298..7e82299617 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,7 +226,7 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter)
add_subdirectory(libs)
if (PLATFORM_DESKTOP)
- add_subdirectory(dev_sandbox)
+ #add_subdirectory(dev_sandbox)
add_subdirectory(generator)
add_subdirectory(tools)
if (NOT SKIP_QT_GUI)
diff --git a/libs/coding/blake3.hpp b/libs/coding/blake3.hpp
index d56caa1871..cb81705bd1 100644
--- a/libs/coding/blake3.hpp
+++ b/libs/coding/blake3.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include "3party/BLAKE3/c/blake3.h"
+#include <blake3.h>
#include <array>
#include <cstddef>
diff --git a/libs/search/search_quality/CMakeLists.txt b/libs/search/search_quality/CMakeLists.txt
index 376310e14e..a7b80dec23 100644
--- a/libs/search/search_quality/CMakeLists.txt
+++ b/libs/search/search_quality/CMakeLists.txt
@@ -19,12 +19,12 @@ target_link_libraries(${PROJECT_NAME}
indexer
)
-if (NOT SKIP_QT_GUI)
- omim_add_tool_subdirectory(assessment_tool)
+if (BUILD_TESTING)
+ if (NOT SKIP_QT_GUI)
+ omim_add_tool_subdirectory(assessment_tool)
+ endif()
+ omim_add_tool_subdirectory(features_collector_tool)
+ omim_add_tool_subdirectory(samples_generation_tool)
+ omim_add_tool_subdirectory(search_quality_tool)
+ omim_add_test_subdirectory(search_quality_tests)
endif()
-
-omim_add_tool_subdirectory(features_collector_tool)
-omim_add_tool_subdirectory(samples_generation_tool)
-omim_add_tool_subdirectory(search_quality_tool)
-
-omim_add_test_subdirectory(search_quality_tests)

View File

@@ -0,0 +1,82 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_12 python3_13 python3_14 )
inherit python-r1 xdg cmake
JUST_GTFS_COMMIT="7516753825500f90ac2de6f18c256d5abec1ff33"
FAST_OBJ_COMMIT="d620667f10a548dee94dbc8c144bb22f79162176"
IUSE="test"
DESCRIPTION="A privacy-first offline maps & GPS app for hiking, cycling, biking, and driving."
HOMEPAGE="https://organicmaps.app"
SLOT="0"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
MY_PV="${PV%.*}-${PV##*.}-android"
SRC_URI="
https://github.com/${PN}/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz
https://github.com/mapsme/just_gtfs/archive/${JUST_GTFS_COMMIT}.tar.gz -> ${P}-just_gtfs-${JUST_GTFS_COMMIT}.tar.gz
https://github.com/thisistherk/fast_obj/archive/${FAST_OBJ_COMMIT}.tar.gz -> ${P}-fast_obj-${FAST_OBJ_COMMIT}.tar.gz
"
LICENSE="Apache-2.0"
# depend on virtual/zlib:=[minizip] when it is not pulled in as subproject anymore
RDEPEND="
dev-libs/blake3
dev-cpp/gflags
dev-db/sqlite
dev-lang/python
dev-libs/boost
dev-libs/icu
dev-libs/jansson
dev-libs/utfcpp
dev-qt/qtpositioning:6
dev-qt/qtsvg:6
dev-util/vulkan-headers
media-libs/freetype
>=dev-cpp/glaze-6.5.1
virtual/zlib:=
test? ( dev-cpp/gtest )
${PYTHON_DEPS}
"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${PN}-${MY_PV}"
PATCHES=( "${FILESDIR}"/more-3party-2026.06.24-16.patch )
WORLD_FEED_TESTS_S="${WORKDIR}/world_feed_integration_tests_data-${PV}"
src_prepare() {
cmake_src_prepare
rmdir "${S}/3party/just_gtfs" "${S}/3party/fast_obj" 2>/dev/null
cp -r "${WORKDIR}/just_gtfs-${JUST_GTFS_COMMIT}" "${S}/3party/just_gtfs" || die
cp -r "${WORKDIR}/fast_obj-${FAST_OBJ_COMMIT}" "${S}/3party/fast_obj" || die
}
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}"
-DBUILD_TESTING=$(usex test)
-DPLATFORM_DESKTOP=ON
)
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"
}