public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
Date: Mon, 15 May 2023 21:28:35 +0000 (UTC)	[thread overview]
Message-ID: <1684186082.6d1c0fa63caaf34e86731b96dd09adf7039a182d.asturm@gentoo> (raw)

commit:     6d1c0fa63caaf34e86731b96dd09adf7039a182d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 21:08:12 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 15 21:28:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1c0fa6

sci-geosciences/merkaartor: Redo 0.19.0 from 9999, restore PROJ-8 compat

As it should be done.

Bug: https://bugs.gentoo.org/828781
Closes: https://bugs.gentoo.org/836098
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../merkaartor/merkaartor-0.19.0-r1.ebuild         | 101 +++++++++++++++++++++
 1 file changed, 101 insertions(+)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
new file mode 100644
index 000000000000..f0f4b1dbd195
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="cs de en es fi fr hr hu id_ID it ja nl pl pt_BR ru sv uk zh_TW"
+inherit flag-o-matic plocale qmake-utils xdg
+
+if [[ ${PV} != *9999 ]] ; then
+	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
+	inherit git-r3
+fi
+
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug exif gps libproxy webengine"
+
+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:=
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2:= )
+	libproxy? ( net-libs/libproxy )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
+
+DOCS=( AUTHORS CHANGELOG )
+
+src_prepare() {
+	default
+
+	rm -r 3rdparty || die "Failed to remove bundled libs"
+
+	my_rm_loc() {
+		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+		rm "translations/${PN}_${1}.ts" || die
+	}
+
+	if [[ -n "$(plocale_get_locales)" ]]; then
+		plocale_for_each_disabled_locale my_rm_loc
+		$(qt5_get_bindir)/lrelease src/src.pro || die
+	fi
+
+	# build system expects to be building from git
+	if [[ ${PV} != *9999 ]] ; then
+		sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+	fi
+}
+
+src_configure() {
+	if has_version "<sci-libs/proj-8.0.0" ; then
+		# bug #685234
+		append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+	fi
+
+	# TRANSDIR_SYSTEM is for bug #385671
+	local myeqmakeargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins"
+		SHARE_DIR_PATH="/usr/share/${PN}"
+		TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations"
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations"
+		SYSTEM_QTSA=1
+		NODEBUG=$(usex debug 0 1)
+		GEOIMAGE=$(usex exif 1 0)
+		GPSDLIB=$(usex gps 1 0)
+		LIBPROXY=$(usex libproxy 1 0)
+		USEWEBENGINE=$(usex webengine 1 0)
+	)
+	[[ ${PV} != *9999 ]] && myeqmakeargs+=( RELEASE=1 )
+
+	eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}


             reply	other threads:[~2023-05-15 21:28 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-15 21:28 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-21 17:58 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/ Andreas Sturmlechner
2023-05-15 21:28 Andreas Sturmlechner
2023-05-15 21:28 Andreas Sturmlechner
2022-04-04 12:18 Ionen Wolkens
2022-03-01 13:30 Andrew Ammerlaan
2021-07-04 14:03 Ulrich Müller
2021-04-11 13:43 Sam James
2021-04-10 12:40 Sam James
2020-04-10  9:26 Andreas Sturmlechner
2020-04-10  9:26 Andreas Sturmlechner
2019-07-01 17:52 Andreas Sturmlechner
2019-06-30  7:18 Amy Liffey
2019-01-09 11:52 Andreas Sturmlechner
2018-12-31 10:09 Andreas Sturmlechner
2018-12-31 10:09 Andreas Sturmlechner
2018-12-29 23:52 Andreas Sturmlechner
2018-02-16 10:31 Andreas Sturmlechner
2018-02-16 10:31 Andreas Sturmlechner
2017-06-04 10:25 Andreas Sturmlechner
2017-03-03  0:15 Andreas Sturmlechner
2016-12-29 12:05 Michael Palimaka
2016-10-29 11:22 Michael Palimaka
2016-10-23 17:41 Ettore Di Giacinto
2016-10-23 17:41 Ettore Di Giacinto
2016-10-23 17:41 Ettore Di Giacinto
2016-10-04 19:41 Amy Winston
2016-10-04 17:38 Amy Winston
2016-06-26 18:13 Amy Winston
2016-06-24  7:16 Amy Winston

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1684186082.6d1c0fa63caaf34e86731b96dd09adf7039a182d.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox