commit: 0d1626e5b9eac672944cfe2703d9058bffcd53d7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 19:22:15 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 17 19:22:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1626e5
sci-geosciences/merkaartor: drop 0.19.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/merkaartor/Manifest | 1 -
.../merkaartor-0.18.3-sharedir-pluginsdir.patch | 28 ------
.../files/merkaartor-0.19.0-exiv2-0.28.patch | 50 ----------
.../merkaartor/merkaartor-0.19.0-r1.ebuild | 104 ---------------------
4 files changed, 183 deletions(-)
diff --git a/sci-geosciences/merkaartor/Manifest
b/sci-geosciences/merkaartor/Manifest
index 511699b85cad..d2d2c61fc2d5 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,2 +1 @@
-DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B
1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01
SHA512
2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d
DIST merkaartor-0.20.0.tar.gz 5592116 BLAKE2B
9a78f66cea55bab3262d80d594da93f80bb834c7121960da1ade02624f8435545168b911a944d005995a0c60e4974fd58494867a6ec2eca47b1430968677a9d3
SHA512
db64c3053618a0bed7984223c9aa8e4175fdf7db2dd70bf3c6ec021b46fae1d095c513c3e151086baf07446c7cf81c49923a2e43e79963d956d29643d7f93910
diff --git
a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
deleted file mode 100644
index 46f5964e17cb..000000000000
---
a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/src.pro 2018-08-05 13:25:02.761849538 +0100
-+++ b/src/src.pro 2018-08-05 13:25:55.935846789 +0100
-@@ -155,8 +155,10 @@
- isEmpty( LIBDIR ) {
- LIBDIR = $${PREFIX}/lib${LIB_SUFFIX}
- }
--
-- DEFINES += PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
-+ isEmpty( PLUGINS_DIR ){
-+ PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
-+ }
-+ DEFINES += PLUGINS_DIR=$${PLUGINS_DIR}
-
- target.path = $${PREFIX}/bin
- SHARE_DIR = $${PREFIX}/share/merkaartor
-
---- a/src/src.pro 2018-08-05 16:20:33.759305219 +0100
-+++ b/src/src.pro 2018-08-05 16:20:53.094304220 +0100
-@@ -181,7 +181,7 @@
-
-
-
--DEFINES += SHARE_DIR=$${SHARE_DIR}
-+DEFINES += SHARE_DIR=$${SHARE_DIR_PATH}
- INSTALLS += target
-
- win32-msvc* {
-
diff --git
a/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch
b/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch
deleted file mode 100644
index 4f98b9a4fa36..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <[email protected]>
-Date: Sat, 16 Jul 2022 12:41:33 +0200
-Subject: [PATCH] Replaced use of AutoPtr with std::unique_ptr in
- GeoImageDock.cpp.
-
----
- src/Docks/GeoImageDock.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
-index 02b5cdc0..e2fa1601 100644
---- a/src/Docks/GeoImageDock.cpp
-+++ b/src/Docks/GeoImageDock.cpp
-@@ -457,7 +457,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
- Document *theDocument = Main->document();
- MapView *theView = Main->view();
-
-- Exiv2::Image::AutoPtr image;
-+ std::unique_ptr<Exiv2::Image> image;
- Exiv2::ExifData exifData;
- bool positionValid = false;
-
-@@ -869,7 +869,7 @@ void GeoImageDock::saveImage()
- // fn = QFileDialog::getSaveFileName(0, "Specify output filename", fn,
tr("JPEG Images (*.jpg)"));
- qDebug() << fn;
- if (!fn.isEmpty()) {
-- Exiv2::Image::AutoPtr imageIn, imageOut;
-+ std::unique_ptr<Exiv2::Image> imageIn, imageOut;
- Exiv2::ExifData exifData;
- try {
- imageIn =
Exiv2::ImageFactory::open(usedTrackPoints.at(index).filename.toStdString());
-@@ -893,7 +893,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString &
file)
- {
- Coord pos;
- double lat = 0.0, lon = 0.0;
-- Exiv2::Image::AutoPtr image;
-+ std::unique_ptr<Exiv2::Image> image;
- Exiv2::ExifData exifData;
- bool positionValid = false;
-
-@@ -933,7 +933,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString &
file)
-
- void GeoImageDock::addGeoDataToImage(Coord position, const QString & file)
- {
-- Exiv2::Image::AutoPtr image;
-+ std::unique_ptr<Exiv2::Image> image;
-
- try {
- image = Exiv2::ImageFactory::open(file.toStdString());
diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
deleted file mode 100644
index c959fecd8c1c..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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 # downstream, bug
621826
- "${FILESDIR}"/${P}-exiv2-0.28.patch # upstream git master, bug 906501
-)
-
-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}"
-}
