gentoo auto-resync : 20:08:2023 - 21:42:17

3 files changed, 138 insertions, 1 deletions

diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index e4373cdc3d6d..02ee0bb7dedc 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,5 +1,6 @@
 AUX gpscorrelate-2.0-desktop-pass-validation.patch 242 BLAKE2B 65ca39f03eb9701473615485e9a5c6a475cfd2a247491dabb85638600c327a959e93925cad1a8e1bc160ed651fe3f346615d11ff65c2102c5a2bdd259bec973c SHA512 ce5628d6c92380f327af032848d8151e6b2b340ba23fa91e148dc5ebddbb6508af5b044daacac0921741687a3669f0d2b7195bea365e6c89870e2d96fc07c71c
+AUX gpscorrelate-2.0-exiv2-0.28.patch 4350 BLAKE2B e2cb4cbee092c41b62ca5bf9ef5a71de5c2b3633dcd2409edfce2bcada673df8d39cf4b71c6873d4b531ba9acf24b08fecb8d04421f4c800f20a564f44ae98d1 SHA512 18e9e415e08aa6e7508adf2aaa5198c6233654789b7e0b65758404f5fc4e504e4e1ba54c07fc70d8427259dcd29ee00b795a634f97842d5a068d1d8a1b4a49d2
 AUX gpscorrelate-2.0-respect-users-flags.patch 715 BLAKE2B 474c926867462219586634d382470b9096d674ee4e9dcbcd9fcb9edbd498b454bb9709b3f51435ad165199a75dec047494a8ca33da3c600716698ad206466b13 SHA512 05ecfddae24a884852cb6ffed2d5d0abf0249ef11c4b4f8cc5fe299604b0b635c1eb94115f8a976fc23306df944a860ef7b3fdf696894c285088159877ccf4f6
 DIST gpscorrelate-2.0.tar.gz 283797 BLAKE2B 8cee5b3c37fa758cbf665b9e7cfcc61d7ee73c4aebc0a660718812c598e9b362e76c746a8d6007080783a5d2c0b91eaf5d5c90f48072e6808d2409c6d2b5fbf4 SHA512 c4267b14b219118f2d56c064403a3a7bd74ef1d3af1e83bec6fe5b391bee80b3d69a0e52a834da9f615d9c54720ade28ea22ab8b6fac75c31c71fc5eb348f709
