[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/organicmaps/files/, gui-apps/organicmaps/

[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/organicmaps/files/, gui-apps/organicmaps/

[Vitaly Zdanevich]

commit:     ce9bc345bc6192da5a9c64a407d12dfb5eae18e3
Author:     Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
AuthorDate: Wed Dec 20 06:20:17 2023 +0000
Commit:     Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
CommitDate: Wed Dec 20 06:20:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ce9bc345

gui-apps/organicmaps: remove patch, target to desktop, drop tests

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly <AT> ya.ru>

 .../organicmaps/files/organicmaps-9999-zlib-compile.patch    | 10 ----------
 gui-apps/organicmaps/organicmaps-9999.ebuild                 | 12 +++++++-----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/gui-apps/organicmaps/files/organicmaps-9999-zlib-compile.patch b/gui-apps/organicmaps/files/organicmaps-9999-zlib-compile.patch
deleted file mode 100644
index 953dd01247..0000000000
--- a/gui-apps/organicmaps/files/organicmaps-9999-zlib-compile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- git/3party/minizip/CMakeLists.txt   2022-06-07 12:52:32.337814533 +0200
-+++ organicmaps/3party/minizip/CMakeLists.txt   2022-05-31 13:38:50.604235282 +0200
-@@ -15,6 +15,7 @@
- 
- target_compile_definitions(${PROJECT_NAME}
-   PUBLIC
-+    OF=_Z_OF
-     USE_FILE32API
-   PRIVATE
-     NOCRYPT

diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
index c6ffa31784..9245663115 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -13,18 +13,17 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 DEPEND="sys-devel/clang
+	>=dev-util/cmake-3.18.1
+	dev-util/ninja
 	media-libs/freetype
 	dev-libs/icu
+	>=dev-qt/qtpositioning-6
 	sys-libs/libstdc++-v3
 	dev-qt/qtcore
-	dev-qt/qtpositioning
 	dev-qt/qtsvg
 	dev-db/sqlite
 	sys-libs/zlib[minizip]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-zlib-compile.patch"
-)
+RDEPEND=""
 
 src_prepare() {
 	eapply_user
@@ -38,6 +37,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=False
 		-DINSTALL_GTEST=off
+		-DUNITY_DISABLE=on
+		-DPLATFORM_DESKTOP=true
+		-DSKIP_TESTS=on
 	)
 
 	echo | ./configure.sh