From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 787FD158021 for ; Tue, 25 Oct 2022 18:36:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80B4DE0D35; Tue, 25 Oct 2022 18:36:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 608FEE0D35 for ; Tue, 25 Oct 2022 18:36:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 82431340B37 for ; Tue, 25 Oct 2022 18:36:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB737644 for ; Tue, 25 Oct 2022 18:36:35 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1666722920.0aaa3d5a49c0ac229510b85c83418fb470a00006.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/, media-gfx/photoqt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/photoqt/Manifest media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch media-gfx/photoqt/photoqt-1.7.1-r1.ebuild X-VCS-Directories: media-gfx/photoqt/ media-gfx/photoqt/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0aaa3d5a49c0ac229510b85c83418fb470a00006 X-VCS-Branch: master Date: Tue, 25 Oct 2022 18:36:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a76300cc-b7ac-48e2-a4e5-b979e24c427c X-Archives-Hash: 4726a15b301df8db079a2646164d332e commit: 0aaa3d5a49c0ac229510b85c83418fb470a00006 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 25 18:33:48 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 25 18:35:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aaa3d5a media-gfx/photoqt: drop 1.7.1-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/photoqt/Manifest | 1 - media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch | 13 --- .../photoqt/files/photoqt-1.7.1-exiv2-0.27.patch | 102 --------------------- media-gfx/photoqt/photoqt-1.7.1-r1.ebuild | 59 ------------ 4 files changed, 175 deletions(-) diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest index 1cf8748b9630..900b20d3660d 100644 --- a/media-gfx/photoqt/Manifest +++ b/media-gfx/photoqt/Manifest @@ -1,2 +1 @@ -DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078 DIST photoqt-2.9.1.tar.gz 3708647 BLAKE2B dd8c958709ebd830558f150f59c90c317d3f5edb363f92e9fadcd1506de4c97a41f6766670e202081397081c231604028298771eb52911255dae53bfa92a1a8d SHA512 c2ac3bce2ffa0962b243808cdd2495d45af3bd5703389de5e9626a518a8edf25646a317ff420dc0fdd8dc60a53104b1b5ec7e473087454d5c2f0b967066dc192 diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch b/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch deleted file mode 100644 index 5dfacf435a0e..000000000000 --- a/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMake/FindExiv2.cmake 2018-06-03 05:21:04.143148857 +0200 -+++ b/CMake/FindExiv2.cmake 2018-12-29 22:35:40.770393025 +0100 -@@ -13,8 +13,8 @@ - "${EXIV2_LOCATION}" - "${EXIV2_LOCATION}/include" - /usr/include -- /usr/include/Exiv2 -- /opt/local/include/Exiv2 -+ /usr/include/exiv2 -+ /opt/local/include/exiv2 - ) - - IF(EXIV2_INCLUDE_DIR) diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch b/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch deleted file mode 100644 index 48734ce70593..000000000000 --- a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch +++ /dev/null @@ -1,102 +0,0 @@ -From c6fd41478e818f3a651d40f96cab3d790e1c09a4 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 20 Jan 2019 18:25:45 +0100 -Subject: [PATCH] Fix build with exiv2-0.27 - -Fixes https://gitlab.com/luspi/photoqt/issues/64 ---- - cplusplus/scripts/getanddostuff/manipulation.h | 3 +-- - cplusplus/scripts/getmetadata.cpp | 4 ++-- - cplusplus/scripts/getmetadata.h | 3 +-- - cplusplus/scripts/managepeopletags.cpp | 4 ++-- - cplusplus/scripts/managepeopletags.h | 3 +-- - 5 files changed, 7 insertions(+), 10 deletions(-) - -diff --git a/cplusplus/scripts/getanddostuff/manipulation.h b/cplusplus/scripts/getanddostuff/manipulation.h -index b3fa9b42..465d9372 100644 ---- a/cplusplus/scripts/getanddostuff/manipulation.h -+++ b/cplusplus/scripts/getanddostuff/manipulation.h -@@ -38,8 +38,7 @@ - #include "../../logger.h" - - #ifdef EXIV2 --#include --#include -+#include - #endif - - class GetAndDoStuffManipulation : public QObject { -diff --git a/cplusplus/scripts/getmetadata.cpp b/cplusplus/scripts/getmetadata.cpp -index deb89a25..df92de6b 100644 ---- a/cplusplus/scripts/getmetadata.cpp -+++ b/cplusplus/scripts/getmetadata.cpp -@@ -203,7 +203,7 @@ QVariantMap GetMetaData::getExiv2(QString path) { - } - - } catch(Exiv2::Error &e) { -- LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL; -+ LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e.what() << NL; - } - - // If GPS is set, compose into one string -@@ -246,7 +246,7 @@ QVariantMap GetMetaData::getExiv2(QString path) { - } - - } catch(Exiv2::Error &e) { -- LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL; -+ LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e.what() << NL; - } - - QString city = returnMap["Iptc.Application2.City"].toString(); -diff --git a/cplusplus/scripts/getmetadata.h b/cplusplus/scripts/getmetadata.h -index e427cbc1..c5b99140 100644 ---- a/cplusplus/scripts/getmetadata.h -+++ b/cplusplus/scripts/getmetadata.h -@@ -34,8 +34,7 @@ - #include "../logger.h" - - #ifdef EXIV2 --#include --#include -+#include - #endif - - class GetMetaData : public QObject { -diff --git a/cplusplus/scripts/managepeopletags.cpp b/cplusplus/scripts/managepeopletags.cpp -index 9b8c7503..96baeb9e 100644 ---- a/cplusplus/scripts/managepeopletags.cpp -+++ b/cplusplus/scripts/managepeopletags.cpp -@@ -98,7 +98,7 @@ QVariantList ManagePeopleTags::getFaceTags(QString path) { - - } catch(Exiv2::Error& e) { - LOG << CURDATE << "GetPeopleTag::getPeopleLocations() 2 - ERROR reading exiv data (caught exception): " -- << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL; -+ << e.what() << NL; - return ret; - } - -@@ -201,7 +201,7 @@ void ManagePeopleTags::setFaceTags(QString filename, QVariantList tags) { - - } catch(Exiv2::Error& e) { - LOG << CURDATE << "GetPeopleTag::setFaceTags() - ERROR reading exiv data (caught exception): " -- << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL; -+ << e.what() << NL; - return; - } - -diff --git a/cplusplus/scripts/managepeopletags.h b/cplusplus/scripts/managepeopletags.h -index 1908ba0a..59686cc1 100644 ---- a/cplusplus/scripts/managepeopletags.h -+++ b/cplusplus/scripts/managepeopletags.h -@@ -29,8 +29,7 @@ - #include "../logger.h" - - #ifdef EXIV2 --#include --#include -+#include - #endif - - class ManagePeopleTags : public QObject { --- -2.18.1 diff --git a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild deleted file mode 100644 index 53e9fae1e605..000000000000 --- a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_KDEINSTALLDIRS=false -inherit ecm - -DESCRIPTION="Simple but powerful Qt-based image viewer" -HOMEPAGE="https://photoqt.org/" -SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="devil exif freeimage graphicsmagick pdf raw" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -RDEPEND=" - dev-qt/qtdeclarative:5 - dev-qt/qtgraphicaleffects:5 - dev-qt/qtgui:5 - dev-qt/qtimageformats:5 - dev-qt/qtmultimedia:5[qml] - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - app-arch/libarchive:= - app-arch/unrar - devil? ( media-libs/devil ) - exif? ( media-gfx/exiv2:= ) - freeimage? ( media-libs/freeimage ) - graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) - pdf? ( app-text/poppler[qt5] ) - raw? ( media-libs/libraw:= ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${P}-exiv2-0.27.patch" # bugs 675714, 676194 -) - -src_configure() { - local mycmakeargs=( - -DDEVIL=$(usex devil) - -DEXIV2=$(usex exif) - -DFREEIMAGE=$(usex freeimage) - -DGM=$(usex graphicsmagick) - -DPOPPLER=$(usex pdf) - -DRAW=$(usex raw) - ) - ecm_src_configure -}