gentoo auto-resync : 12:06:2023 - 20:20:47

4 files changed, 114 insertions, 9 deletions

diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index 83826b2467a3..1fe7a157c0f1 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,4 +1,6 @@
+AUX qimgv-1.0.2-exiv2-0.28.patch 1832 BLAKE2B 4f3188ba0d9de69ea599dd9b6a4f550b07ca6caf45958c7e8ccb62eea9e88fe485f2c79dc64c0977c954fd99d057fd28ce0d509941c29597c1949510049db719 SHA512 3c425c9447f0e96f7259a51d08a8733ae01be915fc9bbcaa3bda5b0682f76054aa4abf2d137263cb1bc21e09d556f2e0c89ff2afb49b1c0ddb32265fdb4f4cc9
+AUX qimgv-1.0.2-fix-apng-cannot-play.patch 1788 BLAKE2B 8593ab5bb4d9e4aaf3607abfc5c5602fdb8d116459f1ce3427ec289a509f93faf46066c663dbc99c5c49317e4c07b62740ffb62d1edd2c6679402536d71bac7d SHA512 2d7aec4742bd4dba8e3e41bef779b810ad2ef626efe950ed2abcb46a64e2fbe4beea02d249a1993672a18ba9c854e12df08ad85b7ac77999edeeff7da1e6bd88
 AUX qimgv-1.0.2-libmpv-api2.patch 724 BLAKE2B 175b85d38ea0299efb6a87d397a73d2fd85ac85990ea89b34418dfe2b54b306e416dfb6a55c409a8f08891a6d1828245e91eabad07a5308b526b87c5e1bb016a SHA512 cf92f9bdfa501d4224d4764b6a061b29c0a0ebe436afd882c12acaa62dc9754306ac88b13e67992c944112af0f5efc34c6782d3a1282f039d14ba5f60fe649c3
 DIST qimgv-1.0.2.tar.gz 681034 BLAKE2B 49faf11baf526e2221d1ed05a7523c452c32586900611db1823e2a50daadb14034d0b9a1363596dabde5b4b6dfd2ead8e285d1a82129bf2deda1a0c43907ffc6 SHA512 3e10a87f28f7187251c93c92b418ee34e4c2b373b0dd957604fd46305237dc52fd7e17880507b3a0d757c0c3800e8185b6085f15f6f05db6d29cae1e67044b58
-EBUILD qimgv-1.0.2-r1.ebuild 976 BLAKE2B 81e6ce585f3eb87daabebf2373463de906f868ff2f5c10fd6606486439083b9b8c2756ab9dbdf7b4c75d74847edda0791422336e235f97391899c8d63b73c4d8 SHA512 da1e30f2a35f108407a2e76476886b06b6dfbe5849ce7a89aa81f8b7c38e496cac3a5c230a43d78cb1ef5c961eaa2f80a17f94c0fb65ba62a465a01fd747b868
+EBUILD qimgv-1.0.2-r2.ebuild 1090 BLAKE2B a45e889ae60fb1272643825e005c88a2ff04bb5ef116726fd49a31eef2ed4f435d7ef77b5ede05a9500b1ef3e785f4bcf0970e95d89491b2e1fbe2987a089c9b SHA512 c8bffb20c2b96dd9e51ac0d394c4c3447c8e29c952fbac8412d54ddd3a2ecdb0ee3a4393788e6e6d64182727222377ff9d429e7cb91e002049f7d177277b0940
 MISC metadata.xml 564 BLAKE2B 90edc7f7fac7d7c06557b1809ab34c1d7e6260bf3056f3dde7281bdaf5cafda94e70b700c099b03f11234ce85ec912f59df00a0fb0f4d4f861883fe567f4690c SHA512 62122cde9319219f1e6885ff50e09a2ea453da82f1ee5dcd5a6be9c3c2b0064357269751383d15aa9f206e3e1134f020efd81c787f3f097354aa27cd6b38df0e
