[gentoo-commits] repo/proj/guru:master commit in: gui-apps/organicmaps/

[gentoo-commits] repo/proj/guru:master commit in: gui-apps/organicmaps/

[Andrew Ammerlaan]

commit:     aa763bb2108ffd6ba30c1081013350df04349887
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 10:55:31 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 10:55:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aa763bb2

gui-apps/organicmaps: cmake-utils --> cmake, inherit xdg

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 gui-apps/organicmaps/Manifest                |  2 --
 gui-apps/organicmaps/organicmaps-9999.ebuild | 11 +++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gui-apps/organicmaps/Manifest b/gui-apps/organicmaps/Manifest
deleted file mode 100644
index 401d1c228..000000000
--- a/gui-apps/organicmaps/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-AUX organicmaps-9999-zlib-compile.patch 291 BLAKE2B 627e0897134993fab63357dbaf59e16ca26fc180edfc0e05aefe557fa32d666ecdb6ad5a168b4564f2b9ef9a3b32200552faf0521594ce17a501b9b884b3b506 SHA512 a52c2a0068f929154a7c31479531db66c545328e2c069fe62cf8b3a41cc0eaf501a4885128d11be30a1037006f67b879015adcf4b126b0a13e316bffb5971e75
-EBUILD organicmaps-9999.ebuild 693 BLAKE2B a7a70da1baa43091bbfe47d6c49059a8f5cfc52e48abe3962a7f7fa141ed2301e6e3dbc31061f7f34791acfeb178c3603bbcfc607f47bfe27480d2d7fa2034b3 SHA512 94cc54583b77be1dbf54c421263c1580b05dd1dd166fa867d9e20c3f98bdafa9140581a212b47e617f8def08f8d2f0c2eb5de6137374b4e3b5427bb1bb464fa2

diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
index 473859fe4..966fe58a2 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -1,6 +1,6 @@
 EAPI=7
 
-inherit git-r3 cmake-utils
+inherit git-r3 cmake xdg
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 DESCRIPTION="Offline maps and navigation using OpenStreetMap data"
@@ -21,10 +21,9 @@ DEPEND="sys-devel/clang
 	sys-libs/zlib[minizip]"
 RDEPEND=""
 
-src_prepare() {
-	eapply "${FILESDIR}/${P}-zlib-compile.patch"
-	cmake-utils_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}/${P}-zlib-compile.patch"
+)
 
 src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
@@ -35,7 +34,7 @@ src_configure() {
 
 	echo | ./configure.sh
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {

[gentoo-commits] repo/proj/guru:master commit in: gui-apps/organicmaps/

[Andrew Ammerlaan]

commit:     8cf6d8072d5c683564532c62707af8b06db5fefb
Author:     Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
AuthorDate: Sun Jul 10 16:18:06 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 16:19:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8cf6d807

gui-apps/organicmaps: fix "cmake_src_prepare has not been run", collide
with gtest

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

 gui-apps/organicmaps/organicmaps-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
index 966fe58a2..7b630f645 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -1,6 +1,6 @@
 EAPI=7
 
-inherit git-r3 cmake xdg
+inherit git-r3 xdg cmake
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 DESCRIPTION="Offline maps and navigation using OpenStreetMap data"
@@ -30,6 +30,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=False
+		-DINSTALL_GTEST=off
 	)
 
 	echo | ./configure.sh

[gentoo-commits] repo/proj/guru:master commit in: gui-apps/organicmaps/

[Viorel Munteanu]

commit:     8d135ff021b928be35627f8558b0c171f748cde7
Author:     Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
AuthorDate: Fri Dec  1 13:48:51 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 13:48:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8d135ff0

gui-apps/organicmaps: deps add dev-qt/qtpositioning

According to https://github.com/organicmaps/organicmaps/issues/2217#issuecomment-1795009888

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

 gui-apps/organicmaps/organicmaps-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
index 9344c03803..14646725b8 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -16,6 +16,7 @@ DEPEND="sys-devel/clang
 	dev-libs/icu
 	sys-libs/libstdc++-v3
 	dev-qt/qtcore
+	dev-qt/qtpositioning
 	dev-qt/qtsvg
 	dev-db/sqlite
 	sys-libs/zlib[minizip]"

[gentoo-commits] repo/proj/guru:master commit in: gui-apps/organicmaps/

[David Roman]

commit:     c20cd587b45dacd5f4ac191d393c816f655589f1
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Fri Dec 15 12:37:26 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Dec 15 12:37:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c20cd587

gui-apps/organicmaps: update EAPI 7 -> 8

Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/guru/pull/79

 gui-apps/organicmaps/organicmaps-9999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
index 14646725b8..c6ffa31784 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -1,4 +1,7 @@
-EAPI=7
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
 
 inherit git-r3 xdg cmake
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -10,8 +13,6 @@ 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
 	sys-libs/libstdc++-v3
@@ -20,7 +21,6 @@ DEPEND="sys-devel/clang
 	dev-qt/qtsvg
 	dev-db/sqlite
 	sys-libs/zlib[minizip]"
-RDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}/${P}-zlib-compile.patch"

