[arch-commits] Commit in qmapshack/trunk (PKGBUILD qmapshack-qt5.15-compile.patch)

[Jaroslav Lichtblau]

    Date: Tuesday, December 1, 2020 @ 17:45:48
  Author: jlichtblau
Revision: 767183

upgpkg: qmapshack 1.15.1-1 - new upstream release

Modified:
  qmapshack/trunk/PKGBUILD
Deleted:
  qmapshack/trunk/qmapshack-qt5.15-compile.patch

--------------------------------+
 PKGBUILD                       |   13 ++-----
 qmapshack-qt5.15-compile.patch |   67 ---------------------------------------
 2 files changed, 5 insertions(+), 75 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-01 16:50:43 UTC (rev 767182)
+++ PKGBUILD	2020-12-01 17:45:48 UTC (rev 767183)
@@ -3,8 +3,8 @@
 # Contributor: Martin Brodbeck <martin at brodbeck-online.de>
 
 pkgname=qmapshack
-pkgver=1.15.0
-pkgrel=2
+pkgver=1.15.1
+pkgrel=1
 pkgdesc='Plan your next outdoor trip'
 arch=('x86_64')
 url='https://github.com/Maproom/qmapshack/wiki'
@@ -14,18 +14,15 @@
 makedepends=('cmake' 'patch')
 source=($pkgname-$pkgver.tar.gz::https://github.com/Maproom/$pkgname/archive/V_$pkgver.tar.gz
         FindPROJ4.patch
-        FindQuaZip5.patch
-        qmapshack-qt5.15-compile.patch)
-sha256sums=('a3a470657a66a21a59e812dd6f9351845ce3300c00c25622dcb4a3818ed884f2'
+        FindQuaZip5.patch)
+sha256sums=('91cc5cbb2fe74af424fd9dda143b126443566ebbb3c739e7dc2e154c89995187'
             '1ffb847b098fedf01e347971da33c58b3fbf1a0f27205d48f6eb52206e228046'
-            'be1bd07c47c15fedbadf932b4a0611aa34f61dfd693ec3c18bc5f73e607e5232'
-            'd4ecc3a27b35308511ddbe56d71a4d63289310e5f58f5152fba156259b08fdd9')
+            'be1bd07c47c15fedbadf932b4a0611aa34f61dfd693ec3c18bc5f73e607e5232')
 
 prepare() {
   cd "$pkgname-V_$pkgver"
   patch -Np1 -i "${srcdir}"/FindPROJ4.patch
   patch -Np1 -i "${srcdir}"/FindQuaZip5.patch
-  patch -Np1 -i "${srcdir}"/qmapshack-qt5.15-compile.patch
 }
 
 build() {

Deleted: qmapshack-qt5.15-compile.patch
===================================================================
--- qmapshack-qt5.15-compile.patch	2020-12-01 16:50:43 UTC (rev 767182)
+++ qmapshack-qt5.15-compile.patch	2020-12-01 17:45:48 UTC (rev 767183)
@@ -1,67 +0,0 @@
-diff -ruN qmapshack-V_1.15.0-orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp
---- qmapshack-V_1.15.0-orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp	2020-06-14 12:22:49.000000000 +0200
-+++ qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp	2020-07-10 17:05:41.238391674 +0200
-@@ -38,6 +38,7 @@
- 
- #include <QtWidgets>
- #include <QtXml>
-+#include <QPainterPath>
- 
- IGisItem::key_t CGisItemWpt::keyUserFocus;
- QMap<searchProperty_e, CGisItemWpt::fSearch> CGisItemWpt::keywordLambdaMap;
-diff -ruN qmapshack-V_1.15.0-orig/src/qmapshack/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp
---- qmapshack-V_1.15.0-orig/src/qmapshack/helpers/CDraw.cpp	2020-06-14 12:22:49.000000000 +0200
-+++ qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp	2020-07-10 17:06:06.955057192 +0200
-@@ -24,6 +24,7 @@
- #include <QImage>
- #include <QPointF>
- #include <QtMath>
-+#include <QPainterPath>
- 
- QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2);
- QPen CDraw::penBorderGray(Qt::lightGray, 2);
-diff -ruN qmapshack-V_1.15.0-orig/src/qmapshack/map/CMapIMG.cpp qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp
---- qmapshack-V_1.15.0-orig/src/qmapshack/map/CMapIMG.cpp	2020-06-14 12:22:49.000000000 +0200
-+++ qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp	2020-07-10 17:06:37.215055842 +0200
-@@ -33,6 +33,7 @@
- #include "units/IUnit.h"
- 
- #include <QtWidgets>
-+#include <QPainterPath>
- 
- #undef DEBUG_SHOW_SECT_DESC
- #undef DEBUG_SHOW_TRE_DATA
-diff -ruN qmapshack-V_1.15.0-orig/src/qmapshack/mouse/IMouseSelect.cpp qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp
---- qmapshack-V_1.15.0-orig/src/qmapshack/mouse/IMouseSelect.cpp	2020-06-14 12:22:49.000000000 +0200
-+++ qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp	2020-07-10 17:07:03.928387982 +0200
-@@ -23,6 +23,7 @@
- #include "mouse/IScrOpt.h"
- 
- #include <QtWidgets>
-+#include <QPainterPath>
- 
- IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter *mouse)
-     : IMouse(gis, canvas, mouse)
-diff -ruN qmapshack-V_1.15.0-orig/src/qmaptool/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp
---- qmapshack-V_1.15.0-orig/src/qmaptool/helpers/CDraw.cpp	2020-06-14 12:22:49.000000000 +0200
-+++ qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp	2020-07-10 17:07:57.688385582 +0200
-@@ -24,6 +24,7 @@
- #include <QImage>
- #include <QPointF>
- #include <QtMath>
-+#include <QPainterPath>
- 
- QPen CDraw::penBorderBlue(QColor(10,10,150,220),2);
- QPen CDraw::penBorderGray(Qt::lightGray,2);
-diff -ruN qmapshack-V_1.15.0-orig/src/qmaptool/overlay/COverlayCutMap.cpp qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp
---- qmapshack-V_1.15.0-orig/src/qmaptool/overlay/COverlayCutMap.cpp	2020-06-14 12:22:49.000000000 +0200
-+++ qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp	2020-07-10 17:08:27.798384237 +0200
-@@ -24,6 +24,8 @@
- 
- #include <functional>
- #include <QtWidgets>
-+#include <QPainterPath>
-+
- using std::bind;
- 
- static inline qreal sqr(qreal a)