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

[Jaroslav Lichtblau]

    Date: Friday, July 10, 2020 @ 16:45:11
  Author: jlichtblau
Revision: 663116

upgpkg: qmapshack 1.15.0-1 - new upstream release

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-10 16:26:39 UTC (rev 663115)
+++ PKGBUILD	2020-07-10 16:45:11 UTC (rev 663116)
@@ -3,8 +3,8 @@
 # Contributor: Martin Brodbeck <martin at brodbeck-online.de>
 
 pkgname=qmapshack
-pkgver=1.14.1
-pkgrel=2
+pkgver=1.15.0
+pkgrel=1
 pkgdesc='Plan your next outdoor trip'
 arch=('x86_64')
 url='https://github.com/Maproom/qmapshack/wiki'
@@ -14,15 +14,18 @@
 makedepends=('cmake' 'patch')
 source=($pkgname-$pkgver.tar.gz::https://github.com/Maproom/$pkgname/archive/V_$pkgver.tar.gz
         FindPROJ4.patch
-        FindQuaZip5.patch)
-sha256sums=('76f64185fc4620da6d9b71998edefcb9091eff1c3486626f87e4f30d444be623'
+        FindQuaZip5.patch
+        qmapshack-qt5.15-compile.patch)
+sha256sums=('a3a470657a66a21a59e812dd6f9351845ce3300c00c25622dcb4a3818ed884f2'
             '1ffb847b098fedf01e347971da33c58b3fbf1a0f27205d48f6eb52206e228046'
-            '23f32e58daa7c69072ea59465f0541e86dcff3085e4e73a948713a02ae421889')
+            '23f32e58daa7c69072ea59465f0541e86dcff3085e4e73a948713a02ae421889'
+            'd4ecc3a27b35308511ddbe56d71a4d63289310e5f58f5152fba156259b08fdd9')
 
 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() {

Added: qmapshack-qt5.15-compile.patch
===================================================================
--- qmapshack-qt5.15-compile.patch	                        (rev 0)
+++ qmapshack-qt5.15-compile.patch	2020-07-10 16:45:11 UTC (rev 663116)
@@ -0,0 +1,67 @@
+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)