diff --git a/media-gfx/phototonic/Manifest b/media-gfx/phototonic/Manifest index 0dfedaac828e4..44c0379d1cb41 100644 --- a/media-gfx/phototonic/Manifest +++ b/media-gfx/phototonic/Manifest @@ -1,2 +1 @@ -DIST phototonic-2.1.tar.gz 488640 BLAKE2B bfbc14d06760c6f9d9244d5ed38d033a769f1eaf8116f55ea6aa5373578aa105fd28ef8e352d394939306af2ab3b617314aebc443a13f7abe9bb8be2fd0cb0cd SHA512 4789311cefa2d5a07ca5e2fd3c0530267f9ea2ffcbf6295c687db3d2aa55e0b7d91228047b2ca24590868b22ce93d0228785fcf49a105ee65c9826b0d9a8fa42 DIST phototonic-3.0.0.tar.gz 923097 BLAKE2B c297c046122cb916bbf2bed5be16895f45720edd92313d87f9fc6e980dad51962e850ec2da403174a0b58ab0b628959bda62314d7411604305d13f14b81670d4 SHA512 7b2c8696bcdc0891c759164fc00ef51870c1b7e624b453ce7f202c5fece494041bd3eacc2d104ad208f38a77c3757f35d5ccbf921643385356f2eaa531fa1f94 diff --git a/media-gfx/phototonic/files/phototonic-2.1-exiv2-0.28.patch b/media-gfx/phototonic/files/phototonic-2.1-exiv2-0.28.patch deleted file mode 100644 index 1c75b628dab33..0000000000000 --- a/media-gfx/phototonic/files/phototonic-2.1-exiv2-0.28.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 923a3fc14de0b779a45696c5f0aef34c74d84f13 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 28 May 2023 18:54:10 +0200 -Subject: [PATCH] Fix build with exiv2-0.28 - -Signed-off-by: Andreas Sturmlechner ---- - ImageViewer.cpp | 9 +++++++++ - MetadataCache.cpp | 8 ++++++++ - Phototonic.cpp | 4 ++++ - Tags.cpp | 8 ++++++++ - ThumbsViewer.cpp | 4 ++++ - 5 files changed, 33 insertions(+) - -diff --git a/ImageViewer.cpp b/ImageViewer.cpp -index 357d223..df3ac43 100644 ---- a/ImageViewer.cpp -+++ b/ImageViewer.cpp -@@ -945,7 +945,11 @@ void ImageViewer::keyMoveEvent(int direction) { - } - - void ImageViewer::saveImage() { -+#if EXIV2_TEST_VERSION(0,28,0) -+ Exiv2::Image::UniquePtr image; -+#else - Exiv2::Image::AutoPtr image; -+#endif - bool exifError = false; - - if (newImage) { -@@ -985,8 +989,13 @@ void ImageViewer::saveImage() { - } - - void ImageViewer::saveImageAs() { -+#if EXIV2_TEST_VERSION(0,28,0) -+ Exiv2::Image::UniquePtr exifImage; -+ Exiv2::Image::UniquePtr newExifImage; -+#else - Exiv2::Image::AutoPtr exifImage; - Exiv2::Image::AutoPtr newExifImage; -+#endif - bool exifError = false; - - setCursorHiding(false); -diff --git a/MetadataCache.cpp b/MetadataCache.cpp -index 524ae74..5ddd4c8 100644 ---- a/MetadataCache.cpp -+++ b/MetadataCache.cpp -@@ -64,7 +64,11 @@ void MetadataCache::clear() { - } - - bool MetadataCache::loadImageMetadata(const QString &imageFullPath) { -+#if EXIV2_TEST_VERSION(0,28,0) -+ Exiv2::Image::UniquePtr exifImage; -+#else - Exiv2::Image::AutoPtr exifImage; -+#endif - QSet tags; - long orientation = 0; - -@@ -78,7 +82,11 @@ bool MetadataCache::loadImageMetadata(const QString &imageFullPath) { - try { - Exiv2::ExifData &exifData = exifImage->exifData(); - if (!exifData.empty()) { -+#if EXIV2_TEST_VERSION(0,28,0) -+ orientation = exifData["Exif.Image.Orientation"].value().toUint32(); -+#else - orientation = exifData["Exif.Image.Orientation"].value().toLong(); -+#endif - } - } catch (Exiv2::Error &error) { - qWarning() << "Failed to read Exif metadata"; -diff --git a/Phototonic.cpp b/Phototonic.cpp -index 6cc95b3..bd5497d 100644 ---- a/Phototonic.cpp -+++ b/Phototonic.cpp -@@ -3151,7 +3151,11 @@ void Phototonic::removeMetadata() { - - if (ret == MessageBox::Yes) { - for (int file = 0; file < fileList.size(); ++file) { -+#if EXIV2_TEST_VERSION(0,28,0) -+ Exiv2::Image::UniquePtr image; -+#else - Exiv2::Image::AutoPtr image; -+#endif - try { - image = Exiv2::ImageFactory::open(fileList[file].toStdString()); - image->clearMetadata(); -diff --git a/Tags.cpp b/Tags.cpp -index 84eea16..a62da9d 100644 ---- a/Tags.cpp -+++ b/Tags.cpp -@@ -136,7 +136,11 @@ void ImageTags::addTag(QString tagName, bool tagChecked) { - - bool ImageTags::writeTagsToImage(QString &imageFileName, QSet &newTags) { - QSet imageTags; -+#if EXIV2_TEST_VERSION(0,28,0) -+ Exiv2::Image::UniquePtr exifImage; -+#else - Exiv2::Image::AutoPtr exifImage; -+#endif - - try { - exifImage = Exiv2::ImageFactory::open(imageFileName.toStdString()); -@@ -160,7 +164,11 @@ bool ImageTags::writeTagsToImage(QString &imageFileName, QSet &newTags) - QSetIterator newTagsIt(newTags); - while (newTagsIt.hasNext()) { - QString tag = newTagsIt.next(); -+#if EXIV2_TEST_VERSION(0,28,0) -+ Exiv2::Value::UniquePtr value = Exiv2::Value::create(Exiv2::string); -+#else - Exiv2::Value::AutoPtr value = Exiv2::Value::create(Exiv2::string); -+#endif - value->read(tag.toStdString()); - Exiv2::IptcKey key("Iptc.Application2.Keywords"); - newIptcData.add(key, value.get()); -diff --git a/ThumbsViewer.cpp b/ThumbsViewer.cpp -index 77a6189..4a11475 100644 ---- a/ThumbsViewer.cpp -+++ b/ThumbsViewer.cpp -@@ -210,7 +210,11 @@ void ThumbsViewer::updateImageInfoViewer(QString imageFullPath) { - infoView->addEntry(key, val); - } - -+#if EXIV2_TEST_VERSION(0,28,0) -+ Exiv2::Image::UniquePtr exifImage; -+#else - Exiv2::Image::AutoPtr exifImage; -+#endif - try { - exifImage = Exiv2::ImageFactory::open(imageFullPath.toStdString()); - exifImage->readMetadata(); --- -2.40.1 - diff --git a/media-gfx/phototonic/phototonic-2.1.ebuild b/media-gfx/phototonic/phototonic-2.1.ebuild deleted file mode 100644 index 7e7667662223c..0000000000000 --- a/media-gfx/phototonic/phototonic-2.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qmake-utils xdg - -DESCRIPTION="Image viewer and organizer" -HOMEPAGE="https://github.com/oferkv/phototonic" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/oferkv/phototonic.git" -else - SRC_URI="https://github.com/oferkv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="svg tiff" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - media-gfx/exiv2:= - svg? ( dev-qt/qtsvg:5 ) - tiff? ( dev-qt/qtimageformats:5 ) -" -DEPEND="${RDEPEND}" - -# pending upstream: https://github.com/oferkv/phototonic/pull/274 -PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906492 - -src_configure() { - eqmake5 -} - -src_install() { - emake install INSTALL_ROOT="${D}" -}