[gentoo-commits] repo/proj/guru:master commit in: gui-apps/organicmaps/

[David Roman]

commit:     067c94eedb7e9b252ea095a5c852e9ae8716c8e7
Author:     Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
AuthorDate: Wed Dec 27 06:42:33 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Dec 27 06:42:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=067c94ee

gui-apps/organicmaps: add missing deps

Thanks to https://github.com/organicmaps/organicmaps/issues/2217#issuecomment-1869818042

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

 gui-apps/organicmaps/organicmaps-9999.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
index c8e77c24e4..7b65f462d0 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -31,6 +31,8 @@ RDEPEND="
 	dev-lang/python
 	dev-libs/boost
 	dev-libs/icu
+	dev-libs/jansson
+	dev-libs/utfcpp
 	dev-qt/qtpositioning:6
 	dev-util/vulkan-headers
 	media-libs/freetype

[gentoo-commits] repo/proj/guru:master commit in: gui-apps/organicmaps/

[David Roman]

commit:     c28b22a2d76d4882584c9dafe5a8a8ddf4fd15fc
Author:     Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
AuthorDate: Thu Jan 25 04:16:16 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jan 25 04:16:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c28b22a2

gui-apps/organicmaps: deps add dev-qt/qtsvg:6

According to https://github.com/organicmaps/organicmaps/issues/2217#issuecomment-1908724957

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

 gui-apps/organicmaps/organicmaps-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
index 7b65f462d0..b7caf2424e 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	dev-libs/jansson
 	dev-libs/utfcpp
 	dev-qt/qtpositioning:6
+	dev-qt/qtsvg:6
 	dev-util/vulkan-headers
 	media-libs/freetype
 	sys-libs/zlib

[gentoo-commits] repo/proj/guru:master commit in: gui-apps/organicmaps/

[David Roman]

commit:     edb3532fa9a7736051cbc0c7c66e0facb6aa54d7
Author:     Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
AuthorDate: Thu Jan 25 04:48:03 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jan 25 04:48:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=edb3532f

gui-apps/organicmaps: fix warnings about Python

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

 gui-apps/organicmaps/organicmaps-9999.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
index 176525a3a6..50acbe360c 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit git-r3 xdg cmake
+PYTHON_COMPAT=( python3_{7..12} )
+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
 # maybe a better way would be to skip the test
@@ -24,6 +25,8 @@ HOMEPAGE="https://organicmaps.app"
 LICENSE="Apache-2.0"
 SLOT="0"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 # depend on sys-libs/zlib[minizip] when it is not pulled in as subproject anymore
 RDEPEND="
 	dev-cpp/gflags
@@ -38,6 +41,7 @@ RDEPEND="
 	dev-util/vulkan-headers
 	media-libs/freetype
 	sys-libs/zlib
+	${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 

[gentoo-commits] repo/proj/guru:master commit in: gui-apps/organicmaps/

[David Roman]

commit:     592979c6fa921c327f65201e670e8493c45d9a8e
Author:     Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
AuthorDate: Thu Jan 25 04:17:54 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jan 25 04:17:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=592979c6

gui-apps/organicmaps: spaces to tab in one line

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

 gui-apps/organicmaps/organicmaps-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
index b7caf2424e..176525a3a6 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -46,7 +46,7 @@ PATCHES=( "${FILESDIR}"/more-3party.patch "${FILESDIR}"/no-dynamic-download.patc
 WORLD_FEED_TESTS_S="${WORKDIR}/world_feed_integration_tests_data-${PV}"
 
 src_unpack () {
-    git-r3_fetch
+	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}"