Attachment 243169 Details for Bug 272311 – graphics/qgis: make compatible with exiv2 0.28

[patch] graphics/qgis: make compatible with exiv2 0.28

0005-graphics-qgis-make-compatible-with-exiv2-0.28.patch (text/plain), 2.92 KB, created by Matthias Andree on 2023-07-03 09:55:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2023-07-03 09:55:30 UTC

Size: 2.92 KB

patch

obsolete

>From 264e8c4e9dc1c84190d7ddb8f07a7c18d0255c8d Mon Sep 17 00:00:00 2001
>From: Matthias Andree <mandree@FreeBSD.org>
>Date: Mon, 3 Jul 2023 02:02:57 +0200
>Subject: [PATCH 5/7] graphics/qgis: make compatible with exiv2 0.28
>
>PR:		272311
>---
> graphics/qgis/Makefile                        |  2 +-
> .../patch-src_core_raster_qgsexiftools.cpp    | 38 +++++++++++++++++++
> graphics/qgis/pkg-plist                       |  1 +
> 3 files changed, 40 insertions(+), 1 deletion(-)
> create mode 100644 graphics/qgis/files/patch-src_core_raster_qgsexiftools.cpp
>
>diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
>index cc50667175e1..577be63caa9d 100644
>--- a/graphics/qgis/Makefile
>+++ b/graphics/qgis/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	qgis
> DISTVERSION=	3.30.3
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	graphics geography
> MASTER_SITES=	https://qgis.org/downloads/
> 
>diff --git a/graphics/qgis/files/patch-src_core_raster_qgsexiftools.cpp b/graphics/qgis/files/patch-src_core_raster_qgsexiftools.cpp
>new file mode 100644
>index 000000000000..20e191c481ee
>--- /dev/null
>+++ b/graphics/qgis/files/patch-src_core_raster_qgsexiftools.cpp
>@@ -0,0 +1,38 @@
>+--- src/core/raster/qgsexiftools.cpp.orig	2023-05-26 12:01:43 UTC
>++++ src/core/raster/qgsexiftools.cpp
>+@@ -66,7 +66,7 @@ QVariant decodeXmpData( const QString &key, Exiv2::Xmp
>+       case Exiv2::signedLong:
>+       case Exiv2::unsignedLongLong:
>+       case Exiv2::signedLongLong:
>+-        val = QVariant::fromValue( it->toLong() );
>++        val = QVariant::fromValue( it->toInt64() );
>+         break;
>+ 
>+       case Exiv2::tiffDouble:
>+@@ -80,7 +80,7 @@ QVariant decodeXmpData( const QString &key, Exiv2::Xmp
>+       case Exiv2::signedByte:
>+       case Exiv2::tiffIfd:
>+       case Exiv2::tiffIfd8:
>+-        val = QVariant::fromValue( static_cast< int >( it->toLong() ) );
>++        val = QVariant::fromValue( static_cast< int >( it->toInt64() ) );
>+         break;
>+ 
>+       case Exiv2::date:
>+@@ -182,7 +182,7 @@ QVariant decodeExifData( const QString &key, Exiv2::Ex
>+       case Exiv2::signedLong:
>+       case Exiv2::unsignedLongLong:
>+       case Exiv2::signedLongLong:
>+-        val = QVariant::fromValue( it->toLong() );
>++        val = QVariant::fromValue( it->toInt64() );
>+         break;
>+ 
>+       case Exiv2::tiffDouble:
>+@@ -196,7 +196,7 @@ QVariant decodeExifData( const QString &key, Exiv2::Ex
>+       case Exiv2::signedByte:
>+       case Exiv2::tiffIfd:
>+       case Exiv2::tiffIfd8:
>+-        val = QVariant::fromValue( static_cast< int >( it->toLong() ) );
>++        val = QVariant::fromValue( static_cast< int >( it->toInt64() ) );
>+         break;
>+ 
>+       case Exiv2::date:
>diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist
>index cc924eee08c8..72b0b5127c61 100644
>--- a/graphics/qgis/pkg-plist
>+++ b/graphics/qgis/pkg-plist
>@@ -1,5 +1,6 @@
> %%SERVER%%bin/admin.sld
> bin/qgis
>+bin/qgis_bench
> %%SERVER%%bin/qgis_mapserv.fcgi
> %%SERVER%%bin/qgis_mapserver
> bin/qgis_process
>-- 
>2.41.0
>

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 272311: 243098 | 243100 | 243103 | 243104 | 243106 | 243111 | 243124 | 243125 | 243135 | 243136 | 243137 | 243138 | 243139 | 243140 | 243141 | 243142 | 243143 | 243144 | 243145 | 243146 | 243147 | 243148 | 243154 | 243155 | 243156 | 243157 | 243158 | 243159 | 243160 | 243166 | 243167 | 243168 | 243169 | 243170 | 243171 | 243172 | 243175 | 243176