diff --git a/gui-apps/organicmaps/files/more-3party.patch b/gui-apps/organicmaps/files/more-3party.patch
index 58ccaf7f0e..e6d9057805 100644
--- a/gui-apps/organicmaps/files/more-3party.patch
+++ b/gui-apps/organicmaps/files/more-3party.patch
@@ -1,46 +1,17 @@
-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
+index 90f917b215..502f5b6fc5 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)
+@@ -86,8 +86,11 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+   endif()
  endif()
  
-+# Add protobuf library.
-+add_subdirectory(protobuf)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(BLAKE3 REQUIRED IMPORTED_TARGET GLOBAL libblake3)
++add_library(BLAKE3::blake3 ALIAS PkgConfig::BLAKE3)
 +
  add_subdirectory(agg)
+-add_subdirectory(BLAKE3/c)
  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
+ add_subdirectory(glaze)
+ add_subdirectory(minizip)
diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
index 27b66f0347..431c88c2c0 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_12 )
+PYTHON_COMPAT=( python3_12 python3_13 python3_14 )
 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
@@ -17,8 +17,15 @@ EGIT_SUBMODULES=(
 	3party/just_gtfs
 	3party/protobuf/protobuf # wait for https://github.com/organicmaps/organicmaps/pull/6310
 	3party/fast_obj
+	
+	3party/glfw
+	3party/minizip-ng
+	3party/glaze
+	3party/BLAKE3
+	3party/imgui/imgui
 )
 
+IUSE="+test"
 DESCRIPTION="Offline maps and navigation using OpenStreetMap data"
 HOMEPAGE="https://organicmaps.app"
 
@@ -29,6 +36,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # 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
@@ -41,11 +49,12 @@ RDEPEND="
 	dev-util/vulkan-headers
 	media-libs/freetype
 	virtual/zlib:=
+	test? ( dev-cpp/gtest )
 	${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/more-3party.patch "${FILESDIR}"/no-dynamic-download.patch )
+PATCHES=( "${FILESDIR}"/more-3party.patch )
 
 WORLD_FEED_TESTS_S="${WORKDIR}/world_feed_integration_tests_data-${PV}"
 
@@ -60,13 +69,15 @@ 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
+	#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
 }