Attachment 227704 Details for Bug 258300 – The patch

[patch] The patch

merkaartor_0.19.0.patch (text/plain), 9.57 KB, created by Oliver Heesakkers on 2021-09-06 08:40:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Heesakkers

Created: 2021-09-06 08:40:59 UTC

Size: 9.57 KB

patch

obsolete

>From a4a8380f30a0842814a889e67c851ff1926af89c Mon Sep 17 00:00:00 2001
>From: Charlie Root <root@fbsd12virt.heesakkers.info>
>Date: Mon, 30 Aug 2021 18:14:56 +0200
>Subject: [PATCH] Update to recently released Merkaartor 0.19.0
>
>Poudriere tested 12.2 and 13.0 amd64
>---
> astro/merkaartor/Makefile                     |  4 +-
> astro/merkaartor/distinfo                     |  5 ++-
> astro/merkaartor/files/patch-git_a6f3d9f2     | 22 -----------
> astro/merkaartor/files/patch-git_e6d015a9     | 39 -------------------
> .../patch-src-ImportExport-ImportExportGdal.h | 11 ------
> .../files/patch-src_Features_Feature.h        | 10 -----
> .../patch-src_Layers_LicenseDisplayDialog.ui  | 11 ------
> astro/merkaartor/files/patch-src_src.pro      | 13 -------
> astro/merkaartor/pkg-plist                    | 31 +++++++++++----
> 9 files changed, 29 insertions(+), 117 deletions(-)
> delete mode 100644 astro/merkaartor/files/patch-git_a6f3d9f2
> delete mode 100644 astro/merkaartor/files/patch-git_e6d015a9
> delete mode 100644 astro/merkaartor/files/patch-src-ImportExport-ImportExportGdal.h
> delete mode 100644 astro/merkaartor/files/patch-src_Features_Feature.h
> delete mode 100644 astro/merkaartor/files/patch-src_Layers_LicenseDisplayDialog.ui
> delete mode 100644 astro/merkaartor/files/patch-src_src.pro
>
>diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
>index 893fdb7b9..3003451f7 100644
>--- a/astro/merkaartor/Makefile
>+++ b/astro/merkaartor/Makefile
>@@ -1,8 +1,8 @@
> # Created by: Slaven Rezic <slaven@rezic.de>
> 
> PORTNAME=	merkaartor
>-PORTVERSION=	0.18.2
>-PORTREVISION=	31
>+PORTVERSION=	0.19.0
>+PORTREVISION=	0
> CATEGORIES=	astro
> 
> MAINTAINER=	dev2@heesakkers.info
>diff --git a/astro/merkaartor/distinfo b/astro/merkaartor/distinfo
>index 80e2761ac..01ecd02b3 100644
>--- a/astro/merkaartor/distinfo
>+++ b/astro/merkaartor/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (openstreetmap-merkaartor-0.18.2_GH0.tar.gz) = 9e04d554ebc4f9999d0dd6d0cdf4e50a38135f34ded68f5dfd8cb295e20bf508
>-SIZE (openstreetmap-merkaartor-0.18.2_GH0.tar.gz) = 6267866
>+TIMESTAMP = 1630179895
>+SHA256 (openstreetmap-merkaartor-0.19.0_GH0.tar.gz) = cc518739fa7b11dde7625b68400e6eedbee6d2f226e2b0971779daeb7ac3b736
>+SIZE (openstreetmap-merkaartor-0.19.0_GH0.tar.gz) = 5665947
>diff --git a/astro/merkaartor/files/patch-git_a6f3d9f2 b/astro/merkaartor/files/patch-git_a6f3d9f2
>deleted file mode 100644
>index 77e396699..000000000
>--- a/astro/merkaartor/files/patch-git_a6f3d9f2
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-From a6f3d9f2133e3656b9c63441c600a7219b54450c Mon Sep 17 00:00:00 2001
>-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
>-Date: Mon, 27 Jul 2015 11:01:52 +0200
>-Subject: [PATCH] Fixed version info in tarballs.
>-
>---- src/Config.pri.orig	2015-07-19 14:50:09 UTC
>-+++ src/Config.pri
>-@@ -1,7 +1,12 @@
>- # see http://merkaartor.be/wiki/merkaartor/Compiling
>- 
>--REVISION = $$system(git describe --tags)
>--VERSION = $$system(git describe --tags | sed "'s/-g.*//;s/-/./g'")
>-+REVISION = $$system(git describe --tags 2> /dev/null)
>-+VERSION = $$system(git describe --tags 2> /dev/null | sed "'s/-g.*//;s/-/./g'")
>-+isEmpty( REVISION ) {
>-+	REVISION = $$system(head -n 1 ../CHANGELOG | sed "'s/^v//'")
>-+	VERSION = $$REVISION
>-+}
>-+
>- ARCH=""
>- BITS=""
>- win32 {
>diff --git a/astro/merkaartor/files/patch-git_e6d015a9 b/astro/merkaartor/files/patch-git_e6d015a9
>deleted file mode 100644
>index 2b6e58ebd..000000000
>--- a/astro/merkaartor/files/patch-git_e6d015a9
>+++ /dev/null
>@@ -1,39 +0,0 @@
>-commit e6d015a953a163f174e09a9b50c9bb8bc19593e4
>-Author: Ladislav LÃ¡ska <krakonos@krakonos.org>
>-Date:   Mon Jul 27 14:22:37 2015 +0200
>-
>-    Fixed compilation issues with GEOIMAGE=1 and Qt5.
>-
>---- src/Docks/GeoImageDock.cpp.orig	2015-07-19 14:50:09 UTC
>-+++ src/Docks/GeoImageDock.cpp
>-@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
>- 
>-     Exiv2::Image::AutoPtr image;
>-     Exiv2::ExifData exifData;
>--    bool positionValid = FALSE;
>-+    bool positionValid = false;
>- 
>-     Layer *theLayer;
>-     if (photoLayer == NULL) {
>-@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString 
>-     double lat = 0.0, lon = 0.0;
>-     Exiv2::Image::AutoPtr image;
>-     Exiv2::ExifData exifData;
>--    bool positionValid = FALSE;
>-+    bool positionValid = false;
>- 
>-     if (!QFile::exists(file)) {
>-         return pos;
>---- src/Docks/GeoImageDock.h.orig	2015-07-19 14:50:09 UTC
>-+++ src/Docks/GeoImageDock.h
>-@@ -7,8 +7,8 @@
>- #include <QtWidgets/QDockWidget>
>- #include <QtGui/QMouseEvent>
>- #include <QtWidgets/QShortcut>
>--#include <exiv2/image.hpp>
>--#include <exiv2/exif.hpp>
>-+#include <exiv2/exiv2.hpp>
>-+#include <QDrag>
>- 
>- class ImageView;
>- 
>diff --git a/astro/merkaartor/files/patch-src-ImportExport-ImportExportGdal.h b/astro/merkaartor/files/patch-src-ImportExport-ImportExportGdal.h
>deleted file mode 100644
>index 349b09c34..000000000
>--- a/astro/merkaartor/files/patch-src-ImportExport-ImportExportGdal.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/ImportExport/ImportExportGdal.h.orig	2015-07-19 14:50:09 UTC
>-+++ src/ImportExport/ImportExportGdal.h
>-@@ -19,7 +19,7 @@
>- #include <gdal_priv.h>
>- #include <gdal_version.h>
>- 
>--#if GDAL_VERSION_MAJOR == 2
>-+#if GDAL_VERSION_MAJOR >= 2
>- #define GDAL2
>- #endif
>- 
>diff --git a/astro/merkaartor/files/patch-src_Features_Feature.h b/astro/merkaartor/files/patch-src_Features_Feature.h
>deleted file mode 100644
>index fdfdc7767..000000000
>--- a/astro/merkaartor/files/patch-src_Features_Feature.h
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- src/Features/Feature.h.orig	2020-05-21 10:34:19 UTC
>-+++ src/Features/Feature.h
>-@@ -10,6 +10,7 @@ class Feature;
>- 
>- #include <QtCore/QString>
>- #include <QList>
>-+#include <QPainterPath>
>- 
>- #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x))
>- #define CAST_NODE(x) (dynamic_cast<Node*>(x))
>diff --git a/astro/merkaartor/files/patch-src_Layers_LicenseDisplayDialog.ui b/astro/merkaartor/files/patch-src_Layers_LicenseDisplayDialog.ui
>deleted file mode 100644
>index 8e7362757..000000000
>--- a/astro/merkaartor/files/patch-src_Layers_LicenseDisplayDialog.ui
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/Layers/LicenseDisplayDialog.ui.orig	2018-12-11 15:26:59 UTC
>-+++ src/Layers/LicenseDisplayDialog.ui
>-@@ -43,7 +43,7 @@
>-   <customwidget>
>-    <class>QWebView</class>
>-    <extends>QWidget</extends>
>--   <header>QtWebKit/QWebView</header>
>-+   <header>QtWebKitWidgets/QWebView</header>
>-   </customwidget>
>-  </customwidgets>
>-  <resources/>
>diff --git a/astro/merkaartor/files/patch-src_src.pro b/astro/merkaartor/files/patch-src_src.pro
>deleted file mode 100644
>index 801f74ca6..000000000
>--- a/astro/merkaartor/files/patch-src_src.pro
>+++ /dev/null
>@@ -1,13 +0,0 @@
>-Link against the right library name for archivers/quazip-qt5.
>---- src/src.pro.orig	2015-07-19 14:50:09 UTC
>-+++ src/src.pro
>-@@ -15,7 +15,8 @@ isEmpty(SYSTEM_QUAZIP) {
>-   DEFINES += QUAZIP_STATIC
>-   include(../3rdparty/quazip-0.7/quazip.pri)
>- } else {
>--  LIBS += -lquazip
>-+  CONFIG += link_pkgconfig
>-+  PKGCONFIG += quazip1-qt5
>- }
>- 
>- #Qt Version
>diff --git a/astro/merkaartor/pkg-plist b/astro/merkaartor/pkg-plist
>index 79651a7d7..956eb0334 100644
>--- a/astro/merkaartor/pkg-plist
>+++ b/astro/merkaartor/pkg-plist
>@@ -3,27 +3,44 @@ lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so
> lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so
> lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
> lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
>-share/applications/merkaartor.desktop
>+share/applications/org.merkaartor.merkaartor.desktop
>+share/icons/hicolor/22x22/apps/merkaartor.png
>+share/icons/hicolor/8x8/apps/merkaartor.png
>+share/icons/hicolor/64x64/apps/merkaartor.png
>+share/icons/hicolor/192x192/apps/merkaartor.png
> share/icons/hicolor/48x48/apps/merkaartor.png
>+share/icons/hicolor/256x256/apps/merkaartor.png
>+share/icons/hicolor/42x42/apps/merkaartor.png
>+share/icons/hicolor/36x36/apps/merkaartor.png
>+share/icons/hicolor/24x24/apps/merkaartor.png
>+share/icons/hicolor/72x72/apps/merkaartor.png
>+share/icons/hicolor/32x32/apps/merkaartor.png
>+share/icons/hicolor/16x16/apps/merkaartor.png
>+share/icons/hicolor/96x96/apps/merkaartor.png
>+share/icons/hicolor/80x80/apps/merkaartor.png
>+share/icons/hicolor/128x128/apps/merkaartor.png
>+share/icons/hicolor/512x512/apps/merkaartor.png
>+share/icons/hicolor/40x40/apps/merkaartor.png
>+share/metainfo/org.merkaartor.merkaartor.appdata.xml
> %%DATADIR%%/BookmarksList.xml
> %%DATADIR%%/Projections.xml
> %%DATADIR%%/TmsServersList.xml
> %%DATADIR%%/WmsServersList.xml
>-%%NLS%%%%DATADIR%%/translations/merkaartor_ar.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_cs.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_de.qm
>+%%NLS%%%%DATADIR%%/translations/merkaartor_en.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_es.qm
>+%%NLS%%%%DATADIR%%/translations/merkaartor_fi.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_fr.qm
>+%%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm
>+%%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm
>+%%NLS%%%%DATADIR%%/translations/merkaartor_id_ID.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_it.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_ja.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_nl.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_pl.qm
>-%%NLS%%%%DATADIR%%/translations/merkaartor_pt.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_pt_BR.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_ru.qm
>-%%NLS%%%%DATADIR%%/translations/merkaartor_sk.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_sv.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_uk.qm
>-%%NLS%%%%DATADIR%%/translations/merkaartor_et.qm
>-%%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm
>-%%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm
>+%%NLS%%%%DATADIR%%/translations/merkaartor_zh_TW.qm
>-- 
>2.32.0
>

Flags:

dev2: maintainer-approval+

Actions: View | Diff

Attachments on bug 258300: 227704