summaryrefslogtreecommitdiff
path: root/media-gfx/phototonic
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/phototonic')
-rw-r--r--media-gfx/phototonic/Manifest3
-rw-r--r--media-gfx/phototonic/files/phototonic-2.1-exiv2-0.28.patch135
-rw-r--r--media-gfx/phototonic/phototonic-2.1.ebuild19
3 files changed, 143 insertions, 14 deletions
diff --git a/media-gfx/phototonic/Manifest b/media-gfx/phototonic/Manifest
index e1b090256cd3..3572bd1125a7 100644
--- a/media-gfx/phototonic/Manifest
+++ b/media-gfx/phototonic/Manifest
@@ -1,3 +1,4 @@
+AUX phototonic-2.1-exiv2-0.28.patch 4324 BLAKE2B dc4620b32a6e0f27a71bed1ed43713af5f5a90028302ab50ff9b90308511199b0f85533af05d544f83d2242f4ede2e8e5a91630697fe31a54cad5c4994c7189c SHA512 1080a42b72159ed4d6232e4d0e068dcbe47cc3ff6af00bd737de5824d0fc9611bd1cd1bdb0b9d9405c48918bea62d006acc0ae507ace38ad4bc54b44febb9d0f
DIST phototonic-2.1.tar.gz 488640 BLAKE2B bfbc14d06760c6f9d9244d5ed38d033a769f1eaf8116f55ea6aa5373578aa105fd28ef8e352d394939306af2ab3b617314aebc443a13f7abe9bb8be2fd0cb0cd SHA512 4789311cefa2d5a07ca5e2fd3c0530267f9ea2ffcbf6295c687db3d2aa55e0b7d91228047b2ca24590868b22ce93d0228785fcf49a105ee65c9826b0d9a8fa42
-EBUILD phototonic-2.1.ebuild 884 BLAKE2B f2513f250c0cced0d7e7204a642b735e1297bbbc4d17ad23e49f633a130ba0a355d4f269f75dac1c2770f4b609c6a8e3c6f5e9ad2e1ac0bfb7dde155b3acd33d SHA512 868766a331083427768894806cf0c9348709f5be0aa08aa479babe67a8c622e46613e2adbf3352f7dfecbb113247574f69cee650b955950aaa2b1ad54f9a6a04
+EBUILD phototonic-2.1.ebuild 864 BLAKE2B f6897d32a796a1d01c8ba48ce65e71f058593f9041f95d1e87f3ea5e4f4de60f27d579dadba09e5d5ca8b95e634c41f80fccea91c764a96c0603a25b77bcf392 SHA512 df40207e3399f8d496eb88a083855b3fd590741003daeb94e594ac4962b14e9316f2c4853bbf8f4337d939ab0780cf9ff08c9ad323332a44441c892881ae4262
MISC metadata.xml 340 BLAKE2B f70c45ca640e49f4a63153c3a0e8901f017c3bb8a75eda91771b866f0e26485600009e778512e44b454a9f81c492db07a9ea2cbc6664f8cd48c6d45f9c5ba8cd SHA512 a24a2b03641ed3a5af6fab0b498115f62053bef4531d31e7186dbd3f0a218ae6876ccd6f10575d5e7e26030d1e53f1753efea24e99778cf324edbb12b00c2f44
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
new file mode 100644
index 000000000000..1c75b628dab3
--- /dev/null
+++ b/media-gfx/phototonic/files/phototonic-2.1-exiv2-0.28.patch
@@ -0,0 +1,135 @@
+From 923a3fc14de0b779a45696c5f0aef34c74d84f13 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 28 May 2023 18:54:10 +0200
+Subject: [PATCH] Fix build with exiv2-0.28
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ 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<QString> 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<QString> &newTags) {
+ QSet<QString> 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<QString> &newTags)
+ QSetIterator<QString> 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
index bb861a81715c..7e7667662223 100644
--- a/media-gfx/phototonic/phototonic-2.1.ebuild
+++ b/media-gfx/phototonic/phototonic-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit qmake-utils xdg-utils
+inherit qmake-utils xdg
DESCRIPTION="Image viewer and organizer"
HOMEPAGE="https://github.com/oferkv/phototonic"
@@ -30,6 +30,9 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+# pending upstream: https://github.com/oferkv/phototonic/pull/274
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906492
+
src_configure() {
eqmake5
}
@@ -37,13 +40,3 @@ src_configure() {
src_install() {
emake install INSTALL_ROOT="${D}"
}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 15:18:10 +0000