Attachment #243169 for bug #272311

View | Details | Raw Unified | Return to bug 272311 | Differences between

and this patch

Lines 1-6 Link Here

(-)b/graphics/qgis/Makefile (-1 / +1 lines)
1	PORTNAME= qgis	1	PORTNAME= qgis
2	DISTVERSION= 3.30.3	2	DISTVERSION= 3.30.3
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= graphics geography	4	CATEGORIES= graphics geography
5	MASTER_SITES= https://qgis.org/downloads/	5	MASTER_SITES= https://qgis.org/downloads/
6		6




--- 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:

Lines 1-5 Link Here

(-)b/graphics/qgis/pkg-plist (-1 / +1 lines)
1	%%SERVER%%bin/admin.sld	1	%%SERVER%%bin/admin.sld
2	bin/qgis	2	bin/qgis
		3	bin/qgis_bench
3	%%SERVER%%bin/qgis_mapserv.fcgi	4	%%SERVER%%bin/qgis_mapserv.fcgi
4	%%SERVER%%bin/qgis_mapserver	5	%%SERVER%%bin/qgis_mapserver
5	bin/qgis_process	6	bin/qgis_process
6	-

Return to bug 272311

Added Link Here

(-)b/graphics/qgis/files/patch-src_core_raster_qgsexiftools.cpp (+38 lines)
1	--- src/core/raster/qgsexiftools.cpp.orig 2023-05-26 12:01:43 UTC
2	+++ src/core/raster/qgsexiftools.cpp
3	@@ -66,7 +66,7 @@ QVariant decodeXmpData( const QString &key, Exiv2::Xmp
4	case Exiv2::signedLong:
5	case Exiv2::unsignedLongLong:
6	case Exiv2::signedLongLong:
7	- val = QVariant::fromValue( it->toLong() );
8	+ val = QVariant::fromValue( it->toInt64() );
9	break;
10
11	case Exiv2::tiffDouble:
12	@@ -80,7 +80,7 @@ QVariant decodeXmpData( const QString &key, Exiv2::Xmp
13	case Exiv2::signedByte:
14	case Exiv2::tiffIfd:
15	case Exiv2::tiffIfd8:
16	- val = QVariant::fromValue( static_cast< int >( it->toLong() ) );
17	+ val = QVariant::fromValue( static_cast< int >( it->toInt64() ) );
18	break;
19
20	case Exiv2::date:
21	@@ -182,7 +182,7 @@ QVariant decodeExifData( const QString &key, Exiv2::Ex
22	case Exiv2::signedLong:
23	case Exiv2::unsignedLongLong:
24	case Exiv2::signedLongLong:
25	- val = QVariant::fromValue( it->toLong() );
26	+ val = QVariant::fromValue( it->toInt64() );
27	break;
28
29	case Exiv2::tiffDouble:
30	@@ -196,7 +196,7 @@ QVariant decodeExifData( const QString &key, Exiv2::Ex
31	case Exiv2::signedByte:
32	case Exiv2::tiffIfd:
33	case Exiv2::tiffIfd8:
34	- val = QVariant::fromValue( static_cast< int >( it->toLong() ) );
35	+ val = QVariant::fromValue( static_cast< int >( it->toInt64() ) );
36	break;
37
38	case Exiv2::date: