gentoo auto-resync : 22:05:2023 - 20:57:18

4 files changed, 87 insertions, 1 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index d4db5f07c09d..e50be5f3dbb6 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 7f7142a8fa0f..477582a1d970 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,6 @@
+AUX gwenview-23.04.1-exiv2-0.28.patch 3187 BLAKE2B 629cb3244d137be0a667ab85b90268d242474e766c069edddf83002b0a149a07e238d937d576a8797e068cec3d65488505a853814e923e80a3360c40842dd696 SHA512 d8c722c6cb3bc9bc988090454245871859067b402d42f04aa6c9300010fbb3a1d0fce2d2bf807222d6f48471c70c8f81e10e22835e36db4efe09b31e315cfeae
 DIST gwenview-22.12.3.tar.xz 6877352 BLAKE2B 8a1b363ef4587edee849cecec3902284e8c543846979d1e1fc956cfac3acfee6ed0638153d00d617aff9ac209b7627b558db430079323708156d49d6639ac15b SHA512 6dad3ec18dab6f0325070317aec7077c539ab69c3873b2148416e83b07daa581490245bf7e319a11575f767382deceba260a40263fc81a58554d4c31ce76c3dd
 DIST gwenview-23.04.1.tar.xz 6891664 BLAKE2B df1f370e6d7d5655f82ebdd826ff29f2b7b903a9856e3ab2305c8461f44a6577a5e3699933d393ce591b744f24b24741b277525416e6fbeb91ab2a73e6ab6821 SHA512 f1e39d4356d2afaa75d79635073324bcf9ea9c1d98b5bea593eeab92ba2acfd9df71399727d8f28e6d4c2fc99f484144ed89a2f38ba414845ebb2c2dc52a4f65
 EBUILD gwenview-22.12.3.ebuild 2796 BLAKE2B cd7ec4f23c602b10d89e7fb99c3de7850a7f034a129e7b4a302899f27b41f0c96909eede9f83d3aaf3f02b622fe9dc8802ade22630805a549ed25cc522fa1e81 SHA512 e987f385383abec17ef17bbcac31f860ea6b82452e58e36f54ae64703e9b1486ea8080151418b94db339c9781c66ae9941a0d28ee1ed64d31e4871e1919e7b7b
-EBUILD gwenview-23.04.1.ebuild 3004 BLAKE2B ff453df6046eb1379b4b2f6b363875723c4849ba046ba37681f3bdef2bce22d0e15fd2798656c9a4d27288fec430b106e74ccd2e902f9a8bca82ffb8daa7fdaa SHA512 e25c73fb7d9f7b40c7935eb5278a91504a3400909f1f17365522cd811e50b672c26d347ec74149b9d217fc43712d7265fc1b584530f89e5b1cc669bf6cded7c4
+EBUILD gwenview-23.04.1.ebuild 3066 BLAKE2B fc36cb904959b70cd311f0176820dc79307da6fea14a5c13bdcf83980c1f6d131cad495c3a28e1c71d6d1e41aa784f48ab02faf812916e13e7b27b69eb2e4c1f SHA512 4a11bc040b18c9e21643193202c0b69d8665bb61e137d896522b6f4ec09405b62f4b4e5987b94935772ef9dcf9dfb9cecbb8c2a46e547ca8e4ee71a79b0d28e6
 MISC metadata.xml 697 BLAKE2B 1b9d505c5490486b4a5b6e11447a8c0bf3d52f678f80a1825164458188cc4dee675b3f620818d6a402f7a4dc14498370efa0c08baacc7f78b928beda8f54b697 SHA512 4cf16eb17b7b10862f6268a2082dfaf808c00ae9342a2b864716a64c23dcfca6c837d39a2637d8b9a6c7ec391492b4c3fc7bfd5e21e81c97f21053ff4acd9aed
diff --git a/kde-apps/gwenview/files/gwenview-23.04.1-exiv2-0.28.patch b/kde-apps/gwenview/files/gwenview-23.04.1-exiv2-0.28.patch
new file mode 100644
index 000000000000..dde9b1c2321e
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-23.04.1-exiv2-0.28.patch
@@ -0,0 +1,83 @@
+From a7275c90bf51a352783c723116a716af419896f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
+Date: Sun, 21 May 2023 01:09:59 +0200
+Subject: [PATCH] Fix build with exiv2 >= 0.28
+
+---
+ lib/jpegcontent.cpp | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp
+index 284fb6e61..286333f69 100644
+--- a/lib/jpegcontent.cpp
++++ b/lib/jpegcontent.cpp
+@@ -301,7 +301,11 @@ Orientation JpegContent::orientation() const
+     if (it == d->mExifData.end() || it->count() == 0 || it->typeId() != Exiv2::unsignedShort) {
+         return NOT_AVAILABLE;
+     }
++#if EXIV2_TEST_VERSION(0,28,0)
++    return Orientation(it->toUint32());
++#else
+     return Orientation(it->toLong());
++#endif
+ }
+ 
+ int JpegContent::dotsPerMeterX() const
+@@ -321,7 +325,11 @@ int JpegContent::dotsPerMeter(const QString &keyName) const
+     if (it == d->mExifData.end()) {
+         return 0;
+     }
++#if EXIV2_TEST_VERSION(0,28,0)
++    int res = it->toUint32();
++#else
+     int res = it->toLong();
++#endif
+     QString keyVal = QStringLiteral("Exif.Image.") + keyName;
+     Exiv2::ExifKey keyResolution(keyVal.toLocal8Bit().data());
+     it = d->mExifData.findKey(keyResolution);
+@@ -337,9 +345,17 @@ int JpegContent::dotsPerMeter(const QString &keyName) const
+     const float INCHESPERMETER = (100. / 2.54);
+     switch (res) {
+     case 3: // dots per cm
++#if EXIV2_TEST_VERSION(0,28,0)
++        return int(it->toUint32() * 100);
++#else
+         return int(it->toLong() * 100);
++#endif
+     default: // dots per inch
++#if EXIV2_TEST_VERSION(0,28,0)
++        return int(it->toUint32() * INCHESPERMETER);
++#else
+         return int(it->toLong() * INCHESPERMETER);
++#endif
+     }
+ 
+     return 0;
+@@ -568,15 +584,24 @@ QImage JpegContent::thumbnail() const
+         auto it = d->mExifData.findKey(Exiv2::ExifKey("Exif.Canon.ThumbnailImageValidArea"));
+         // ensure ThumbnailImageValidArea actually specifies a rectangle, i.e. there must be 4 coordinates
+         if (it != d->mExifData.end() && it->count() == 4) {
++#if EXIV2_TEST_VERSION(0,28,0)
++            QRect validArea(QPoint(it->toUint32(0), it->toUint32(2)), QPoint(it->toUint32(1), it->toUint32(3)));
++#else
+             QRect validArea(QPoint(it->toLong(0), it->toLong(2)), QPoint(it->toLong(1), it->toLong(3)));
++#endif
+             image = image.copy(validArea);
+         } else {
+             // Unfortunately, Sony does not provide an exif tag that specifies the valid area of the
+             // embedded thumbnail. Need to derive it from the size of the preview image instead.
+             it = d->mExifData.findKey(Exiv2::ExifKey("Exif.Sony1.PreviewImageSize"));
+             if (it != d->mExifData.end() && it->count() == 2) {
++#if EXIV2_TEST_VERSION(0,28,0)
++                const long prevHeight = it->toUint32(0);
++                const long prevWidth = it->toUint32(1);
++#else
+                 const long prevHeight = it->toLong(0);
+                 const long prevWidth = it->toLong(1);
++#endif
+ 
+                 if (image.width() > 0 && prevWidth > 0) {
+                     const double scale = prevWidth / image.width();
+-- 
+GitLab
+
diff --git a/kde-apps/gwenview/gwenview-23.04.1.ebuild b/kde-apps/gwenview/gwenview-23.04.1.ebuild
index 423f549f8d73..62079ea15c37 100644
--- a/kde-apps/gwenview/gwenview-23.04.1.ebuild
+++ b/kde-apps/gwenview/gwenview-23.04.1.ebuild
@@ -82,6 +82,8 @@ BDEPEND="
 	dev-util/wayland-scanner
 "
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906467
+
 src_prepare() {
 	ecm_src_prepare
 	if ! use mpris; then