commit: 51774b3989b671682c65878f639f48ea17f007e3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 27 22:09:23 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 27 22:12:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51774b39
media-gfx/qimgv: drop 1.0.2-r2 Closes: https://bugs.gentoo.org/938881 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/qimgv/Manifest | 1 - media-gfx/qimgv/files/qimgv-1.0.2-exiv2-0.28.patch | 49 ------------------- .../files/qimgv-1.0.2-fix-apng-cannot-play.patch | 56 ---------------------- .../qimgv/files/qimgv-1.0.2-libmpv-api2.patch | 15 ------ media-gfx/qimgv/qimgv-1.0.2-r2.ebuild | 46 ------------------ 5 files changed, 167 deletions(-) diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest index aeb6cc11254d..a117bdf85c8c 100644 --- a/media-gfx/qimgv/Manifest +++ b/media-gfx/qimgv/Manifest @@ -1,2 +1 @@ DIST qimgv-1..tar.gz 1087720 BLAKE2B f7e3d88541d14c186a9cded0a24bfad43b344d41bd2ac576f1ee259c32be14ff1d03ecd075c640c2f9d26d24f5ab85af8bdaf9baa755baadf2cb36cd4ed0751c SHA512 a5e494a76bcf15faf5e576c964948394b6e2b6c0bf55f4be8b4c56d32dba3a45deec1743492cd872af9cd7d197eac2ebc7562600e26a86d720d65fa9dff24bb7 -DIST qimgv-1.0.2.tar.gz 681034 BLAKE2B 49faf11baf526e2221d1ed05a7523c452c32586900611db1823e2a50daadb14034d0b9a1363596dabde5b4b6dfd2ead8e285d1a82129bf2deda1a0c43907ffc6 SHA512 3e10a87f28f7187251c93c92b418ee34e4c2b373b0dd957604fd46305237dc52fd7e17880507b3a0d757c0c3800e8185b6085f15f6f05db6d29cae1e67044b58 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 deleted file mode 100644 index 86e60efe564c..000000000000 --- a/media-gfx/qimgv/files/qimgv-1.0.2-exiv2-0.28.patch +++ /dev/null @@ -1,49 +0,0 @@ -Combined fixes from git master: - -From 9ffd34784b1fabe1569862b2d551d9cf06e46fa2 Mon Sep 17 00:00:00 2001 -From: adonais <[email protected]> -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 <[email protected]> -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 <[email protected]> -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 deleted file mode 100644 index 7350fb626523..000000000000 --- a/media-gfx/qimgv/files/qimgv-1.0.2-fix-apng-cannot-play.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0db15e8ae17a03d61652766ffe411c5d010161a1 Mon Sep 17 00:00:00 2001 -From: adonais <[email protected]> -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/files/qimgv-1.0.2-libmpv-api2.patch b/media-gfx/qimgv/files/qimgv-1.0.2-libmpv-api2.patch deleted file mode 100644 index aa0a322382e5..000000000000 --- a/media-gfx/qimgv/files/qimgv-1.0.2-libmpv-api2.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/easymodo/qimgv/commit/d24f3fa9df89 -From: easymodo <[email protected]> -Date: Sat, 18 Dec 2021 10:32:05 +0200 -Subject: [PATCH] fix mpv_opengl_init_params ---- a/plugins/player_mpv/src/mpvwidget.cpp -+++ b/plugins/player_mpv/src/mpvwidget.cpp -@@ -69,7 +69,7 @@ void MpvWidget::setOption(const QString& name, const QVariant& value) { - } - - void MpvWidget::initializeGL() { -- mpv_opengl_init_params gl_init_params{get_proc_address, nullptr, nullptr}; -+ mpv_opengl_init_params gl_init_params{get_proc_address, nullptr}; - mpv_render_param params[]{ - {MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)}, - {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params}, diff --git a/media-gfx/qimgv/qimgv-1.0.2-r2.ebuild b/media-gfx/qimgv/qimgv-1.0.2-r2.ebuild deleted file mode 100644 index 99e7b39a6c18..000000000000 --- a/media-gfx/qimgv/qimgv-1.0.2-r2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -DESCRIPTION="A cross-platform image viewer with webm support, written in qt5" -HOMEPAGE="https://github.com/easymodo/qimgv"; -SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3 BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="exif kde opencv video" - -DEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - exif? ( media-gfx/exiv2:= ) - kde? ( kde-frameworks/kwindowsystem:5 ) - opencv? ( media-libs/opencv:= ) - video? ( media-video/mpv:=[libmpv] ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -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() { - local mycmakeargs=( - -DEXIV2=$(usex exif) - -DKDE_SUPPORT=$(usex kde) - -DOPENCV_SUPPORT=$(usex opencv) - -DVIDEO_SUPPORT=$(usex video) - ) - cmake_src_configure -}