diff --git a/media-gfx/qimgv/files/qimgv-1.0.2-exiv2-0.28.patch b/media-gfx/qimgv/files/qimgv-1.0.2-exiv2-0.28.patch
new file mode 100644
index 000000000000..86e60efe564c
--- /dev/null
+++ b/media-gfx/qimgv/files/qimgv-1.0.2-exiv2-0.28.patch
@@ -0,0 +1,49 @@
+Combined fixes from git master:
+
+From 9ffd34784b1fabe1569862b2d551d9cf06e46fa2 Mon Sep 17 00:00:00 2001
+From: adonais <hua.andy@gmail.com>
+Date: Tue, 2 Nov 2021 12:33:00 +0800
+Subject: [PATCH 1/3] reserve exiv2 exception capture
+
+(cherry picked from commit 3bd9571a0aff4611339eb57132e79b41af7acbb6)
+
+* asturmlechner 2023-06-12: Drop unrelated translation fix from commit
+---
+ qimgv/sourcecontainers/documentinfo.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+From abe43e0dc7ee6d120c3e052562748d5a2a9f7d46 Mon Sep 17 00:00:00 2001
+From: adonais <hua.andy@gmail.com>
+Date: Wed, 3 Nov 2021 09:07:30 +0800
+Subject: [PATCH 2/3] Fix exiv2 exception capture
+
+(cherry picked from commit 08d5dea2074d055f102002d1a8f705e2ad2292f1)
+---
+ qimgv/sourcecontainers/documentinfo.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+From c4d9d5b08341af6709fe6263e90f4237c67eb14c Mon Sep 17 00:00:00 2001
+From: DigitalDragon64 <digitaldragon64@gmail.com>
+Date: Thu, 8 Jun 2023 15:21:26 +0200
+Subject: [PATCH 3/3] Exiv2::AnyError was removed
+
+(cherry picked from commit bff220e6e8851482e383b71fe778a870c96cd5f8)
+---
+ qimgv/sourcecontainers/documentinfo.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/qimgv/sourcecontainers/documentinfo.cpp b/qimgv/sourcecontainers/documentinfo.cpp
+index 21979f01..9de2dd31 100644
+--- a/qimgv/sourcecontainers/documentinfo.cpp
++++ b/qimgv/sourcecontainers/documentinfo.cpp
+@@ -268,8 +268,9 @@ void DocumentInfo::loadExifTags() {
+             exifTags.insert("UserComment", comment);
+         }
+     }
++    // No exception was caught, which may cause QT crash
+     catch (Exiv2::Error& e) {
+-        //std::cout << "Caught Exiv2 exception '" << e.what() << "'\n";
++        qDebug() << "Caught Exiv2 exception:\n" << e.what() << "\n";
+         return;
+     }
+ #endif
diff --git a/media-gfx/qimgv/files/qimgv-1.0.2-fix-apng-cannot-play.patch b/media-gfx/qimgv/files/qimgv-1.0.2-fix-apng-cannot-play.patch
new file mode 100644
index 000000000000..7350fb626523
--- /dev/null
+++ b/media-gfx/qimgv/files/qimgv-1.0.2-fix-apng-cannot-play.patch
@@ -0,0 +1,56 @@
+From 0db15e8ae17a03d61652766ffe411c5d010161a1 Mon Sep 17 00:00:00 2001
+From: adonais <hua.andy@gmail.com>
+Date: Mon, 1 Nov 2021 08:50:51 +0800
+Subject: [PATCH] Fix apng cannot play
+
+(cherry picked from commit e9d306ffbf93d4b9d8cfd2906eaebe0fc949930f)
+
+* asturmlechner 2023-06-12: Drop unrelated [...and update translation file]
+  part of this commit.
+---
+ qimgv/sourcecontainers/documentinfo.cpp | 17 +++++++----------
+ 1 file changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/qimgv/sourcecontainers/documentinfo.cpp b/qimgv/sourcecontainers/documentinfo.cpp
+index 98a68f75..21979f01 100644
+--- a/qimgv/sourcecontainers/documentinfo.cpp
++++ b/qimgv/sourcecontainers/documentinfo.cpp
+@@ -128,10 +128,13 @@ inline
+ // dumb apng detector
+ bool DocumentInfo::detectAPNG() {
+     QFile f(fileInfo.filePath());
+-    if(f.open(QFile::ReadOnly | QFile::Text)) {
+-        QTextStream in(&f);
+-        QString header(in.read(120)); // 120 chars should be sufficient?
+-        return header.contains("acTL");
++    if(f.open(QFile::ReadOnly)) {
++        QDataStream in(&f);
++        const int len = 120;
++        QByteArray qbuf("\0", len);
++        if (in.readRawData(qbuf.data(), len) > 0) {
++            return qbuf.contains("acTL");
++        }
+     }
+     return false;
+ }
+@@ -264,17 +267,11 @@ void DocumentInfo::loadExifTags() {
+                 comment.remove(0, comment.indexOf(" ") + 1);
+             exifTags.insert("UserComment", comment);
+         }
+-
+-        return;
+     }
+     catch (Exiv2::Error& e) {
+         //std::cout << "Caught Exiv2 exception '" << e.what() << "'\n";
+         return;
+     }
+-    catch (Exiv2::BasicError<CharType> e) {
+-        //std::cout << "Caught BasicError Exiv2 exception '" << e.what() << "'\n";
+-        return;
+-    }
+ #endif
+ }
+ 
+-- 
+2.41.0
+
diff --git a/media-gfx/qimgv/qimgv-1.0.2-r1.ebuild b/media-gfx/qimgv/qimgv-1.0.2-r2.ebuild
index d988cd8f2de4..99e7b39a6c18 100644
--- a/media-gfx/qimgv/qimgv-1.0.2-r1.ebuild
+++ b/media-gfx/qimgv/qimgv-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,9 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="exif kde opencv video"
 
-BDEPEND="
-	virtual/pkgconfig
-"
 DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -29,12 +26,13 @@ DEPEND="
 	opencv? ( media-libs/opencv:= )
 	video? ( media-video/mpv:=[libmpv] )
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
+PATCHES=( # git master backports
 	"${FILESDIR}"/${P}-libmpv-api2.patch
+	"${FILESDIR}"/${P}-fix-apng-cannot-play.patch
+	"${FILESDIR}"/${P}-exiv2-0.28.patch # bug 906493
 )
 
 src_configure() {