* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/
@ 2016-01-18 18:33 Amy Winston
0 siblings, 0 replies; 7+ messages in thread
From: Amy Winston @ 2016-01-18 18:33 UTC (permalink / raw
To: gentoo-commits
commit: 469204d2eb46c95572471d9fea1b2339b334c314
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 18:28:31 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 18:28:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469204d2
sci-geosciences/merkaartor: compatibility with gdal bug #554304. By wraeth
Package-Manager: portage-2.2.24
sci-geosciences/merkaartor/Manifest | 1 -
.../merkaartor/files/merkaartor-gdal-2-fix.patch | 212 +++++++++++++++++++++
....18.1-r1.ebuild => merkaartor-0.18.1-r2.ebuild} | 6 +-
.../merkaartor/merkaartor-0.18.1.ebuild | 69 -------
4 files changed, 217 insertions(+), 71 deletions(-)
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 9950ede..1b431ef 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,3 +1,2 @@
DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a SHA512 3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed WHIRLPOOL 22a07736e7da44d3799831352d0e9d323143f228dcf7693b6f90fe101a8a04c74c2c5186db15723902b7dd8aadd93a78547e4622b5238ceb7074027e987b8487
-DIST merkaartor-0.18.1.tar.bz2 5579080 SHA256 3d6a96599815d5f1c8558acd255a413ea47b93ddad8414147d11775a6f21139f SHA512 d45b25ad5a7f19b32ca3e91ad514ef1a8450024bdab9e8c215f60a5ec3fc6332a5cadfcec586a32805c7727d224588b504b01d3023120d55476660a8a394cd45 WHIRLPOOL 23327a7eaa91531a95665fe9ff647712606babf96e3843ef33b94a37f6f7ca6d1cb09576b0b31197badc32e87cfc7ca275a9e3792e57f57dd58fe0509ec1b46d
DIST merkaartor-0.18.1.tar.gz 6459640 SHA256 e9fa5e30e6392c9224f73e9bb7d17b66c4eb6c023633eb2af0cf58ba8acf684f SHA512 5ccb2aca7463cd3b31790b0f231cd18f4499b38ec3eb14c3600bdaae880194a71aaf63a2c2f814af6277b1b07fd618b4393309aa5ded375940bd464d1e77d71d WHIRLPOOL fde10a93510c123f2e1065ad745c3abc7860892c55ed615e75214dd172bfbec1da6f254377cc2d6e0f1df6f9d0680d0f7878ba3224651f5b09c590c335211d9c
diff --git a/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch b/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch
new file mode 100644
index 0000000..4197610
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch
@@ -0,0 +1,212 @@
+--- a/src/ImportExport/ImportExportGdal.cpp 2015-06-15 18:48:39.604575423 +0200
++++ b/src/ImportExport/ImportExportGdal.cpp 2015-06-15 18:48:39.604575423 +0200
+@@ -21,10 +21,13 @@
+ #include "ProjectionChooser.h"
+ #include "Global.h"
+
+-#include "cpl_vsi.h"
++#include <cpl_vsi.h>
++#include <gdal.h>
++#include <gdal_priv.h>
+
+ #include <QDir>
+
++
+ bool parseContainer(QDomElement& e, Layer* aLayer);
+
+ ImportExportGdal::ImportExportGdal(Document* doc)
+@@ -55,6 +58,55 @@ bool ImportExportGdal::saveFile(QString)
+ bool ImportExportGdal::export_(const QList<Feature *>& featList)
+ {
+ const char *pszDriverName = "SQLite";
++ QString fileName(HOMEDIR + "/test.sqlite");
++#ifdef GDAL2
++ GDALDriver *poDriver;
++ GDALDriverManager *driverManager = GetGDALDriverManager();
++ GDALAllRegister();
++ driverManager->AutoLoadDrivers();
++
++ poDriver = driverManager->GetDriverByName(pszDriverName);
++ if( poDriver == NULL )
++ {
++ qDebug( "%s driver not available.", pszDriverName );
++ return false;
++ }
++
++ /* Create create options */
++ char **createOptions = NULL;
++ createOptions = CSLSetNameValue( createOptions, "SPATIALITE", "YES" );
++
++ /* Open new dataset */
++ GDALDataset *poDS;
++
++ QFile::remove(fileName);
++ poDS = poDriver->Create( fileName.toUtf8().constData(), 0, 0, 0, GDT_Unknown, createOptions );
++ if( poDS == NULL )
++ {
++ qDebug( "Creation of output file failed." );
++ return false;
++ }
++ poDS->ExecuteSQL("PRAGMA synchronous = OFF", NULL, NULL);
++
++ /* Create Spatial reference object */
++ OGRSpatialReference *poSRS;
++ poSRS = new OGRSpatialReference();
++ poSRS->importFromEPSG(4326);
++
++ /* Create layer options */
++ char **layerOptions = NULL;
++ layerOptions = CSLSetNameValue( layerOptions, "FORMAT", "SPATIALITE" );
++ layerOptions = CSLSetNameValue( layerOptions, "SPATIAL_INDEX", "YES" );
++
++ /* Create layer */
++ OGRLayer *poLayer;
++ poLayer = poDS->CreateLayer( "osm", poSRS, wkbUnknown, layerOptions);
++
++ /* Free the options */
++ CSLDestroy( createOptions );
++ CSLDestroy( layerOptions );
++#else
++ /* This is legacy code, and is not tested at all */
+ OGRSFDriver *poDriver;
+
+ OGRRegisterAll();
+@@ -68,8 +120,8 @@ bool ImportExportGdal::export_(const QList<Feature *>& featList)
+
+ OGRDataSource *poDS;
+
+- QFile::remove(QString(HOMEDIR + "/test.sqlite"));
+- poDS = poDriver->CreateDataSource( QString(HOMEDIR + "/test.sqlite").toUtf8().constData(), NULL );
++ QFile::remove(fileName);
++ poDS = poDriver->CreateDataSource( fileName.toUtf8().constData(), NULL );
+ if( poDS == NULL )
+ {
+ qDebug( "Creation of output file failed." );
+@@ -89,6 +141,8 @@ bool ImportExportGdal::export_(const QList<Feature *>& featList)
+ OGRLayer *poLayer;
+ poLayer = poDS->CreateLayer( "osm", poSRS, wkbUnknown, papszOptions);
+ CSLDestroy( papszOptions );
++#endif
++
+
+ if( poLayer == NULL )
+ {
+@@ -142,7 +196,11 @@ bool ImportExportGdal::export_(const QList<Feature *>& featList)
+ }
+ OGRFeature::DestroyFeature( poFeature );
+ }
++#ifdef GDAL2
++ GDALClose( (GDALDatasetH) poDS );
++#else
+ OGRDataSource::DestroyDataSource( poDS );
++#endif
+ return true;
+ }
+
+@@ -264,7 +322,11 @@ Feature* ImportExportGdal::parseGeometry(Layer* aLayer, OGRGeometry *poGeometry)
+
+ // import the input
+
+-bool ImportExportGdal::importGDALDataset(OGRDataSource* poDS, Layer* aLayer, bool confirmProjection)
++#ifndef GDAL2
++#define GDALDataset OGRDataSource
++#endif
++bool ImportExportGdal::importGDALDataset(GDALDataset* poDS, Layer* aLayer, bool confirmProjection)
++#undef GDALDataset
+ {
+ int ogrError;
+
+@@ -422,11 +484,16 @@ bool ImportExportGdal::importGDALDataset(OGRDataSource* poDS, Layer* aLayer, boo
+
+ bool ImportExportGdal::import(Layer* aLayer)
+ {
++#ifdef GDAL2
++ GDALAllRegister();
++ GDALDataset *poDS;
++ poDS = (GDALDataset *) GDALOpen( FileName.toUtf8().constData(), GA_ReadOnly );
++#else
+ OGRRegisterAll();
+-
+- OGRDataSource *poDS;
+-
++ OGRDataSource *poDS;
+ poDS = OGRSFDriverRegistrar::Open( FileName.toUtf8().constData(), FALSE );
++#endif
++
+ if( poDS == NULL )
+ {
+ qDebug( "GDAL Open failed.\n" );
+@@ -435,22 +502,26 @@ bool ImportExportGdal::import(Layer* aLayer)
+
+ importGDALDataset(poDS, aLayer, M_PREFS->getGdalConfirmProjection());
+
+- OGRDataSource::DestroyDataSource( poDS );
++ GDALClose( (GDALDatasetH) poDS );
+
+ return true;
+ }
+
+ bool ImportExportGdal::import(Layer* aLayer, const QByteArray& ba, bool confirmProjection)
+ {
+- OGRRegisterAll();
+-
+- OGRDataSource *poDS;
+-// int ogrError;
+-
+ GByte* content = (GByte*)(ba.constData());
+ /*FILE* f = */VSIFileFromMemBuffer("/vsimem/temp", content, ba.size(), FALSE);
+
++#ifdef GDAL2
++ GDALAllRegister();
++ GDALDataset *poDS;
++ poDS = (GDALDataset *) GDALOpen( "/vsimem/temp", GA_ReadOnly );
++#else
++ OGRRegisterAll();
++ OGRDataSource *poDS;
+ poDS = OGRSFDriverRegistrar::Open( "/vsimem/temp", FALSE );
++#endif
++
+ if( poDS == NULL )
+ {
+ qDebug( "GDAL Open failed.\n" );
+@@ -458,7 +529,7 @@ bool ImportExportGdal::import(Layer* aLayer, const QByteArray& ba, bool confirmP
+ }
+ importGDALDataset(poDS, aLayer, confirmProjection);
+
+- OGRDataSource::DestroyDataSource( poDS );
++ GDALClose( (GDALDatasetH) poDS );
+
+ return true;
+ }
+--- a/src/ImportExport/ImportExportGdal.h 2015-06-15 18:50:42.884995287 +0200
++++ b/src/ImportExport/ImportExportGdal.h 2015-06-15 18:50:42.884995287 +0200
+@@ -13,7 +13,15 @@
+ #define ImportExportGDAL_H
+
+ #include "IImportExport.h"
+-#include "ogrsf_frmts.h"
++
++#include <ogrsf_frmts.h>
++#include <gdal.h>
++#include <gdal_priv.h>
++#include <gdal_version.h>
++
++#if GDAL_VERSION_MAJOR == 2
++#define GDAL2
++#endif
+
+ class Projection;
+ class Layer;
+@@ -52,7 +60,11 @@ class ImportExportGdal : public IImportExport
+ Node *nodeFor(Layer* aLayer, OGRPoint point);
+ Way *readWay(Layer* aLayer, OGRLineString *poRing);
+
+- bool importGDALDataset(OGRDataSource *poDs, Layer *aLayer, bool confirmProjection);
++#ifndef GDAL2
++#define GDALDataset OGRDataSource
++#endif
++ bool importGDALDataset(GDALDataset *poDs, Layer *aLayer, bool confirmProjection);
++#undef GDALDataset
+
+ private:
+ QHash<OGRPoint, Node*> pointHash;
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.1-r2.ebuild
similarity index 94%
rename from sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild
rename to sci-geosciences/merkaartor/merkaartor-0.18.1-r2.ebuild
index 33f4f54..211238a 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -52,6 +52,10 @@ src_prepare() {
fi
epatch "${FILESDIR}"/${P}-system-libs.patch
+
+ # bug 554304 - build against gdal 2
+ epatch "${FILESDIR}"/${PN}-gdal-2-fix.patch
+
epatch_user
}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
deleted file mode 100644
index 97f7151..0000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-REDMINE_HASH="301"
-
-inherit multilib qt4-r2 ${SCM_ECLASS}
-
-DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be"
-SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug exif gps nls libproxy"
-
-QT_MINIMAL="4.7.2"
-DEPEND="
- >=dev-libs/boost-1.46
- >=sci-libs/gdal-1.6.0
- >=sci-libs/proj-4.6
- >=dev-qt/qtgui-${QT_MINIMAL}:4
- >=dev-qt/qtsvg-${QT_MINIMAL}:4
- >=dev-qt/qtwebkit-${QT_MINIMAL}:4
- exif? ( media-gfx/exiv2 )
- gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
- libproxy? ( net-libs/libproxy )
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS CHANGELOG HACKING"
-
-PATCHES=(
-# "${FILESDIR}"/0.17.2-includes.patch
-# "${FILESDIR}"/0.17.2-libproxy.patch
-)
-
-merkaartor_use() {
- local useflag=${1}
- [[ -z ${useflag} ]] && die "No useflag specified"
- if use ${useflag}; then
- echo "1"
- else
- echo "0"
- fi
-}
-
-src_configure() {
- local myconf
- myconf+=" RELEASE=1 ZBAR=0" # deps not in main tree so hard-disable
- myconf+=" GEOIMAGE=$(${PN}_use exif)"
- myconf+=" GPSDLIB=$(${PN}_use gps)"
- myconf+=" LIBPROXY=$(${PN}_use libproxy)"
- myconf+=" NODEBUG=$(use debug && echo "0" || echo "1")" # inverse logic
- myconf+=" NOUSEWEBKIT=0" # fails to link if disabled, upstream needs to fix
- myconf+=" TRANSDIR_MERKAARTOR=/usr/share/${PN}/translations TRANSDIR_SYSTEM=/usr/share/qt4/translations" #385671
-
- if use nls; then
- lrelease src/src.pro || die "lrelease failed"
- fi
-
- eqmake4 Merkaartor.pro LIBDIR=/usr/$(get_libdir) PREFIX=/usr/ ${myconf}
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/
@ 2018-12-29 23:52 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-12-29 23:52 UTC (permalink / raw
To: gentoo-commits
commit: 4f264751981410be56ef834c6f5149f2b7147013
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 23:03:23 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 23:52:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f264751
sci-geosciences/merkaartor: Fix desktop file for Wayland
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/merkaartor-0.18.3-desktopfile.patch | 30 ++++++++++++++++++++++
.../merkaartor/merkaartor-0.18.3-r4.ebuild | 5 +++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
new file mode 100644
index 00000000000..6c844ea3cf7
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
@@ -0,0 +1,30 @@
+From 85ee9b1855bf3256daf4decd1f25021c1a28abdc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
+Date: Sat, 19 May 2018 13:43:24 +0200
+Subject: [PATCH] Renamed merkaartor.desktop to
+ org.merkaartor.merkaartor.desktop
+
+A possible solution for issue #150.
+---
+ src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} | 0
+ src/src.pro | 2 +-
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} (100%)
+
+diff --git a/src/merkaartor.desktop b/src/org.merkaartor.merkaartor.desktop
+similarity index 100%
+rename from src/merkaartor.desktop
+rename to src/org.merkaartor.merkaartor.desktop
+diff --git a/src/src.pro b/src/src.pro
+index 81a65f34..477c459e 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -289,7 +289,7 @@ contains(SANITIZE, 2) {
+
+ unix:!macx {
+ desktop.path = $${PREFIX}/share/applications
+- desktop.files = merkaartor.desktop
++ desktop.files = org.merkaartor.merkaartor.desktop
+ desktopicon8x8.path = $${PREFIX}/share/icons/hicolor/8x8/apps/
+ desktopicon8x8.files = $$PWD/../Icons/8x8/merkaartor.png
+ desktopicon16x16.path = $${PREFIX}/share/icons/hicolor/16x16/apps/
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index 29f7b22e8be..c4f7ac66d49 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -37,7 +37,10 @@ DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826
+PATCHES=(
+ "${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826
+ "${FILESDIR}"/${P}-desktopfile.patch
+)
DOCS=( AUTHORS CHANGELOG )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/
@ 2019-07-01 17:52 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-07-01 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 343a18a34ce2e4b099d519556e8ca58c875cbdad
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 1 17:40:37 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 1 17:51:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343a18a3
sci-geosciences/merkaartor: Fix build with exiv2-0.27.1
Closes: https://bugs.gentoo.org/689098
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch | 12 ++++++++++++
sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild | 1 +
2 files changed, 13 insertions(+)
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch
new file mode 100644
index 00000000000..d54422be14e
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch
@@ -0,0 +1,12 @@
+--- a/src/Docks/GeoImageDock.h 2016-09-06 00:29:45.000000000 +0200
++++ b/src/Docks/GeoImageDock.h 2019-07-01 19:20:43.450789475 +0200
+@@ -7,8 +7,7 @@
+ #include <QDockWidget>
+ #include <QMouseEvent>
+ #include <QShortcut>
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <QDrag>
+
+ class ImageView;
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index b998c164e0c..6eed24c6150 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -42,6 +42,7 @@ 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
)
DOCS=( AUTHORS CHANGELOG )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/
@ 2020-04-10 9:26 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-04-10 9:26 UTC (permalink / raw
To: gentoo-commits
commit: 74efd9738e0aa1e945df61c941eef145e2ad1f3f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 09:26:17 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 09:26:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74efd973
sci-geosciences/merkaartor: Drop 0.18.3-r4
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/merkaartor/Manifest | 1 -
.../files/merkaartor-0.18.3-desktopfile.patch | 30 ----
.../files/merkaartor-0.18.3-exiv2-0.27.1.patch | 12 --
.../files/merkaartor-0.18.3-webengine1.patch | 186 ---------------------
.../files/merkaartor-0.18.3-webengine2.patch | 35 ----
.../files/merkaartor-0.18.3-webengine3.patch | 135 ---------------
.../merkaartor/merkaartor-0.18.3-r4.ebuild | 99 -----------
7 files changed, 498 deletions(-)
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 3c1ea402a81..3f1b0c066e1 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,2 +1 @@
-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/files/merkaartor-0.18.3-desktopfile.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
deleted file mode 100644
index 6c844ea3cf7..00000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 85ee9b1855bf3256daf4decd1f25021c1a28abdc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
-Date: Sat, 19 May 2018 13:43:24 +0200
-Subject: [PATCH] Renamed merkaartor.desktop to
- org.merkaartor.merkaartor.desktop
-
-A possible solution for issue #150.
----
- src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} | 0
- src/src.pro | 2 +-
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} (100%)
-
-diff --git a/src/merkaartor.desktop b/src/org.merkaartor.merkaartor.desktop
-similarity index 100%
-rename from src/merkaartor.desktop
-rename to src/org.merkaartor.merkaartor.desktop
-diff --git a/src/src.pro b/src/src.pro
-index 81a65f34..477c459e 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -289,7 +289,7 @@ contains(SANITIZE, 2) {
-
- unix:!macx {
- desktop.path = $${PREFIX}/share/applications
-- desktop.files = merkaartor.desktop
-+ desktop.files = org.merkaartor.merkaartor.desktop
- desktopicon8x8.path = $${PREFIX}/share/icons/hicolor/8x8/apps/
- desktopicon8x8.files = $$PWD/../Icons/8x8/merkaartor.png
- desktopicon16x16.path = $${PREFIX}/share/icons/hicolor/16x16/apps/
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch
deleted file mode 100644
index d54422be14e..00000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/Docks/GeoImageDock.h 2016-09-06 00:29:45.000000000 +0200
-+++ b/src/Docks/GeoImageDock.h 2019-07-01 19:20:43.450789475 +0200
-@@ -7,8 +7,7 @@
- #include <QDockWidget>
- #include <QMouseEvent>
- #include <QShortcut>
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <QDrag>
-
- class ImageView;
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch
deleted file mode 100644
index 5f4f605ce5b..00000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From df515ecf4e6ce1a249af299840e82126c68fcf91 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
-Date: Mon, 26 Sep 2016 13:02:57 +0200
-Subject: [PATCH] Updated QWeb to QWebView.
-
----
- src/Layers/LicenseDisplayDialog.ui | 6 +++---
- src/QMapControl/browserimagemanager.cpp | 20 +++++++++-----------
- src/QMapControl/browserimagemanager.h | 17 ++++++-----------
- src/src.pro | 2 +-
- 4 files changed, 19 insertions(+), 26 deletions(-)
-
-diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
-index 103816c6..3dabd130 100755
---- a/src/Layers/LicenseDisplayDialog.ui
-+++ b/src/Layers/LicenseDisplayDialog.ui
-@@ -15,7 +15,7 @@
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
-- <widget class="QWebView" name="webView">
-+ <widget class="QWebEngineView" name="webView">
- <property name="url">
- <url>
- <string>about:blank</string>
-@@ -41,9 +41,9 @@
- </widget>
- <customwidgets>
- <customwidget>
-- <class>QWebView</class>
-+ <class>QWebEngineView</class>
- <extends>QWidget</extends>
-- <header>QtWebKit/QWebView</header>
-+ <header>QWebEngineView</header>
- </customwidget>
- </customwidgets>
- <resources/>
-diff --git a/src/QMapControl/browserimagemanager.cpp b/src/QMapControl/browserimagemanager.cpp
-index 468cf2b6..4021d40f 100644
---- a/src/QMapControl/browserimagemanager.cpp
-+++ b/src/QMapControl/browserimagemanager.cpp
-@@ -47,9 +47,8 @@ void BrowserWebPage::javaScriptConsoleMessage ( const QString & message, int lin
- //printf("%s\n", s);
- }
-
--void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
-+void BrowserWebPage::javaScriptAlert ( const QString & msg )
- {
-- Q_UNUSED(frame)
- //QMessageBox::information(NULL, tr("Javascript alert"), msg);
-
- if (msg.startsWith("Coord")) {
-@@ -105,8 +104,10 @@ void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
-
- void BrowserWebPage::launchRequest ( const QUrl & url )
- {
-+ qDebug() << "Warning: you are using BrowserWebPage to render background imagery. "<<
-+ "This code is not tested and may not work as expected. If you experience issues, please let us know.";
- sw = sh = 0;
-- mainFrame()->load(url);
-+ load(url);
- }
-
- BrowserImageManager* BrowserImageManager::m_BrowserImageManagerInstance = 0;
-@@ -138,8 +139,6 @@ BrowserImageManager::BrowserImageManager(QObject* parent)
- }
-
- page = new BrowserWebPage();
-- page->setNetworkAccessManager(m_networkManager);
-- page->setViewportSize(QSize(1024, 1024));
-
- connect(page, SIGNAL(loadFinished(bool)), this, SLOT(pageLoadFinished(bool)));
-
-@@ -220,7 +219,6 @@ void BrowserImageManager::launchRequest()
-
- QUrl u = QUrl( R.url);
-
-- page->networkAccessManager()->setProxy(M_PREFS->getProxy(u));
- page->launchRequest(u);
- requestActive = true;
- #ifndef BROWSERIMAGEMANAGER_IS_THREADED
-@@ -246,7 +244,7 @@ void BrowserImageManager::pageLoadFinished(bool ok)
- qDebug() << "BrowserImageManager::pageLoadFinished: " << " Hash: " << R.hash;
- QPixmap pt(page->sw, page->sh);
- QPainter P(&pt);
-- page->mainFrame()->render(&P, QRegion(0,0,page->sw,page->sh));
-+ page->view()->render(&P, QPoint(), QRegion(0,0,page->sw,page->sh));
- P.end();
-
- // if (page->sw != BROWSER_TILE_SIZE || page->sh != BROWSER_TILE_SIZE) {
-@@ -319,7 +317,7 @@ void BrowserImageManager::loadingQueueEmpty()
- void BrowserImageManager::abortLoading()
- {
- //qDebug() << "BrowserImageManager::abortLoading";
-- page->triggerAction(QWebPage::Stop);
-+ page->triggerAction(QWebEnginePage::Stop);
- if (!loadingRequests.isEmpty()) {
- LoadingRequest R = loadingRequests.dequeue();
- loadingRequests.clear();
-@@ -331,7 +329,7 @@ void BrowserImageManager::abortLoading()
- #ifdef BROWSERIMAGEMANAGER_IS_THREADED
- void BrowserImageManager::run()
- {
-- page = new BrowserWebPage();
-+ page = new BrowserWebEnginePage();
- page->setViewportSize(QSize(1024, 1024));
-
- QTimer theTimer;
-@@ -354,7 +352,7 @@ void BrowserImageManager::checkRequests()
- } else {
- if ((requestDuration++) > 100) {
- requestDuration = 0;
-- page->triggerAction(QWebPage::Stop);
-+ page->triggerAction(QWebEnginePage::Stop);
- qDebug() << "BrowserImageManager Timeout";
- }
- }
-@@ -365,7 +363,7 @@ void BrowserImageManager::checkRequests()
- void BrowserImageManager::timeout()
- {
- qDebug() << "BrowserImageManager::timeout";
-- page->triggerAction(QWebPage::Stop);
-+ page->triggerAction(QWebEnginePage::Stop);
- pageLoadFinished(false);
- }
- #endif // BROWSERIMAGEMANAGER_IS_THREADED
-diff --git a/src/QMapControl/browserimagemanager.h b/src/QMapControl/browserimagemanager.h
-index 10f8a477..ca846e31 100644
---- a/src/QMapControl/browserimagemanager.h
-+++ b/src/QMapControl/browserimagemanager.h
-@@ -24,14 +24,10 @@
- #include <QPixmap>
-
- #include <QtNetwork/QtNetwork>
--#include <QWebFrame>
--#include "qwebhistory.h"
--#include "qwebhistoryinterface.h"
--#include "qwebkitglobal.h"
--#include "qwebpage.h"
--#include "qwebpluginfactory.h"
--#include "qwebsettings.h"
--#include "qwebview.h"
-+#include <QWebEnginePage>
-+#include <QWebEngineHistory>
-+#include <QWebEngineSettings>
-+#include <QWebEngineView>
-
- #include <QThread>
-
-@@ -41,13 +37,13 @@
- @author Chris Browet <cbro@semperpax.com>
- */
-
--class BrowserWebPage : public QWebPage
-+class BrowserWebPage : public QWebEnginePage
- {
- friend class BrowserImageManager;
-
- protected:
- virtual void javaScriptConsoleMessage ( const QString & message, int lineNumber, const QString & sourceID );
-- virtual void javaScriptAlert ( QWebFrame * frame, const QString & msg ) ;
-+ virtual void javaScriptAlert ( const QString & msg ) ;
- void launchRequest ( const QUrl & url );
-
- private:
-@@ -116,7 +112,6 @@ class BrowserImageManager : public QObject, public IImageManager
- static BrowserImageManager* m_BrowserImageManagerInstance;
-
- BrowserWebPage* page;
-- QWebFrame *frame;
- QNetworkAccessManager* qnam;
-
- signals:
-diff --git a/src/src.pro b/src/src.pro
-index eb93b263..137d7e14 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -34,7 +34,7 @@ TEMPLATE = app
-
- CONFIG += rtti stl exceptions
- #CONFIG -= exceptions
--QT += svg network xml core gui webkitwidgets concurrent printsupport
-+QT += svg network xml core gui webenginewidgets concurrent printsupport
- win32-msvc* {
- LIBS += -lzlib
- } else {
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch
deleted file mode 100644
index 48c4af7b9c5..00000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 20edcc7e85413e60ff180bd9f20e5428e5729222 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
-Date: Mon, 26 Sep 2016 13:11:33 +0200
-Subject: [PATCH] Replaced missing QT += webkit, updated linux package list.
-
----
- ci/travis-linux-install.sh | 3 +--
- src/QMapControl.pri | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/ci/travis-linux-install.sh b/ci/travis-linux-install.sh
-index 79975d27..4e83c9bb 100755
---- a/ci/travis-linux-install.sh
-+++ b/ci/travis-linux-install.sh
-@@ -8,6 +8,5 @@ sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
- sudo apt-get update -qq
- sudo apt-cache search qt
- sudo apt-get -qq install gdb libgdal-dev libproj-dev
--sudo apt-get -qq install libqt4-xml libqt4-network libqt4-gui libqt4-svg libqt4-webkit libqt4-dev qt4-qmake
--sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webkit5* libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
-+sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webengine5{,-dev} libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
- qtchooser -list-versions
-diff --git a/src/QMapControl.pri b/src/QMapControl.pri
-index bbfc09b5..92769565 100644
---- a/src/QMapControl.pri
-+++ b/src/QMapControl.pri
-@@ -26,7 +26,7 @@ QT += network
- DEFINES += USE_WEBKIT
- SOURCES += browserimagemanager.cpp
- HEADERS += browserimagemanager.h
-- QT += webkit
-+ QT += webenginewidgets
- contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
- }
- }
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch
deleted file mode 100644
index 97d76a18764..00000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 3019f1d2c76a0ae0c51e70d34bc25a49cb030845 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
-Date: Wed, 28 Sep 2016 21:41:02 +0200
-Subject: [PATCH] Removed webengine from LicenseDisplayDialog and renamed
- conditional.
-
-This removes the QWebEngine dependency for most build configurations.
-None of the code actually uses it, but there are some plugins that do.
-I expect they are all obsolete, but will keep it in until they are
-replaced/deemed not working.
----
- COMPILE.md | 2 +-
- src/Layers/ImageMapLayer.cpp | 2 +-
- src/Layers/LicenseDisplayDialog.ui | 29 +++++++++++++++--------------
- src/QMapControl.pri | 14 ++++++--------
- src/src.pro | 2 +-
- 5 files changed, 24 insertions(+), 25 deletions(-)
-
-diff --git a/COMPILE.md b/COMPILE.md
-index 9324019d..108a2eee 100644
---- a/COMPILE.md
-+++ b/COMPILE.md
-@@ -151,7 +151,7 @@ There are some parameters you can pass to qmake to customize build:
- | TRANSDIR_MERKAARTOR=<path> | where will the Merkaartor translations be installed |
- | TRANSDIR_SYSTEM=<path> | where your global Qt translation directory is |
- | NODEBUG=1 | release target |
--| NOUSEWEBKIT | disable use of WebKit (Yahoo adapter) |
-+| USEWEBENGINE=1 | enable use of WebEngine (required for some external plugins) |
- | SYSTEM_QTSA | use system copy of qtsingleapplication instead of internal |
-
-
-diff --git a/src/Layers/ImageMapLayer.cpp b/src/Layers/ImageMapLayer.cpp
-index 31966b09..b46199b9 100644
---- a/src/Layers/ImageMapLayer.cpp
-+++ b/src/Layers/ImageMapLayer.cpp
-@@ -263,7 +263,7 @@ void ImageMapLayer::setMapAdapter(const QUuid& theAdapterUid, const QString& ser
- QDialog dlg;
- ui.setupUi(&dlg);
- dlg.setWindowTitle(tr("Licensing Terms: %1").arg(name()));
-- ui.webView->load(u);
-+ ui.urlLabel->setText(QString("<a href='%1'>%2</a>").arg(u.toString()).arg(u.toString()));
-
- bool OK = false;
- while (!OK) {
-diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
-index 3dabd130..dd748e41 100755
---- a/src/Layers/LicenseDisplayDialog.ui
-+++ b/src/Layers/LicenseDisplayDialog.ui
-@@ -6,8 +6,8 @@
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>650</width>
-- <height>400</height>
-+ <width>786</width>
-+ <height>171</height>
- </rect>
- </property>
- <property name="windowTitle">
-@@ -15,11 +15,19 @@
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
-- <widget class="QWebEngineView" name="webView">
-- <property name="url">
-- <url>
-- <string>about:blank</string>
-- </url>
-+ <widget class="QLabel" name="label">
-+ <property name="text">
-+ <string><html><head/><body><p>The content selected is shared under a non-standard license agreement. The full text is available on the following URL. It is your reponsibility to read, understand and agree to the license.</p></body></html></string>
-+ </property>
-+ <property name="wordWrap">
-+ <bool>true</bool>
-+ </property>
-+ </widget>
-+ </item>
-+ <item>
-+ <widget class="QLabel" name="urlLabel">
-+ <property name="text">
-+ <string>TextLabel</string>
- </property>
- </widget>
- </item>
-@@ -39,13 +47,6 @@
- </item>
- </layout>
- </widget>
-- <customwidgets>
-- <customwidget>
-- <class>QWebEngineView</class>
-- <extends>QWidget</extends>
-- <header>QWebEngineView</header>
-- </customwidget>
-- </customwidgets>
- <resources/>
- <connections>
- <connection>
-diff --git a/src/QMapControl.pri b/src/QMapControl.pri
-index 92769565..3491c8b1 100644
---- a/src/QMapControl.pri
-+++ b/src/QMapControl.pri
-@@ -21,13 +21,11 @@ SOURCES += \
-
- QT += network
-
--!contains(NOUSEWEBKIT,1) {
-- greaterThan(QT_VER_MAJ, 3) : greaterThan(QT_VER_MIN, 3) {
-- DEFINES += USE_WEBKIT
-- SOURCES += browserimagemanager.cpp
-- HEADERS += browserimagemanager.h
-- QT += webenginewidgets
-- contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
-- }
-+contains(USEWEBENGINE,1) {
-+ DEFINES += USE_WEBKIT
-+ SOURCES += browserimagemanager.cpp
-+ HEADERS += browserimagemanager.h
-+ QT += webenginewidgets
-+ contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
- }
-
-diff --git a/src/src.pro b/src/src.pro
-index 137d7e14..81a65f34 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -34,7 +34,7 @@ TEMPLATE = app
-
- CONFIG += rtti stl exceptions
- #CONFIG -= exceptions
--QT += svg network xml core gui webenginewidgets concurrent printsupport
-+QT += svg network xml core gui concurrent printsupport
- win32-msvc* {
- LIBS += -lzlib
- } else {
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
deleted file mode 100644
index 4bb8c0e5e1e..00000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit flag-o-matic l10n qmake-utils xdg-utils
-
-DESCRIPTION="Qt based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy webengine"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-DEPEND="
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui: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}"
-
-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
-)
-
-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 "$(l10n_get_locales)" ]]; then
- l10n_for_each_disabled_locale_do my_rm_loc
- $(qt5_get_bindir)/lrelease src/src.pro || die
- fi
-
- # build system expects to be building from git
- sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
-}
-
-src_configure() {
- append-flags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-
- # TRANSDIR_SYSTEM is for bug #385671
- eqmake5 \
- PREFIX="${ED}/usr" \
- LIBDIR="${ED}/usr/$(get_libdir)" \
- PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
- SHARE_DIR_PATH="/usr/share/${PN}" \
- TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
- TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
- SYSTEM_QTSA=1 \
- RELEASE=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) \
- ZBAR=0 \
- Merkaartor.pro
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/
@ 2022-10-15 15:13 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-10-15 15:13 UTC (permalink / raw
To: gentoo-commits
commit: 27ffb3f377260e57517da0055b5016ad71f5898b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 15:09:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 15:09:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ffb3f3
sci-geosciences/merkaartor: drop 0.18.4, 0.18.4_p20210410-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/merkaartor/Manifest | 2 -
.../files/merkaartor-0.18.4-qt-5.15.patch | 29 ------
.../merkaartor/merkaartor-0.18.4.ebuild | 97 ------------------
.../merkaartor-0.18.4_p20210410-r1.ebuild | 113 ---------------------
4 files changed, 241 deletions(-)
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 1e97f01ebf10..eb14ca0751f1 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,3 +1 @@
-DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c
-DIST merkaartor-0.18.4_p20210410.tar.gz 6566072 BLAKE2B d2788552794e2778d6b68cc39ad04ec081ef88d0e3748af380774ee3ac98871bdaf1f26a04065bfb591b9245d740acec4fcfb4b781311409b49932014dfa86bb SHA512 3051280fd1ab6fa5b9e40e4c1aa1df137b60f3f4062daaa9301dce3697c51d7f4514bd01d7954f5c332849e268f6fcf6f23a2bc58b13645c5e29f9a12c9a3a34
DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch
deleted file mode 100644
index e14cda8b5bd6..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 14 Jun 2020 22:19:24 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/Features/Feature.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/Features/Feature.h b/src/Features/Feature.h
-index 52fd3044..f466a5a9 100644
---- a/src/Features/Feature.h
-+++ b/src/Features/Feature.h
-@@ -8,8 +8,10 @@ class Feature;
- #include "MapView.h"
- #include "FeaturePainter.h"
-
--#include <QtCore/QString>
- #include <QList>
-+#include <QPainter>
-+#include <QPainterPath>
-+#include <QString>
-
- #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x))
- #define CAST_NODE(x) (dynamic_cast<Node*>(x))
---
-2.27.0
-
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
deleted file mode 100644
index 6f1f3aaf2e60..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit flag-o-matic plocale qmake-utils xdg-utils
-
-DESCRIPTION="Qt based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy webengine"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-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}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # bug 621826
- "${FILESDIR}"/${P}-qt-5.15.patch # bug 727914
-)
-
-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
- sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
-}
-
-src_configure() {
- append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-
- # TRANSDIR_SYSTEM is for bug #385671
- eqmake5 \
- PREFIX="${ED}/usr" \
- LIBDIR="${ED}/usr/$(get_libdir)" \
- PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
- SHARE_DIR_PATH="/usr/share/${PN}" \
- TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
- TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
- SYSTEM_QTSA=1 \
- RELEASE=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) \
- Merkaartor.pro
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
deleted file mode 100644
index 4b22730517fc..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit flag-o-matic plocale qmake-utils xdg-utils
-
-if [[ ${PV} != *9999 ]] ; then
- # Needed for new Proj API support
- # bug #685234
- COMMIT="7ae76834bcba9934f38d85058f7372fc016c1d1c"
- SRC_URI="https://github.com/openstreetmap/merkaartor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- #SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${COMMIT}"
-
- 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"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-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}"
-
-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="${ED}/usr"
- LIBDIR="${ED}/usr/$(get_libdir)"
- PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins"
- SHARE_DIR_PATH="/usr/share/${PN}"
- TRANSDIR_MERKAARTOR="${ED}/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
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/
@ 2023-05-28 18:28 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-05-28 18:28 UTC (permalink / raw
To: gentoo-commits
commit: 626bc6256e1834a8199611bec873d68a569d7379
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 16:25:34 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 28 18:28:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=626bc625
sci-geosciences/merkaartor: Fix build with >=exiv2-0.28
Closes: https://bugs.gentoo.org/906501
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/merkaartor-0.19.0-exiv2-0.28.patch | 50 ++++++++++++++++++++++
.../merkaartor/merkaartor-0.19.0-r1.ebuild | 5 ++-
2 files changed, 54 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000000000000..4f98b9a4fa36
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch
@@ -0,0 +1,50 @@
+From 1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
+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
index f0f4b1dbd195..c959fecd8c1c 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
@@ -45,7 +45,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
+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 )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/
@ 2024-10-21 17:58 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-10-21 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 32f2b98e9f02b90a652832a55498c662f77c56d3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 7 19:06:41 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 17:56:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f2b98e
sci-geosciences/merkaartor: Port to Qt6
Bug: https://bugs.gentoo.org/941138
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/merkaartor-0.20.0-GNUInstallDirs.patch | 44 ++++++++++
.../files/merkaartor-0.20.0-disable-git.patch | 13 +++
sci-geosciences/merkaartor/merkaartor-9999.ebuild | 94 ++++++++--------------
sci-geosciences/merkaartor/metadata.xml | 1 +
4 files changed, 90 insertions(+), 62 deletions(-)
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.20.0-GNUInstallDirs.patch b/sci-geosciences/merkaartor/files/merkaartor-0.20.0-GNUInstallDirs.patch
new file mode 100644
index 000000000000..202f4e0ed6e2
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.20.0-GNUInstallDirs.patch
@@ -0,0 +1,44 @@
+From 97fab944083c7a3a5716f1aaf40b9c62a3f84cf2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Sun, 26 May 2024 18:43:12 +0200
+Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for library installation path
+
+---
+ CMakeLists.txt | 10 ++++++++--
+ plugins/plugins.cmake | 2 ++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e107439d..50d82e1d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,8 +21,14 @@ project(merkaartor VERSION ${VCS_VERSION})
+ # compatibility.
+ # Using configure_file() allows us to store the metadata in a .cpp file, thus
+ # only rebuilding that one and linking.
+-set(SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/merkaartor)
+-set(LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/merkaartor)
++if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++ include(GNUInstallDirs)
++ set(SHARE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/merkaartor)
++ set(LIB_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/merkaartor)
++else()
++ set(SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/merkaartor)
++ set(LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/merkaartor)
++endif()
+ configure_file("${PROJECT_SOURCE_DIR}/cmake/build-metadata.cpp.in" "${PROJECT_BINARY_DIR}/build-metadata.cpp" @ONLY)
+
+ set(CMAKE_CXX_STANDARD 17)
+diff --git a/plugins/plugins.cmake b/plugins/plugins.cmake
+index 955be124..4c9fa499 100644
+--- a/plugins/plugins.cmake
++++ b/plugins/plugins.cmake
+@@ -1,6 +1,8 @@
+
+ if (APPLE)
+ set(PLUGINS_INSTALL_POSTFIX "merkaartor.app/Contents/plugins")
++elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++set(PLUGINS_INSTALL_POSTFIX "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/merkaartor/plugins")
+ else()
+ set(PLUGINS_INSTALL_POSTFIX "lib/merkaartor/plugins")
+ endif()
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.20.0-disable-git.patch b/sci-geosciences/merkaartor/files/merkaartor-0.20.0-disable-git.patch
new file mode 100644
index 000000000000..1f0188c86174
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.20.0-disable-git.patch
@@ -0,0 +1,13 @@
+Description: Don't use git for version information.
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: not-needed
+
+--- a/cmake/vcs.cmake
++++ b/cmake/vcs.cmake
+@@ -1,5 +1,5 @@
+
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
++if (EXISTS "${CMAKE_SOURCE_DIR}/.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/debian")
+ # If git directory is present, we require git executable and gather our info from git commands.
+ find_package(Git)
+ if (NOT ${GIT_FOUND})
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index f0f4b1dbd195..892191a4c37c 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 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
+inherit cmake xdg
-if [[ ${PV} != *9999 ]] ; then
+if [[ ${PV} != *9999* ]] ; then
SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
else
@@ -15,87 +14,58 @@ else
fi
DESCRIPTION="Qt based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+HOMEPAGE="https://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug exif gps libproxy webengine"
+IUSE="exif gps libproxy webengine zbar"
+# bundles qtsingleapplication again, unfortunately
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
+ dev-libs/protobuf:=
+ dev-qt/qt5compat:6
+ dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
+ dev-qt/qtnetworkauth:6
+ dev-qt/qtsvg:6
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] )
+ libproxy? ( >=net-libs/libproxy-0.5 )
+ webengine? ( dev-qt/qtwebengine:6[widgets] )
+ zbar? ( media-gfx/zbar )
"
RDEPEND="${DEPEND}"
BDEPEND="
- dev-qt/linguist-tools:5
+ dev-qt/qttools:6[linguist]
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
- }
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.20.0-disable-git.patch # downstream patch
+ # pending upstream PR: https://github.com/openstreetmap/merkaartor/pull/291
+ "${FILESDIR}"/${PN}-0.20.0-GNUInstallDirs.patch
+)
- if [[ -n "$(plocale_get_locales)" ]]; then
- plocale_for_each_disabled_locale my_rm_loc
- $(qt5_get_bindir)/lrelease src/src.pro || die
- fi
+src_prepare() {
+ # no Qt5 automagic, please
+ sed -e "/^ *find_package.*QT NAMES/s/Qt5 //" -i CMakeLists.txt || die
- # 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
+ cmake_src_prepare
}
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)
+ local mycmakeargs=(
+ -DGEOIMAGE=$(usex exif)
+ -DGPSD=$(usex gps)
+ -DLIBPROXY=$(usex libproxy)
+ -DWEBENGINE=$(usex webengine)
+ -DZBAR=$(usex zbar)
+ -DEXTRA_TESTS=OFF
)
- [[ ${PV} != *9999 ]] && myeqmakeargs+=( RELEASE=1 )
-
- eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro
-}
-src_install() {
- emake install INSTALL_ROOT="${D}"
+ cmake_src_configure
}
diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index 45f8b6b3867e..d312634d92a6 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
<flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> in some plugins</flag>
+ <flag name="zbar">Enable barcode support in MWalkingPapersBackground/GeoImage via <pkg>media-gfx/zbar</pkg></flag>
</use>
<upstream>
<remote-id type="github">openstreetmap/merkaartor</remote-id>
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-10-21 17:58 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-01 17:52 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-10-21 17:58 Andreas Sturmlechner
2023-05-28 18:28 Andreas Sturmlechner
2022-10-15 15:13 Sam James
2020-04-10 9:26 Andreas Sturmlechner
2018-12-29 23:52 Andreas Sturmlechner
2016-01-18 18:33 Amy Winston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox