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 780F315800A for ; Thu, 3 Aug 2023 15:34:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC16BE099E; Thu, 3 Aug 2023 15:34:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3E2AE099E for ; Thu, 3 Aug 2023 15:34:55 +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 CD64C340DDF for ; Thu, 3 Aug 2023 15:34:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64B65ED4 for ; Thu, 3 Aug 2023 15:34:53 +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: <1691076888.48e1a66ca8a4046a1695b03951822a37fe515016.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/kphotoalbum/Manifest media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild X-VCS-Directories: media-gfx/kphotoalbum/ media-gfx/kphotoalbum/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 48e1a66ca8a4046a1695b03951822a37fe515016 X-VCS-Branch: master Date: Thu, 3 Aug 2023 15:34:53 +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: d41471cb-deca-4b56-a262-a88173621a51 X-Archives-Hash: fefd1daa051f8d1a3c8016954f6f1b77 commit: 48e1a66ca8a4046a1695b03951822a37fe515016 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 3 15:18:37 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 3 15:34:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e1a66c media-gfx/kphotoalbum: drop 5.10.0 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/kphotoalbum/Manifest | 1 - .../files/kphotoalbum-5.10.0-exiv2-0.28.patch | 147 --------------------- media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild | 73 ---------- 3 files changed, 221 deletions(-) diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest index cfb1fb42f59c..eb90501ca754 100644 --- a/media-gfx/kphotoalbum/Manifest +++ b/media-gfx/kphotoalbum/Manifest @@ -1,2 +1 @@ -DIST kphotoalbum-5.10.0.tar.xz 12002788 BLAKE2B e20a06f6829c1ac3df51102b09be4e59fe97557b7b51ab4c2ef072f2ea18b9c086acad9cd03dde14549e35ee652f325a558bb634e5760d3b216f9a1c6d681a63 SHA512 6e6e3d3173f2783c05319c6a372553e92b97174a43307d2bd1fdfa0eb6751bab435e61e07e1c33496254e6f53dd95032adf002899c68475dac7af7ad575c28cc DIST kphotoalbum-5.11.0.tar.xz 12005836 BLAKE2B 1a2872bc791cec6701a4bfe8b6ddac264731f7afdcb35d864bcd07cc0b5e5a4015184a071d9db9735d21b080c898d5ea598d0879bb979032abe464434f6fb821 SHA512 dd521b5e158a691da69e333fcefd3cf48135053c7510dbd7f22d94299059fe58037c56e70b92edfcd1d8d7a55b04f80278ff3bdde08dba16507dc43ca77af96e diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch deleted file mode 100644 index 2eea9495b735..000000000000 --- a/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff --git a/DB/FileInfo.cpp b/DB/FileInfo.cpp -index dc4c9819b62706c9c7bbfa21f3da7ef7d3f8b6d3..8b4e275c1765e718ed917cb41e7b221ed8d484ef 100644 ---- a/DB/FileInfo.cpp -+++ b/DB/FileInfo.cpp -@@ -1,5 +1,6 @@ - // SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen - // SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl -+// SPDX-FileCopyrightText: 2023 Tobias Leupold - // - // SPDX-License-Identifier: GPL-2.0-or-later - -@@ -13,6 +14,8 @@ - #include - #include - -+#include -+ - using namespace DB; - - FileInfo FileInfo::read(const DB::FileName &fileName, DB::ExifMode mode) -@@ -79,8 +82,14 @@ void DB::FileInfo::parseEXIV2(const DB::FileName &fileName) - const Exiv2::Exifdatum &datum = m_exifMap["Exif.Image.Orientation"]; - - int orientation = 0; -- if (datum.count() > 0) -+ if (datum.count() > 0) { -+#if EXIV2_TEST_VERSION(0, 28, 0) -+ orientation = datum.toInt64(); -+#else - orientation = datum.toLong(); -+#endif -+ } -+ - m_angle = orientationToAngle(orientation); - } - -diff --git a/lib/kpaexif/Database.cpp b/lib/kpaexif/Database.cpp -index 4d0e228c72f5747f9d5b2a4e15871e2a11de4ed9..985713ceb53e60c3c17de80632f902a07ba94b14 100644 ---- a/lib/kpaexif/Database.cpp -+++ b/lib/kpaexif/Database.cpp -@@ -1,6 +1,6 @@ - // SPDX-FileCopyrightText: 2003-2020 The KPhotoAlbum Development Team --// SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl --// SPDX-FileCopyrightText: 2022 Johannes Zarl-Zierl -+// SPDX-FileCopyrightText: 2021-2022 Johannes Zarl-Zierl -+// SPDX-FileCopyrightText: 2023 Tobias Leupold - // - // SPDX-License-Identifier: GPL-2.0-or-later - -@@ -320,7 +320,7 @@ bool Exif::Database::add(const DB::FileName &fileName) - return false; - - try { -- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()); -+ const auto image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()); - Q_ASSERT(image.get() != nullptr); - image->readMetadata(); - Exiv2::ExifData &exifData = image->exifData(); -@@ -341,7 +341,7 @@ bool Exif::Database::add(const DB::FileNameList &list) - - for (const DB::FileName &fileName : list) { - try { -- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()); -+ const auto image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()); - Q_ASSERT(image.get() != nullptr); - image->readMetadata(); - map << DBExifInfo(fileName, image->exifData()); -diff --git a/lib/kpaexif/DatabaseElement.cpp b/lib/kpaexif/DatabaseElement.cpp -index 4e7ba198e425e81c582c585bb184ec19c31d4985..3d5d56cfbe5028a8e148753979bdae3f0922008d 100644 ---- a/lib/kpaexif/DatabaseElement.cpp -+++ b/lib/kpaexif/DatabaseElement.cpp -@@ -1,13 +1,15 @@ --/* SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen -+// SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen -+// SPDX-FileCopyrightText: 2023 Tobias Leupold -+// -+// SPDX-License-Identifier: GPL-2.0-or-later - -- SPDX-License-Identifier: GPL-2.0-or-later --*/ - #include "DatabaseElement.h" - - #include - - #include - #include -+#include - - static QString replaceDotWithUnderscore(const char *cstr) - { -@@ -76,10 +78,15 @@ QString Exif::IntExifElement::queryString() const - - QVariant Exif::IntExifElement::valueFromExif(Exiv2::ExifData &data) const - { -- if (data[m_tag].count() > 0) -- return QVariant { (int)data[m_tag].toLong() }; -- else -- return QVariant { (int)0 }; -+ if (data[m_tag].count() > 0) { -+#if EXIV2_TEST_VERSION(0, 28, 0) -+ return QVariant((int) data[m_tag].toInt64()); -+#else -+ return QVariant((int) data[m_tag].toLong()); -+#endif -+ } else { -+ return QVariant(0); -+ } - } - - Exif::RationalExifElement::RationalExifElement(const char *tag) -diff --git a/lib/kpaexif/Info.cpp b/lib/kpaexif/Info.cpp -index 5f77fc8144516434465bd9f21ea2e885054aed37..162a05d14f3fbadd1d776d0eb10589a892bcf86c 100644 ---- a/lib/kpaexif/Info.cpp -+++ b/lib/kpaexif/Info.cpp -@@ -1,5 +1,6 @@ - // SPDX-FileCopyrightText: 2003-2020 The KPhotoAlbum Development Team - // SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl -+// SPDX-FileCopyrightText: 2023 Tobias Leupold - // - // SPDX-License-Identifier: GPL-2.0-or-later - -@@ -16,7 +17,6 @@ - #include - #include - #include --#include - - using namespace Exif; - -@@ -166,7 +166,7 @@ Info::Info() - void Exif::writeExifInfoToFile(const DB::FileName &srcName, const QString &destName, const QString &imageDescription) - { - // Load Exif from source image -- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data()); -+ auto image = Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data()); - image->readMetadata(); - Exiv2::ExifData data = image->exifData(); - -@@ -201,7 +201,7 @@ Exif::Metadata Exif::Info::metadata(const DB::FileName &fileName) - { - try { - Exif::Metadata result; -- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data()); -+ auto image = Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data()); - Q_ASSERT(image.get() != nullptr); - image->readMetadata(); - result.exif = image->exifData(); diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild deleted file mode 100644 index 6f0b4d7fe491..000000000000 --- a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.82.0 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Tool for indexing, searching, and viewing images" -HOMEPAGE="https://www.kphotoalbum.org/" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0" -SLOT="5" -IUSE="map phonon +raw share +vlc" - -REQUIRED_USE="|| ( phonon vlc )" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[jpeg] - >=dev-qt/qtsql-${QTMIN}:5[sqlite] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-gfx/exiv2:= - media-libs/libjpeg-turbo:= - map? ( kde-apps/marble:5 ) - phonon? ( >=media-libs/phonon-4.11.0 ) - raw? ( kde-apps/libkdcraw:5 ) - share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 ) - vlc? ( media-video/vlc:= ) -" -RDEPEND="${DEPEND} - media-video/ffmpeg -" - -DOCS=( CHANGELOG.{md,old} README.md ) - -PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # git master, bug 906469 - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited - $(cmake_use_find_package map Marble) - $(cmake_use_find_package phonon Phonon4Qt5) - $(cmake_use_find_package raw KF5KDcraw) - $(cmake_use_find_package share KF5Purpose) - $(cmake_use_find_package vlc LIBVLC) - ) - - ecm_src_configure -}