gentoo auto-resync : 28:05:2023 - 21:15:34

6 files changed, 145 insertions, 16 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 74753cfbcea3..c4a5b3fa9233 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 51533f31f8b6..72e51cee6b45 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -5,6 +5,6 @@ DIST converseen-0.9.10.0.tar.gz 769693 BLAKE2B 651edf41b6cdf010fdae47d457f2459c4
 DIST converseen-0.9.11.1.tar.gz 770024 BLAKE2B 671599099abf5b143bde7c57efc547626c14e15bebbd3a70ce4ec43d4febbaf69eebedebaaac935572b785afaa086c383b68bae0f02bc16ca68625dfb55b8c85 SHA512 1d61fa88d9e3d6ed23fb98d0495b00315adca880fd1d0d95e8322c48d9fdcd161ee00b5e2f5f52212c4db66d97e26ac0da561926e55de4bc047d3ad98b6f69dd
 DIST converseen-0.9.9.8.tar.gz 769184 BLAKE2B 136d4454825fd64bd8129544df25213346550d4a1bf550fd8c32eef7c2c02cda5965aa235ec8f637de53462968a08c1e1b7c5db454c68ed1cac64d08c322fd54 SHA512 64ef5c5614c6536d84c6fc5ad6f9180c45a4c9d1294e492f0b09a596203d91871191f62ef80c6f888f010377c834ae76d825a29b137885756cc33a7d38d70208
 EBUILD converseen-0.9.10.0.ebuild 1340 BLAKE2B 2652ded3c0f7e80a537ceebf9b5cd40f8afc1fb488bad9520f70edde5638953283a7fbcee3baadaed93f57c977fb0d5de48b1a210f27d7cd42a31a4f68d53d08 SHA512 08fc3020f5cacd259814577532a95116a75579a6dd83132be0fe373fe544dfe4a4d1009499d51c8b1d6b667b4c203ca13f1e06c4413450dff54226a8cce99156
-EBUILD converseen-0.9.11.1.ebuild 1761 BLAKE2B f4fc04951cf6f6da3346ad7b6cd507b1688a83def469b068266329f4f1a06d33b8893f3e61d6fac922abefc3625c3c38881cc9ee5eec9b1b98f7f9cf263392ff SHA512 59f99b60d9f430a3473c43a965e8baed9d74e7f82d31bc32b63d6917034d63b4f81466d59a979b0640a73a315d0c792ffac33da1209fe3e5aa03e6c8c7b770c9
+EBUILD converseen-0.9.11.1.ebuild 1759 BLAKE2B 5e73dd22acb4bed2e4555c07f79a956fa6049ed32956509ed76609d1419dedd0bbb1f39dbf7ea04d414686236d2378a0e24a1d47b3a8dcc83384e41b3756b49b SHA512 383d4445fa649dd36adfb32bf4430dcecf6b5091491c70adbefccc4238a65c6d796b17afcde27052f5d6a419b3b7fb6ac2ad148498c74d2185ec85e9db65cf3d
 EBUILD converseen-0.9.9.8.ebuild 1340 BLAKE2B 78bb751dc0f18f8b6137a5217daa30556c45fb15914bcab9bac1c3eda476e235703e9aaa801004972fa11e9fb8b653bce113a3cfa3857f75d2711fd69855abcb SHA512 bca13c456769461e90b2fe34f1e7267a194fd0f4cef26ab564d58702e6beed0ce574c818f7a34b86b81599414c4c2637794b3022bf739e7b1ecc390b2e8a3d3a
 MISC metadata.xml 490 BLAKE2B 7ee59abe13eee7dff622a3e7b701f6e0128a208e3e49f5b22b3fcaf06357991a50ece3ffa9cb607675f94a7784efcec37c2176464e4c7741efbfb8b8427cb5dc SHA512 a56719d55ea41683315c5d3f98b8351d3b15b68fd8f598a9e692691c771a94bec23b8263c8a017e29d63a20a8de8b440db1acfd26558c6f8d51add12e4016ba6
diff --git a/media-gfx/converseen/converseen-0.9.11.1.ebuild b/media-gfx/converseen/converseen-0.9.11.1.ebuild
index 254fc8f4a423..c77e1a0977df 100644
--- a/media-gfx/converseen/converseen-0.9.11.1.ebuild
+++ b/media-gfx/converseen/converseen-0.9.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="graphicsmagick debug"
 
 RDEPEND="
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
-}