[Git][debian-gis-team/qmapshack][master] 5 commits: Add upstream patch to fix FTBFS with Qt 5.15.
Bas Couwenberg
gitlab at salsa.debian.org
Mon Nov 16 11:48:25 GMT 2020
Bas Couwenberg pushed to branch master at Debian GIS Project / qmapshack
Commits:
9d46891e by Bas Couwenberg at 2020-11-16T11:34:24+01:00
Add upstream patch to fix FTBFS with Qt 5.15.
- - - - -
27b546ea by Bas Couwenberg at 2020-11-16T11:34:25+01:00
Add upstream patch to fix wrong timestamp when loading FIT.
- - - - -
91325e42 by Bas Couwenberg at 2020-11-16T12:09:32+01:00
Mark patches as Forwarded: not-needed.
- - - - -
0f5596b7 by Bas Couwenberg at 2020-11-16T12:09:32+01:00
Update lintian overrides.
- - - - -
fe46625a by Bas Couwenberg at 2020-11-16T12:09:32+01:00
Set distribution to unstable.
- - - - -
7 changed files:
- debian/changelog
- + debian/patches/0001-QMS-216-QMapShack-does-not-compile-with-Qt-5.15.patch
- + debian/patches/0001-QMS-262-Wrong-timestamp-when-loading-FIT.patch
- debian/patches/FindPROJ4.patch
- debian/patches/FindQuaZip5.patch
- debian/patches/series
- − debian/source/lintian-overrides
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,11 @@
-qmapshack (1.15.0-2) UNRELEASED; urgency=medium
+qmapshack (1.15.0-2) unstable; urgency=medium
* Bump watch file version to 4.
+ * Add upstream patch to fix FTBFS with Qt 5.15.
+ * Add upstream patch to fix wrong timestamp when loading FIT.
+ * Update lintian overrides.
- -- Bas Couwenberg <sebastic at debian.org> Fri, 06 Nov 2020 19:56:35 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 16 Nov 2020 11:34:35 +0100
qmapshack (1.15.0-1) unstable; urgency=medium
=====================================
debian/patches/0001-QMS-216-QMapShack-does-not-compile-with-Qt-5.15.patch
=====================================
@@ -0,0 +1,155 @@
+Description: QMapShack does not compile with Qt-5.15
+ .
+ Add `#include <QPainterPath>` whereever `QPainterPath` is used.
+ .
+ Additionally ran code beautifier
+Author: kiozen <oliver.eichler at gmx.de>
+Origin: https://github.com/Maproom/qmapshack/commit/1563ccbc7b1e912e1fced9e0a4a27a382415719d
+Bug: https://github.com/Maproom/qmapshack/issues/216
+
+--- a/src/qmapshack/gis/rte/router/CRouterOptimization.h
++++ b/src/qmapshack/gis/rte/router/CRouterOptimization.h
+@@ -19,9 +19,9 @@
+ #ifndef CROUTEROPTIMIZATION_H
+ #define CROUTEROPTIMIZATION_H
+ #include <gis/IGisLine.h>
++#include <QCoreApplication>
+ #include <QMap>
+ #include <QPolygonF>
+-#include <QCoreApplication>
+
+ class CRouterOptimization
+ {
+--- a/src/qmapshack/gis/wpt/CGisItemWpt.cpp
++++ b/src/qmapshack/gis/wpt/CGisItemWpt.cpp
+@@ -36,6 +36,7 @@
+ #include "mouse/IMouse.h"
+ #include "units/IUnit.h"
+
++#include <QPainterPath>
+ #include <QtWidgets>
+ #include <QtXml>
+
+--- a/src/qmapshack/helpers/CDraw.cpp
++++ b/src/qmapshack/helpers/CDraw.cpp
+@@ -22,6 +22,7 @@
+
+ #include <QDebug>
+ #include <QImage>
++#include <QPainterPath>
+ #include <QPointF>
+ #include <QtMath>
+
+--- a/src/qmapshack/map/CMapIMG.cpp
++++ b/src/qmapshack/map/CMapIMG.cpp
+@@ -32,6 +32,7 @@
+ #include "map/garmin/CGarminTyp.h"
+ #include "units/IUnit.h"
+
++#include <QPainterPath>
+ #include <QtWidgets>
+
+ #undef DEBUG_SHOW_SECT_DESC
+--- a/src/qmapshack/mouse/IMouseSelect.cpp
++++ b/src/qmapshack/mouse/IMouseSelect.cpp
+@@ -22,6 +22,7 @@
+ #include "mouse/IMouseSelect.h"
+ #include "mouse/IScrOpt.h"
+
++#include <QPainterPath>
+ #include <QtWidgets>
+
+ IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter *mouse)
+--- a/src/qmaptool/helpers/CDraw.cpp
++++ b/src/qmaptool/helpers/CDraw.cpp
+@@ -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);
+--- a/src/qmaptool/overlay/COverlayCutMap.cpp
++++ b/src/qmaptool/overlay/COverlayCutMap.cpp
+@@ -23,12 +23,14 @@
+ #include "overlay/COverlayCutMap.h"
+
+ #include <functional>
++#include <QPainterPath>
+ #include <QtWidgets>
++
+ using std::bind;
+
+ static inline qreal sqr(qreal a)
+ {
+- return a*a;
++ return a * a;
+ }
+
+ static inline qreal sqrlen(const QPointF &a)
+@@ -88,14 +90,14 @@ bool COverlayCutMap::drawFx(QPainter& p,
+ path.addRect(rectMap);
+ path.addPolygon(shape);
+
+- p.setPen(QPen(Qt::darkBlue,1));
++ p.setPen(QPen(Qt::darkBlue, 1));
+
+ p.setBrush((idxFocus1 == NOIDX) ? Qt::BDiagPattern : Qt::NoBrush);
+ p.drawPath(path);
+ }
+
+- QRectF dot1(0,0,5,5);
+- QRectF dot2(0,0,7,7);
++ QRectF dot1(0, 0, 5, 5);
++ QRectF dot2(0, 0, 7, 7);
+ const QPointF& pt1 = idxFocus1 != NOIDX ? shape[idxFocus1] : NOPOINTF;
+ const QPointF& pt2 = idxFocus2 != NOIDX ? shape[idxFocus2] : NOPOINTF;
+
+@@ -219,7 +221,7 @@ void COverlayCutMap::slotSetMode(mode_e
+
+ void COverlayCutMap::slotResetMask()
+ {
+- int res = QMessageBox::question(this, tr("Delete mask..."), tr("Are you sure to delete complete mask?"), QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes);
++ int res = QMessageBox::question(this, tr("Delete mask..."), tr("Are you sure to delete complete mask?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+ if(res != QMessageBox::Yes)
+ {
+ return;
+@@ -317,7 +319,7 @@ void COverlayCutMap::slotLoadShape()
+ qreal x, y;
+ in2 >> x >> y;
+
+- QPointF pt(x,y);
++ QPointF pt(x, y);
+ context->convertCoord2Map(pt);
+
+ region << pt;
+@@ -428,7 +430,7 @@ void COverlayCutMap::isCloseToLine(QPoin
+
+ QPointF b = line[0];
+ QPointF dbq = b - pt;
+- qreal dist = 30*30;
++ qreal dist = 30 * 30;
+
+ for (qint32 i = 1; i < count; ++i)
+ {
+@@ -439,8 +441,8 @@ void COverlayCutMap::isCloseToLine(QPoin
+
+ const QPointF dab = a - b;
+
+- const qreal inv_sqrlen = 1./sqrlen(dab);
+- const qreal t = (dab.x()*daq.x() + dab.y()*daq.y())*inv_sqrlen;
++ const qreal inv_sqrlen = 1. / sqrlen(dab);
++ const qreal t = (dab.x() * daq.x() + dab.y() * daq.y()) * inv_sqrlen;
+ if (t < 0.)
+ {
+ continue;
+@@ -448,7 +450,7 @@ void COverlayCutMap::isCloseToLine(QPoin
+ qreal current_dist;
+ if (t <= 1.)
+ {
+- current_dist = sqr(dab.x()*dbq.y() - dab.y()*dbq.x())*inv_sqrlen;
++ current_dist = sqr(dab.x() * dbq.y() - dab.y() * dbq.x()) * inv_sqrlen;
+ }
+ else//t>1.
+ {
=====================================
debian/patches/0001-QMS-262-Wrong-timestamp-when-loading-FIT.patch
=====================================
@@ -0,0 +1,18 @@
+Description: Wrong timestamp when loading FIT
+ .
+ Helper function did not return UTC timestamp.
+Author: kiozen <oliver.eichler at gmx.de>
+Origin: https://github.com/Maproom/qmapshack/commit/7922ac362692d882468f427729695c98255db201
+Bug: https://github.com/Maproom/qmapshack/issues/262
+
+--- a/src/qmapshack/gis/fit/serialization.cpp
++++ b/src/qmapshack/gis/fit/serialization.cpp
+@@ -45,7 +45,7 @@ static QDateTime toDateTime(quint32 time
+ {
+ QDateTime dateTime;
+ dateTime.setTime_t(sec1970to1990 + timestamp);
+- return dateTime;
++ return dateTime.toUTC();
+ }
+
+ static QString dateTimeAsString(quint32 timestamp)
=====================================
debian/patches/FindPROJ4.patch
=====================================
@@ -1,5 +1,6 @@
Description: Add FindPROJ4.cmake.
Origin: https://salsa.debian.org/debian/openorienteering-mapper/raw/debian/0.8.4-1/cmake/FindPROJ4.cmake
+Forwarded: not-needed
--- /dev/null
+++ b/cmake/Modules/FindPROJ4.cmake
=====================================
debian/patches/FindQuaZip5.patch
=====================================
@@ -1,5 +1,6 @@
Description: Add FindQuaZip5.cmake.
Origin: https://raw.githubusercontent.com/nomacs/nomacs/3.12/ImageLounge/cmake/FindQuaZip5.cmake
+Forwarded: not-needed
--- /dev/null
+++ b/cmake/Modules/FindQuaZip5.cmake
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,5 @@
FindPROJ4.patch
FindQuaZip5.patch
spelling-errors.patch
+0001-QMS-216-QMapShack-does-not-compile-with-Qt-5.15.patch
+0001-QMS-262-Wrong-timestamp-when-loading-FIT.patch
=====================================
debian/source/lintian-overrides deleted
=====================================
@@ -1,3 +0,0 @@
-# Not worth the effort
-testsuite-autopkgtest-missing
-
View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/-/compare/4a3bb56c64d28f103aff16e938e35521814cefdf...fe46625a456087f35ba74e4083e9e1ce05dfb383
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/-/compare/4a3bb56c64d28f103aff16e938e35521814cefdf...fe46625a456087f35ba74e4083e9e1ce05dfb383
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20201116/9d668971/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list