gentoo auto-resync : 08:06:2023 - 21:46:30

9 files changed, 256 insertions, 4 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f28bd06c4ae6..3f085fe1e6a5 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 91f178e107e3..f2e3257e42bc 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -6,5 +6,5 @@ AUX darktable-4.2.1_cmake-musl.patch 796 BLAKE2B 2e26cc969f01dc948f4f92f42c768a2
 DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752 SHA512 05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88 SHA512 a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
 DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b SHA512 ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61
-EBUILD darktable-4.2.1.ebuild 5861 BLAKE2B 56816067d85f643265c4e841abd5fd0eccdd77b351c725c090752d7640522f70e1f74d4ac6c83a57f17a7b154eade7a4a69205c62a5ac12df0bbea7ad45dd282 SHA512 54602e7cd34d251a88d2e69d7e32584747f08aa7217f02162e92c33b150ab1b8024994c741d364bb7d9a51ec27048c93b3b01c94c3e040a71466dd3d0e2ea34e
+EBUILD darktable-4.2.1.ebuild 5867 BLAKE2B ef5d2906890ce74564a1d7f7968849f6975e3f57e62db9fccbe9825a7daf2982e6ed63a625630f67b56a74fce25f0fb90df41464e7a4d49a78410806a18265a6 SHA512 413b43340abce057c736ee124cc7c4c6344a2db48d2a204669ad3813eb8229f288e8d4c8cd5cf87a35d0024df166643eb417f17514fc7b91f28d04b265dd75f4
 MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a
diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild b/media-gfx/darktable/darktable-4.2.1.ebuild
index bcd74d9a9e34..7a803774aebb 100644
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -100,7 +100,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
 	"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
 	# patch by ArchLinux
-        "${FILESDIR}"/${P}-exiv2-0.28.patch
+	"${FILESDIR}"/${P}-exiv2-0.28.patch # bug 906466
 )
 
 S="${WORKDIR}/${P/_/~}"
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index fb47edc0b7d8..f04b7cedac64 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,5 @@
+AUX hugin-2022.0.0-exiv2-0.28.patch 3460 BLAKE2B fab4f433b7a5d0959fc68ee0affae81ba989526713a9b711da8553cdbb9522dac80f1ac52007ba90cbf3066eddd3745ec567d4db9b508cf4e944b1e2c627358d SHA512 b5170d9f3b62fcc2e4e5a51d8766e8db8f1df1dcf6e198dbd739f3f960103a9f5e97a8960fc7d5c9b5e226c74c60762b639b5fb677e38754ee597626c554a10d
 DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be SHA512 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