-EBUILD gpscorrelate-2.0.ebuild 975 BLAKE2B fdb4ced014aec070ded38c4074fe384ecffc737f6a2cd94e0a804cc9f687c5f3a4507c6906ee26b995689ba8d94f8bb2700b82df36cecc811b0c30972baf7f56 SHA512 cf052c3259a8ff6d265dad65e62c24ceb9f0a78aea7cbf9b74816e373be08767639a22b644c05153ff93a0e159fc4ad1bc1b5a922f5bf4d96844c88a1e2cdae9
+EBUILD gpscorrelate-2.0.ebuild 1025 BLAKE2B d49a397ece6a1a4f040ccc6d343acd7de04238602b54e209eedf94f619aac7a115a7abc8cf9da6f2d6610374e34a7309e59006e535b7a720d70f2d1992e6e200 SHA512 1eaf2fa50ff1a22357e0992496df6fc1251db75185c6a9aad2323d4ce8ffb83a0ffacae38f607ff48a1a3d6bb44cee972ebc94a1a6b891d3855347f88832b9c3
 MISC metadata.xml 357 BLAKE2B 394ec89ad70a468ef62c4354375a5c232ae755990ef84fbf78cdaa477172be4d01ca7ea3123f8030503d7f347e0033538c1fa3376b67938b2ef4f3be2628083c SHA512 bf05fb14f3ff6ae55facb4c43fba38c635a5ede64c238d471194eca9e1d74d388a0fd56b8a56ee9dca84100ce24786f1e957cad9af28d4e88240a557712a3183
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch
new file mode 100644
index 000000000000..f15032fd7c77
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch
@@ -0,0 +1,135 @@
+From 7c945a5c9116325dad795dbe9682c2c4a4dea2d9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 20 Aug 2023 18:57:43 +0200
+Subject: [PATCH] Fix build with >=exiv2-0.28
+
+Fixes https://github.com/dfandrich/gpscorrelate/issues/22
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ exif-gps.cpp | 37 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 37 insertions(+)
+
+diff --git a/exif-gps.cpp b/exif-gps.cpp
+index d464d62..71b46ef 100644
+--- a/exif-gps.cpp
++++ b/exif-gps.cpp
+@@ -44,6 +44,7 @@
+ #include "exiv2/image.hpp"
+ #include "exiv2/exif.hpp"
+ #include "exiv2/error.hpp"
++#include "exiv2/version.hpp"
+ 
+ #include "gpsstructure.h"
+ #include "exif-gps.h"
+@@ -97,7 +98,11 @@ int main(int argc, char* argv[])
+ char* ReadExifDate(const char* File, int* IncludesGPS)
+ {
+ 	// Open and read the file.
++#if EXIV2_TEST_VERSION(0, 28, 0)
++	Exiv2::Image::UniquePtr Image;
++#else
+ 	Exiv2::Image::AutoPtr Image;
++#endif
+ 
+ 	try {
+ 		Image = Exiv2::ImageFactory::open(File);
+@@ -154,7 +159,11 @@ char* ReadExifData(const char* File, double* Lat, double* Long, double* Elev, in
+ 	// much more data than the last, specifically
+ 	// for display purposes. For the GUI version.
+ 	// Open and read the file.
++#if EXIV2_TEST_VERSION(0, 28, 0)
++	Exiv2::Image::UniquePtr Image;
++#else
+ 	Exiv2::Image::AutoPtr Image;
++#endif
+ 
+ 	try {
+ 		Image = Exiv2::ImageFactory::open(File);
+@@ -273,7 +282,11 @@ char* ReadExifData(const char* File, double* Lat, double* Long, double* Elev, in
+ 
+ 		// Is the altitude below sea level? If so, negate the value.
+ 		GPSData = ExifRead["Exif.GPSInfo.GPSAltitudeRef"];
++#if EXIV2_TEST_VERSION(0, 28, 0)
++		if (GPSData.count() >= 1 && GPSData.toUint32() == 1)
++#else
+ 		if (GPSData.count() >= 1 && GPSData.toLong() == 1)
++#endif
+ 		{
+ 				// Negate the elevation.
+ 				*Elev = -*Elev;
+@@ -292,7 +305,11 @@ char* ReadGPSTimestamp(const char* File, char* DateStamp, char* TimeStamp, int*
+ 	// much more data than the last, specifically
+ 	// for display purposes. For the GUI version.
+ 	// Open and read the file.
++#if EXIV2_TEST_VERSION(0, 28, 0)
++	Exiv2::Image::UniquePtr Image;
++#else
+ 	Exiv2::Image::AutoPtr Image;
++#endif
+ 
+ 	try {
+ 		Image = Exiv2::ImageFactory::open(File);
+@@ -463,7 +480,11 @@ int WriteGPSData(const char* File, const struct GPSPoint* Point,
+ 	struct utimbuf utb;
+ 	if (NoChangeMtime)
+ 		stat(File, &statbuf);
++#if EXIV2_TEST_VERSION(0, 28, 0)
++	Exiv2::Image::UniquePtr Image;
++#else
+ 	Exiv2::Image::AutoPtr Image;
++#endif
+ 
+ 	try {
+ 		Image = Exiv2::ImageFactory::open(File);
+@@ -493,7 +514,11 @@ int WriteGPSData(const char* File, const struct GPSPoint* Point,
+ 	// Do all the easy constant ones first.
+ 	// GPSVersionID tag: standard says it should be four bytes: 02 02 00 00
+ 	//  (and, must be present).
++#if EXIV2_TEST_VERSION(0, 28, 0)
++	Exiv2::Value::UniquePtr Value = Exiv2::Value::create(Exiv2::unsignedByte);
++#else
+ 	Exiv2::Value::AutoPtr Value = Exiv2::Value::create(Exiv2::unsignedByte);
++#endif
+ 	Value->read("2 2 0 0");
+ 	replace(ExifToWrite, Exiv2::ExifKey("Exif.GPSInfo.GPSVersionID"), Value.get());
+ 	// Datum: the datum of the measured data. The default is WGS-84.
+@@ -643,7 +668,11 @@ int WriteFixedDatestamp(const char* File, time_t Time)
+ 	struct utimbuf utb;
+ 	stat(File, &statbuf);
+ 
++#if EXIV2_TEST_VERSION(0, 28, 0)
++	Exiv2::Image::UniquePtr Image;
++#else
+ 	Exiv2::Image::AutoPtr Image;
++#endif
+ 
+ 	try {
+ 		Image = Exiv2::ImageFactory::open(File);
+@@ -672,7 +701,11 @@ int WriteFixedDatestamp(const char* File, time_t Time)
+ 	ExifToWrite.erase(ExifToWrite.findKey(Exiv2::ExifKey("Exif.GPSInfo.GPSDateStamp")));
+ 	ExifToWrite["Exif.GPSInfo.GPSDateStamp"] = ScratchBuf;
+ 
++#if EXIV2_TEST_VERSION(0, 28, 0)
++	Exiv2::Value::UniquePtr Value = Exiv2::Value::create(Exiv2::unsignedRational);
++#else
+ 	Exiv2::Value::AutoPtr Value = Exiv2::Value::create(Exiv2::unsignedRational);
++#endif
+ 	snprintf(ScratchBuf, sizeof(ScratchBuf), "%d/1 %d/1 %d/1",
+ 			TimeStamp.tm_hour, TimeStamp.tm_min,
+ 			TimeStamp.tm_sec);
+@@ -705,7 +738,11 @@ int RemoveGPSExif(const char* File, int NoChangeMtime, int NoWriteExif)
+ 		stat(File, &statbuf);
+ 
+ 	// Open the file and start reading.
++#if EXIV2_TEST_VERSION(0, 28, 0)
++	Exiv2::Image::UniquePtr Image;
++#else
+ 	Exiv2::Image::AutoPtr Image;
++#endif
+ 	
+ 	try {
+ 		Image = Exiv2::ImageFactory::open(File);
+-- 
+2.41.0
+
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild
index 982684d854bb..f2d065010f21 100644
--- a/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild
@@ -29,6 +29,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-desktop-pass-validation.patch"
 	"${FILESDIR}/${P}-respect-users-flags.patch"
+	"${FILESDIR}/${P}-exiv2-0.28.patch" # bug 906498
 )
 
 src_compile() {