[Git][debian-gis-team/merkaartor][master] Backport upstream commit ba8b73e6b3372a21305640baca07a991f77db119 and commit...

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / merkaartor


Commits:
cb9b0efb by Bas Couwenberg at 2024-02-25T13:25:29+01:00
Backport upstream commit ba8b73e6b3372a21305640baca07a991f77db119 and commit 1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd to build also with Exiv2 0.28+; patches upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch and upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch.

- - - - -


5 changed files:

- debian/changelog
- debian/patches/qmake-config-nostrip.patch
- debian/patches/series
- + debian/patches/upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch
- + debian/patches/upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,19 @@
 merkaartor (0.19.0+ds-5) UNRELEASED; urgency=medium
 
   * Team upload.
+
+  [ Bas Couwenberg ]
   * Use execute_after instead of override in rules file.
   * Enable Salsa CI.
   * Drop unused libspatialite-dev build dependency.
   * Replace pkg-config build dependency with pkgconf.
 
+  [ Pino Toscano ]
+  * Backport upstream commit ba8b73e6b3372a21305640baca07a991f77db119 and
+    commit 1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd to build also with Exiv2
+    0.28+; patches upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch
+    and upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch.
+
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 12 Aug 2023 21:48:43 +0200
 
 merkaartor (0.19.0+ds-4) unstable; urgency=medium


=====================================
debian/patches/qmake-config-nostrip.patch
=====================================
@@ -22,7 +22,7 @@ Forwarded: not-needed
  QT_VERSION = $$[QT_VERSION]
 --- a/plugins/common.pri
 +++ b/plugins/common.pri
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ QT_VER_MIN = $$member(QT_VERSION, 1)
  
  MERKAARTOR_SRC_DIR = $$PWD/..
  
@@ -43,7 +43,7 @@ Forwarded: not-needed
  # qtstyle
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -6,7 +6,7 @@
+@@ -6,7 +6,7 @@ include (Config.pri)
  #Custom config
  include(Custom.pri)
  


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
 qmake-config-nostrip.patch
 no-git-version.patch
+upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch
+upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch


=====================================
debian/patches/upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch
=====================================
@@ -0,0 +1,25 @@
+Description: Moved exiv2 header from GeoImageDock.h to .cpp
+Author: Ladislav Láska <krakonos at krakonos.org>
+Origin: https://github.com/openstreetmap/merkaartor/commit/ba8b73e6b3372a21305640baca07a991f77db119
+Forwarded: not-needed
+
+--- a/src/Docks/GeoImageDock.cpp
++++ b/src/Docks/GeoImageDock.cpp
+@@ -6,6 +6,7 @@
+ #include "LayerWidget.h"
+ #include "PropertiesDock.h"
+ #include "Global.h"
++#include <exiv2/exiv2.hpp>
+ 
+ #ifdef USE_ZBAR
+ #include <zbar.h>
+--- a/src/Docks/GeoImageDock.h
++++ b/src/Docks/GeoImageDock.h
+@@ -7,7 +7,6 @@
+ #include <QDockWidget>
+ #include <QMouseEvent>
+ #include <QShortcut>
+-#include <exiv2/exiv2.hpp>
+ #include <QDrag>
+ 
+ class ImageView;


=====================================
debian/patches/upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch
=====================================
@@ -0,0 +1,43 @@
+Description: Replaced use of AutoPtr with std::unique_ptr in GeoImageDock.cpp.
+Author: Ladislav Láska <krakonos at krakonos.org>
+Origin: https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd
+Forwarded: not-needed
+
+--- a/src/Docks/GeoImageDock.cpp
++++ b/src/Docks/GeoImageDock.cpp
+@@ -457,7 +457,7 @@ void GeoImageDock::loadImages(QStringLis
+     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(
+ {
+     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(
+ 
+ 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());



View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/cb9b0efbd7a896f1c425876f698fe49e56562f5b

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/cb9b0efbd7a896f1c425876f698fe49e56562f5b
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/20240225/31bdf55d/attachment-0001.htm>