-EBUILD hugin-2022.0.0.ebuild 2118 BLAKE2B 0705a31e43d14fd120dad9b4c7ab2f38ba5dff1638ef45c147698210236496b72a25ac9f9a7baf3a2e863ec6789ccd12d809c68a2c8507594d3a77c4f2739da4 SHA512 5eb85e50ab7322254e8358c74d96f3b2482c7d2f73dfcc4180d51fcdda769304978cd0bf0e664f6225c4d4f3ab3fa2d945d9d9d456b654c2695e227ef2692684
+EBUILD hugin-2022.0.0.ebuild 2180 BLAKE2B 9d5965086fd8d95dfcd628a7fdb7234ff8e82ca6744ad2cdbe9620d7bc5e8b68b1f2f6a25f3aab789a1738d339bd1360e954afd6f7776f1f9163d120b3b49994 SHA512 5c95a6c4df8983f5fc714bdb9fe74bc75765df145438c2cf21daef1b2433ab286ce9c81971a3d3840717f53f7b7de103e7121705d37c023612541313b35c26cd
 EBUILD hugin-9999.ebuild 2058 BLAKE2B 13f52f224c492d093c79429cfdc05b81c8a4c5c5297266107c55f20bb4278d4e4664bc183ee0fe8c210d657a0ac5b51bd86ed0fd7d02c3668551753f0c7a5178 SHA512 b6ae419dffb76575973fe91feef2b578a75d5350e935f9a1da73451030878d3ed7eb0945f6745a8467b5f3c9973487d5e08c37d5a0df47b5accb4bcd4a0aa22f
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch
new file mode 100644
index 000000000000..dff74132b48f
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch
@@ -0,0 +1,99 @@
+Patch originally taken from ArchLinux, modified to be backwards compatible.
+
+diff -r 79cd11a7a66f src/hugin_base/panodata/Exiv2Helper.cpp
+--- a/src/hugin_base/panodata/Exiv2Helper.cpp	Wed May 24 19:13:20 2023 +0200
++++ b/src/hugin_base/panodata/Exiv2Helper.cpp	Mon Jun 05 00:31:19 2023 +0200
+@@ -40,7 +40,11 @@
+             Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName));
+             if (itr != exifData.end() && itr->count())
+             {
++#if EXIV2_TEST_VERSION(0,28,0)
++                value = itr->toUint32();
++#else
+                 value = itr->toLong();
++#endif
+                 return true;
+             }
+             else
+@@ -165,7 +169,11 @@
+         {
+             if(it!=exifData.end() && it->count())
+             {
++#if EXIV2_TEST_VERSION(0,28,0)
++                return it->toUint32();
++#else
+                 return it->toLong();
++#endif
+             }
+             return 0;
+         };
+@@ -600,4 +608,4 @@
+         };
+ 
+     }; //namespace Exiv2Helper
+-}; //namespace HuginBase
+\ No newline at end of file
++}; //namespace HuginBase
+diff -r 79cd11a7a66f src/hugin_base/panodata/SrcPanoImage.cpp
+--- a/src/hugin_base/panodata/SrcPanoImage.cpp	Wed May 24 19:13:20 2023 +0200
++++ b/src/hugin_base/panodata/SrcPanoImage.cpp	Mon Jun 05 00:31:19 2023 +0200
+@@ -384,7 +384,11 @@
+                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
+                     if (pos != xmpData.end())
+                     {
++#if EXIV2_TEST_VERSION(0,28,0)
++                        croppedWidth = pos->toUint32();
++#else
+                         croppedWidth = pos->toLong();
++#endif
+                     }
+                     else
+                     {
+@@ -394,7 +398,11 @@
+                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
+                     if (pos != xmpData.end())
+                     {
++#if EXIV2_TEST_VERSION(0,28,0)
++                        croppedHeight = pos->toUint32();
++#else
+                         croppedHeight = pos->toLong();
++#endif
+                     }
+                     else
+                     {
+@@ -408,7 +416,11 @@
+                         double hfov = 0;
+                         if (pos != xmpData.end())
+                         {
++#if EXIV2_TEST_VERSION(0,28,0)
++                            hfov = 360 * croppedWidth / (double)pos->toUint32();
++#else
+                             hfov = 360 * croppedWidth / (double)pos->toLong();
++#endif
+                         }
+                         else
+                         {
+@@ -419,7 +431,11 @@
+                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
+                         if (pos != xmpData.end())
+                         {
++#if EXIV2_TEST_VERSION(0,28,0)
++                            fullHeight = pos->toUint32();
++#else
+                             fullHeight = pos->toLong();
++#endif
+                         }
+                         else
+                         {
+@@ -430,7 +446,11 @@
+                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
+                         if (pos != xmpData.end())
+                         {
++#if EXIV2_TEST_VERSION(0,28,0)
++                            cropTop = pos->toUint32();
++#else
+                             cropTop = pos->toLong();
++#endif
+                         }
+                         else
+                         {
diff --git a/media-gfx/hugin/hugin-2022.0.0.ebuild b/media-gfx/hugin/hugin-2022.0.0.ebuild
index eb099f3d2f2e..3c0dd61f7e87 100644
--- a/media-gfx/hugin/hugin-2022.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2022.0.0.ebuild
@@ -57,6 +57,8 @@ DOCS=( authors.txt README TODO )
 
 S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906468
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	setup-wxwidgets
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index fea3f3ca43b2..209019e55c20 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,4 @@
+AUX kphotoalbum-5.10.0-exiv2-0.28.patch 5737 BLAKE2B bfdc846f99f4ce2f51467834636bbe14e01bd555bcae9eed7a670c0e611736fbf070c6a6a9765820b9df521cc98511744b9bfbb4559c2d689ec9ef68f7af6fc8 SHA512 8f4cf6aebbd49b67b596e4de06154299eed46783c42272aea07d995656c1c19356d75c9442d0747e0e635d4f4046ad65675e632f0ca750b0e8ea99ac484ef3e8
 DIST kphotoalbum-5.10.0.tar.xz 12002788 BLAKE2B e20a06f6829c1ac3df51102b09be4e59fe97557b7b51ab4c2ef072f2ea18b9c086acad9cd03dde14549e35ee652f325a558bb634e5760d3b216f9a1c6d681a63 SHA512 6e6e3d3173f2783c05319c6a372553e92b97174a43307d2bd1fdfa0eb6751bab435e61e07e1c33496254e6f53dd95032adf002899c68475dac7af7ad575c28cc
-EBUILD kphotoalbum-5.10.0.ebuild 1900 BLAKE2B 7c42400f498d1503a2266ae5bb12423fcaaf1d0c3cf736e67a3632d88f2b6ff19ac3bebe865f1f2d5611c513dde71c56bebaad23b4136b69a3c43d3c819efaa6 SHA512 4b434e436a9a596e1928f54f1cbb5af18775b8bd653e2e53b393f6be79e24b6d65720a223ed8d79491410970ff25e5a748e05c39c11860f00468edb04bec007f
+EBUILD kphotoalbum-5.10.0.ebuild 1974 BLAKE2B e3a5135a8566f064afb727e3c57d2d95e46eefbd27283283df58f83493dcc97d49774605860dacd22a97c512b898a1820303346cb885bb0d4cba0a393320c56e SHA512 e2d0b7e7bfad05be239026f3c88af935b9b2cbe980b0a809bf527db38f72ba1f0779ef61d6a4252a74f20a15d6c2f26ca29bff28d38fb5a6e5dc76e0feab6720
 MISC metadata.xml 733 BLAKE2B 8925ee0f3c5e6e4d8592c3403781228f00cf39f39b0363920c86091fdb566e43889b522121112cf3f0f857cdb94f2da86cf6dd0029276e990ac197870a0ab718 SHA512 824eed39872862a0502dadf33cfee45ecc269bd0750286157abc08119b49c0fa3abf6ec66eb170a37251e141dd2842563219084a41245dc9b8cfe61fa8ad8a08
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
new file mode 100644
index 000000000000..2eea9495b735
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch
@@ -0,0 +1,147 @@
+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 <blackie@kde.org>
+ // SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
++// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
+ //
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ 
+@@ -13,6 +14,8 @@
+ #include <QFileInfo>
+ #include <QRegularExpression>
+ 
++#include <exiv2/version.hpp>
++
+ 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 <johannes@zarl-zierl.at>
+-// SPDX-FileCopyrightText: 2022 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
++// SPDX-FileCopyrightText: 2021-2022 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
++// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
+ //
+ // 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 <blackie@kde.org>
++// SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen <blackie@kde.org>
++// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
++//
++// SPDX-License-Identifier: GPL-2.0-or-later
+ 
+-   SPDX-License-Identifier: GPL-2.0-or-later
+-*/
+ #include "DatabaseElement.h"
+ 
+ #include <kpabase/Logging.h>
+ 
+ #include <QVariant>
+ #include <exiv2/exif.hpp>
++#include <exiv2/version.hpp>
+ 
+ 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 <johannes@zarl-zierl.at>
++// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
+ //
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ 
+@@ -16,7 +17,6 @@
+ #include <QTextCodec>
+ #include <exiv2/exv_conf.h>
+ #include <exiv2/image.hpp>
+-#include <exiv2/version.hpp>
+ 
+ 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
index 84e92e1afc9c..6f0b4d7fe491 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
@@ -57,6 +57,8 @@ RDEPEND="${DEPEND}
 
 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