commit: fc8df273ff2053be4286db1533ea3ea1ec45d676 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Apr 10 08:59:32 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Apr 10 09:25:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc8df273
sci-geosciences/merkaartor: 0.18.4 version bump Closes: https://bugs.gentoo.org/716894 Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-geosciences/merkaartor/Manifest | 1 + sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild | 2 +- ...aartor-0.18.3-r4.ebuild => merkaartor-0.18.4.ebuild} | 17 ++++++----------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest index 6a49ca07d56..3c1ea402a81 100644 --- a/sci-geosciences/merkaartor/Manifest +++ b/sci-geosciences/merkaartor/Manifest @@ -1 +1,2 @@ DIST merkaartor-0.18.3.tar.gz 7104234 BLAKE2B e7d84297452ad20daf2ab18c4aef3736758d98e6f839be1152651aa0196ccee2983d89935f121d4436245d7fdd1fa6b97cd99e6a154158cad4751eba02819a74 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915 +DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild index 6eed24c6150..4bb8c0e5e1e 100644 --- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild +++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild @@ -32,7 +32,7 @@ DEPEND=" sci-libs/proj sys-libs/zlib exif? ( media-gfx/exiv2:= ) - gps? ( >=sci-geosciences/gpsd-3.17-r2 ) + gps? ( >=sci-geosciences/gpsd-3.17-r2:= ) libproxy? ( net-libs/libproxy ) webengine? ( dev-qt/qtwebengine:5[widgets] ) " diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild similarity index 86% copy from sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild copy to sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild index 6eed24c6150..e5d0a17a126 100644 --- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild +++ b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,13 +23,14 @@ DEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - sci-libs/gdal - sci-libs/proj + sci-libs/gdal:= + sci-libs/proj:= sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-3.17-r2 ) @@ -38,12 +39,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826 - "${FILESDIR}"/${P}-desktopfile.patch - "${FILESDIR}"/${P}-webengine{1,2,3}.patch - "${FILESDIR}"/${P}-exiv2-0.27.1.patch # bug 689098 -) +PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826 DOCS=( AUTHORS CHANGELOG ) @@ -67,7 +63,7 @@ src_prepare() { } src_configure() { - append-flags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H + append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H # TRANSDIR_SYSTEM is for bug #385671 eqmake5 \ @@ -84,7 +80,6 @@ src_configure() { GPSDLIB=$(usex gps 1 0) \ LIBPROXY=$(usex libproxy 1 0) \ USEWEBENGINE=$(usex webengine 1 0) \ - ZBAR=0 \ Merkaartor.pro }
