summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin38011 -> 38005 bytes
-rw-r--r--media-gfx/darktable/Manifest3
-rw-r--r--media-gfx/darktable/darktable-4.2.1.ebuild2
-rw-r--r--media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch215
-rw-r--r--media-gfx/krita/Manifest3
-rw-r--r--media-gfx/krita/krita-5.1.5.ebuild8
-rw-r--r--media-gfx/luminance-hdr/Manifest3
-rw-r--r--media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-exiv2-0.28.patch143
-rw-r--r--media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild6
-rw-r--r--media-gfx/skanpage/Manifest4
-rw-r--r--media-gfx/skanpage/skanpage-23.04.2.ebuild (renamed from media-gfx/skanpage/skanpage-23.04.1.ebuild)4
11 files changed, 379 insertions, 12 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 76634b71f491..f28bd06c4ae6 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index da1da720cdaf..91f178e107e3 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,9 +1,10 @@
AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde
AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9
AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e
+AUX darktable-4.2.1-exiv2-0.28.patch 9139 BLAKE2B 82eb190e1fe9d93af8bce40fdfd7647e69bf620915d5d1cc76faefda17577f7480c7c5b9649b2f5ce7efb86b274b19c426393e2c943383637fe8c18a9ceac372 SHA512 dcdfdf9d62983428c4b0bfc87a747a437cd07cc640cba948309095680c077f118da1a4208362b76eba14044ad0fd8dabbb3715335d30e35e2f84a171ca275c6e
AUX darktable-4.2.1_cmake-musl.patch 796 BLAKE2B 2e26cc969f01dc948f4f92f42c768a28bb879b3592d98dc1de0c3b5b7335a2985fbb5659c58b421fbca896b1f2585a5cb993b5cdf3ee6f87d9834afe3fd1a23a SHA512 82c7a4f6d6112fa024503a99e05d3050922b120821c93922ae846f9da6b02cd6f2e27315448c20ed1032c5526b85cb6d01dd6eec5109db1af3f8e92e4818ea06
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 5795 BLAKE2B fbeb3633bd697a66b75da97f2288e831b5ce87e776acadf4b4ba9d26872113903f98c9ca3e7e7c8acb5efe2c95e2494d0343199c96b657309a8efba49fb4a365 SHA512 3f11487381738c8eba2207be5c38e97582d40b5b0687ef7477c9a773ee3a04aeefe2c8a2ed169ce9ab8d31950477c1bbaf64406878229b197f39085cb8be8709
+EBUILD darktable-4.2.1.ebuild 5861 BLAKE2B 56816067d85f643265c4e841abd5fd0eccdd77b351c725c090752d7640522f70e1f74d4ac6c83a57f17a7b154eade7a4a69205c62a5ac12df0bbea7ad45dd282 SHA512 54602e7cd34d251a88d2e69d7e32584747f08aa7217f02162e92c33b150ab1b8024994c741d364bb7d9a51ec27048c93b3b01c94c3e040a71466dd3d0e2ea34e
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 48162abb7759..bcd74d9a9e34 100644
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -99,6 +99,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
"${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
)
S="${WORKDIR}/${P/_/~}"
diff --git a/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch b/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch
new file mode 100644
index 000000000000..1be8577ae369
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch
@@ -0,0 +1,215 @@
+diff --git a/src/common/exif.cc b/src/common/exif.cc
+index 484ebf2207..91ea8e64d0 100644
+--- a/src/common/exif.cc
++++ b/src/common/exif.cc
+@@ -80,6 +80,11 @@ extern "C" {
+
+ #define DT_XMP_EXIF_VERSION 5
+
++#if EXIV2_TEST_VERSION(0,28,0)
++#define AnyError Error
++#define toLong toInt64
++#endif
++
+ // persistent list of exiv2 tags. set up in dt_init()
+ static GList *exiv2_taglist = NULL;
+
+@@ -2658,39 +2663,39 @@ static GList *read_history_v2(Exiv2::XmpData &xmpData, const char *filename)
+ if(g_str_has_prefix(key_iter, "darktable:operation"))
+ {
+ current_entry->have_operation = TRUE;
+- current_entry->operation = g_strdup(history->value().toString().c_str());
++ current_entry->operation = g_strdup(history->toString().c_str());
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:num"))
+ {
+- current_entry->num = history->value().toLong();
++ current_entry->num = history->toLong();
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:enabled"))
+ {
+- current_entry->enabled = history->value().toLong() == 1;
++ current_entry->enabled = history->toLong() == 1;
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:modversion"))
+ {
+ current_entry->have_modversion = TRUE;
+- current_entry->modversion = history->value().toLong();
++ current_entry->modversion = history->toLong();
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:params"))
+ {
+ current_entry->have_params = TRUE;
+- current_entry->params = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(),
++ current_entry->params = dt_exif_xmp_decode(history->toString().c_str(), history->size(),
+ &current_entry->params_len);
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:multi_name"))
+ {
+- current_entry->multi_name = g_strdup(history->value().toString().c_str());
++ current_entry->multi_name = g_strdup(history->toString().c_str());
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:multi_priority"))
+ {
+- current_entry->multi_priority = history->value().toLong();
++ current_entry->multi_priority = history->toLong();
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:iop_order"))
+ {
+ // we ensure reading the iop_order as a high precision float
+- string str = g_strdup(history->value().toString().c_str());
++ string str = g_strdup(history->toString().c_str());
+ static const std::locale& c_locale = std::locale("C");
+ std::istringstream istring(str);
+ istring.imbue(c_locale);
+@@ -2698,12 +2703,12 @@ static GList *read_history_v2(Exiv2::XmpData &xmpData, const char *filename)
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:blendop_version"))
+ {
+- current_entry->blendop_version = history->value().toLong();
++ current_entry->blendop_version = history->toLong();
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:blendop_params"))
+ {
+- current_entry->blendop_params = dt_exif_xmp_decode(history->value().toString().c_str(),
+- history->value().size(),
++ current_entry->blendop_params = dt_exif_xmp_decode(history->toString().c_str(),
++ history->size(),
+ &current_entry->blendop_params_len);
+ }
+ }
+@@ -2858,35 +2863,35 @@ static GList *read_masks_v3(Exiv2::XmpData &xmpData, const char *filename, const
+ // go on reading things into current_entry
+ if(g_str_has_prefix(key_iter, "darktable:mask_num"))
+ {
+- current_entry->mask_num = history->value().toLong();
++ current_entry->mask_num = history->toLong();
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:mask_id"))
+ {
+- current_entry->mask_id = history->value().toLong();
++ current_entry->mask_id = history->toLong();
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:mask_type"))
+ {
+- current_entry->mask_type = history->value().toLong();
++ current_entry->mask_type = history->toLong();
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:mask_name"))
+ {
+- current_entry->mask_name = g_strdup(history->value().toString().c_str());
++ current_entry->mask_name = g_strdup(history->toString().c_str());
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:mask_version"))
+ {
+- current_entry->mask_version = history->value().toLong();
++ current_entry->mask_version = history->toLong();
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:mask_points"))
+ {
+- current_entry->mask_points = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(), &current_entry->mask_points_len);
++ current_entry->mask_points = dt_exif_xmp_decode(history->toString().c_str(), history->size(), &current_entry->mask_points_len);
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:mask_nb"))
+ {
+- current_entry->mask_nb = history->value().toLong();
++ current_entry->mask_nb = history->toLong();
+ }
+ else if(g_str_has_prefix(key_iter, "darktable:mask_src"))
+ {
+- current_entry->mask_src = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(), &current_entry->mask_src_len);
++ current_entry->mask_src = dt_exif_xmp_decode(history->toString().c_str(), history->size(), &current_entry->mask_src_len);
+ }
+
+ }
+@@ -4060,7 +4065,11 @@ char *dt_exif_xmp_read_string(const int imgid)
+ std::string xmpPacket;
+
+ Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
++#if EXIV2_TEST_VERSION(0,28,0)
++ xmpPacket.assign(buf.c_str(), buf.size());
++#else
+ xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
++#endif
+ Exiv2::XmpParser::decode(xmpData, xmpPacket);
+ // because XmpSeq or XmpBag are added to the list, we first have
+ // to remove these so that we don't end up with a string of duplicates
+@@ -4076,7 +4085,11 @@ char *dt_exif_xmp_read_string(const int imgid)
+ std::string xmpPacket;
+
+ Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
++#if EXIV2_TEST_VERSION(0,28,0)
++ xmpPacket.assign(buf.c_str(), buf.size());
++#else
+ xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
++#endif
+ Exiv2::XmpParser::decode(sidecarXmpData, xmpPacket);
+
+ for(Exiv2::XmpData::const_iterator it = sidecarXmpData.begin(); it != sidecarXmpData.end(); ++it)
+@@ -4204,7 +4217,11 @@ int dt_exif_xmp_attach_export(const int imgid, const char *filename, void *metad
+ std::string xmpPacket;
+
+ Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
++#if EXIV2_TEST_VERSION(0,28,0)
++ xmpPacket.assign(buf.c_str(), buf.size());
++#else
+ xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
++#endif
+ Exiv2::XmpParser::decode(sidecarXmpData, xmpPacket);
+
+ for(Exiv2::XmpData::const_iterator it = sidecarXmpData.begin(); it != sidecarXmpData.end(); ++it)
+@@ -4371,7 +4388,7 @@ int dt_exif_xmp_attach_export(const int imgid, const char *filename, void *metad
+ catch(Exiv2::AnyError &e)
+ {
+ #if EXIV2_TEST_VERSION(0,27,0)
+- if(e.code() == Exiv2::kerTooLargeJpegSegment)
++ if(e.code() == Exiv2::ErrorCode::kerTooLargeJpegSegment)
+ #else
+ if(e.code() == 37)
+ #endif
+@@ -4437,7 +4454,11 @@ int dt_exif_xmp_write(const int imgid, const char *filename)
+ }
+
+ Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(filename));
++#if EXIV2_TEST_VERSION(0,28,0)
++ xmpPacket.assign(buf.c_str(), buf.size());
++#else
+ xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
++#endif
+ Exiv2::XmpParser::decode(xmpData, xmpPacket);
+ // because XmpSeq or XmpBag are added to the list, we first have
+ // to remove these so that we don't end up with a string of duplicates
+diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp
+index f4d4d46e12..41bb021012 100644
+--- a/tools/basecurve/exif-wrapper.cpp
++++ b/tools/basecurve/exif-wrapper.cpp
+@@ -19,6 +19,7 @@
+ #include <exiv2/exif.hpp>
+ #include <exiv2/error.hpp>
+ #include <exiv2/image.hpp>
++#include <exiv2/version.hpp>
+
+ #include <cstdio>
+ #include <cassert>
+@@ -36,13 +37,21 @@ exif_get_ascii_datafield(
+
+ try
+ {
++#if EXIV2_TEST_VERSION(0,28,0)
++ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
++#else
+ Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
++#endif
+ assert(image.get() != 0);
+ image->readMetadata();
+
+ Exiv2::ExifData &exifData = image->exifData();
+
++#if EXIV2_TEST_VERSION(0,28,0)
++ Exiv2::Value::UniquePtr val = exifData[key].getValue();
++#else
+ Exiv2::Value::AutoPtr val = exifData[key].getValue();
++#endif
+
+ if (val->typeId() != Exiv2::asciiString)
+ {
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 3adb209fcb29..7f32eeedff39 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,4 +1,5 @@
AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
+DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781 SHA512 130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f
DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1
-EBUILD krita-5.1.5.ebuild 3472 BLAKE2B 870c4d2ad602b8c39d8baad91c82cdcbc0b26733ffdd9d037982ab157b15a4d57320f623557c0bd85e4b80ba375826bea0d84eb49e4406efff5a879bd27619d0 SHA512 bf211a11e9035aec809a206d099d1361267dee9f46045e1db0fc87a13af60059f7fef32d7670f07a4873728006c5ca33566d1cffbd9c991adb9d03a75c27ddd9
+EBUILD krita-5.1.5.ebuild 3589 BLAKE2B f4c32b1e21349e1689663a5242226ba449f1134ec68acbbad8c71861c11cd0d7cafca3f6cb9f427fa2555a7814334367e6615727e1268f5f2a3f85aeaba3c36e SHA512 dc598d981e58fb3f558db751fd15d93e0879713cb3d18514abbbd35af30fe8f21d3bc8cbcb90455969de2fa653720552b7e5b2f7a7ed322db1f6a41b73fc4e6c
MISC metadata.xml 709 BLAKE2B 1cca3b6d608cbdf758eec1d19d586fe2ff44275247f450d1ca43ce83478d2cf4fd248c8a034b93b2dc5be466eca14eb54c9204c7a4ef4b6394fffebc5368ffb2 SHA512 53a4a7efb077d5a6dc1885ee6487484f5882f0fcc5333289c8abbd6ab2daa2fa991a466fbd3d75177a6437e83b25c86a35519dbc956794c62df185ca7412ceb9
diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild
index c7ffd26bfae8..c8945c944730 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -11,7 +11,8 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${P}-exiv2-0.28.patch.xz"
KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
@@ -85,7 +86,10 @@ BDEPEND="
sys-devel/gettext
"
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.3.1-tests-optional.patch"
+ "${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472
+)
pkg_setup() {
python-single-r1_pkg_setup
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 832e14e8267a..65b58f292a53 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -2,8 +2,9 @@ AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea
AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab710b6c2b16f5ae006ab07c06d8898fe2c0048222b80714d0343f105a623acbd535119853831e2d207a50e6407e1de33aff SHA512 694106851d29a97485e7e438db206c5d08d37dc5d7a2c9a3f207f31c2b673d42b4c539429a658390d31f5f985bd8f330d9387f3eb19964aa4e5683f2031b0a33
AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
+AUX luminance-hdr-2.6.1.1-exiv2-0.28.patch 4846 BLAKE2B 74367df72c62743f2c43cafc313b84b96f746fede437c64fa59b558c0b011a1959b90f1925637c6856f55852b2ec58bf9b8466e69ebea5d236f8d191ae9b200e SHA512 711e64209cba59b218b09715451ddcca3084b020da9bd1baa7decc71e5d3ad7375cba5703bc042e2371e9465c01436a67d0162731718dbef158e207de5266615
AUX luminance-hdr-2.6.1.1-fixheaders.patch 320 BLAKE2B 1037c958cb0eb08c186343c57bf530a2f8ed0b2cc9ef5b67f1363d9b595d267bd5f63a7fbca3d1b51ba4c3cbe3b92d6e56d6af28ee39333376d2411aae18c4d1 SHA512 6e5a51ba17648c619599b895ce9d2fd42b757652331e87799958372ad9c61f711619b0d5efac1d32fb8517732b3b3013fee1c86f0f4032531e390c1bfd229c06
AUX luminance-hdr-2.6.1.1-openexr3.patch 1028 BLAKE2B fb0502bad89beafdd9cc6cd842e542d2cd9f7d4fc7fe6a29c9c1b67e3a0fc902c451650895c63e8405de82bb5e9e02fca3d1013227fc1a97220ebae245466889 SHA512 a040ee694fff2df06f0521db8c0bb98d4d80def4c342ea5997da535ea1b5e1634a4a9b26e7300476a061b7d7f2a90fc3d2b1cc4fca1c1df260b8847fef781060
DIST luminance-hdr-2.6.1.1.tar.bz2 11569153 BLAKE2B bbeb991c05f1058fe9fde59014d4c6326283bad34d84dc0454a0b4df1b600b02835e6c3013199d2b2811d59409b892129c580e4a2a5cb00c8014e1267c16ab84 SHA512 9006339037aa3a0b7332cf71e1cf143d9e700eaae1102dfb8eccea8a9d97a5bcb6331202684adf76542116927dd9a69169882518af6ebb25c85d08057fdc552e
-EBUILD luminance-hdr-2.6.1.1-r1.ebuild 2235 BLAKE2B bcf60f3dd80fed06e4476919fcd5e374dae7a763c0200b80e0ef5bb6260eb099d4398d3d8bf22c5e514da5d74093bf11fe90929496068c8a2c88a2c24385e6b5 SHA512 3860e6bde7c5180bd32f8644c85be26773f13f65a41c953c67eb4e990e21616d3580d456193e7009be31ab43133d7e9caaca69b1b92bc20db0dd5cc241c35e6a
+EBUILD luminance-hdr-2.6.1.1-r1.ebuild 2291 BLAKE2B 550dff9c4fa5a26f7cc4f71197465a04fd013f7b20490965171cd90679d366de144ff2fd180dda1e694567b260c48c9169e68685a47d76474e5dbe68688b61db SHA512 9893dc302d105c8776af75a30c3c8c86423758c4292e1c3756c8258cd71c8afb1911db27df20711e970c6b1bb63f61536c06d380de9eeb353f418236421d2c78
MISC metadata.xml 1272 BLAKE2B 08d1f2e217eaffcb4419532ed41ba963a971b343e2d0ff7f3718c9df23ac9ffd5299264d5a87b66451acd231965f135bdeebf3b91244e3d9e51763c818b317f9 SHA512 98f1fa351c3e0bc7e47b30263093408cbbebacf8e0eb23d780cd704f5ddfff3d6939aee4d18c06cd083d90dc8a68ea51995352ab1f15ce75b0585230a3f9cbc8
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-exiv2-0.28.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-exiv2-0.28.patch
new file mode 100644
index 000000000000..704b768c005b
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-exiv2-0.28.patch
@@ -0,0 +1,143 @@
+diff --git a/src/Exif/ExifOperations.cpp b/src/Exif/ExifOperations.cpp
+index dd3d22a6..4cfe6b70 100644
+--- a/src/Exif/ExifOperations.cpp
++++ b/src/Exif/ExifOperations.cpp
+@@ -108,7 +108,11 @@ void copyExifData(const std::string &from, const std::string &to,
+ #endif
+
+ try {
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ Exiv2::Image::UniquePtr sourceImage;
++#else
+ Exiv2::Image::AutoPtr sourceImage;
++#endif
+ Exiv2::ExifData srcExifData;
+
+ if (!from.empty()) {
+@@ -128,7 +132,11 @@ void copyExifData(const std::string &from, const std::string &to,
+ }
+
+ // get destination exif data
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ Exiv2::Image::UniquePtr destinationImage = Exiv2::ImageFactory::open(to);
++#else
+ Exiv2::Image::AutoPtr destinationImage = Exiv2::ImageFactory::open(to);
++#endif
+
+ if (dontOverwrite) {
+ // doesn't throw anything if it is empty
+@@ -212,7 +220,11 @@ void copyExifData(const std::string &from, const std::string &to,
+ destinationImage->setExifData(srcExifData);
+ }
+ destinationImage->writeMetadata();
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ } catch (Exiv2::Error &e) {
++#else
+ } catch (Exiv2::AnyError &e) {
++#endif
+ #ifndef NDEBUG
+ qDebug() << e.what();
+ #endif
+@@ -338,7 +350,11 @@ allowed for ev computation purposes.
+
+ float getExposureTime(const std::string &filename) {
+ try {
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
++#else
+ Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
++#endif
+ image->readMetadata();
+ Exiv2::ExifData &exifData = image->exifData();
+ if (exifData.empty()) return -1;
+@@ -374,14 +390,22 @@ float getExposureTime(const std::string &filename) {
+ } else {
+ return -1;
+ }
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ } catch (Exiv2::Error &e) {
++#else
+ } catch (Exiv2::AnyError &e) {
++#endif
+ return -1;
+ }
+ }
+
+ float getAverageLuminance(const std::string &filename) {
+ try {
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
++#else
+ Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
++#endif
+ image->readMetadata();
+ Exiv2::ExifData &exifData = image->exifData();
+
+@@ -403,7 +427,11 @@ float getAverageLuminance(const std::string &filename) {
+ << std::endl;
+
+ return -1.0;
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ } catch (Exiv2::Error &e) {
++#else
+ } catch (Exiv2::AnyError &e) {
++#endif
+ return -1.0;
+ }
+ }
+diff --git a/src/Libpfs/exif/exifdata.cpp b/src/Libpfs/exif/exifdata.cpp
+index 38472eff..79085e43 100644
+--- a/src/Libpfs/exif/exifdata.cpp
++++ b/src/Libpfs/exif/exifdata.cpp
+@@ -52,7 +52,11 @@ ExifData::ExifData(const std::string &filename) { fromFile(filename); }
+ void ExifData::fromFile(const std::string &filename) {
+ reset();
+ try {
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ ::Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
++#else
+ ::Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
++#endif
+ image->readMetadata();
+ ::Exiv2::ExifData &exifData = image->exifData();
+
+@@ -121,7 +125,11 @@ void ExifData::fromFile(const std::string &filename) {
+ */
+ if ((it = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation"))) !=
+ exifData.end()) {
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ long rotation = it->toUint32();
++#else
+ long rotation = it->toLong();
++#endif
+ switch (rotation) {
+ case 3:
+ m_orientation = 180;
+@@ -134,7 +142,11 @@ void ExifData::fromFile(const std::string &filename) {
+ break;
+ }
+ }
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ } catch (Exiv2::Error &e) {
++#else
+ } catch (Exiv2::AnyError &e) {
++#endif
+ return;
+ }
+ }
+diff --git a/src/TransplantExif/TransplantExifDialog.cpp b/src/TransplantExif/TransplantExifDialog.cpp
+index 8364b595..a7683703 100644
+--- a/src/TransplantExif/TransplantExifDialog.cpp
++++ b/src/TransplantExif/TransplantExifDialog.cpp
+@@ -347,7 +347,11 @@ void TransplantExifDialog::transplant_requested() {
+ QFile::encodeName((*i_dest)).constData(),
+ m_Ui->checkBox_dont_overwrite->isChecked());
+ m_Ui->rightlist->item(index)->setBackground(QBrush("#a0ff87"));
++#if EXIV2_TEST_VERSION (0, 28, 0)
++ } catch (Exiv2::Error &e) {
++#else
+ } catch (Exiv2::AnyError &e) {
++#endif
+ add_log_message("ERROR:" + QString::fromStdString(e.what()));
+ m_Ui->rightlist->item(index)->setBackground(QBrush("#ff743d"));
+ }
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild
index 1b286cc00976..ab363c98a273 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild
@@ -15,9 +15,6 @@ KEYWORDS="amd64 ~x86"
IUSE="cpu_flags_x86_sse2 fits openmp test"
RESTRICT="!test? ( test )"
-BDEPEND="
- dev-qt/linguist-tools:5
-"
RDEPEND="
dev-libs/boost:=
dev-qt/qtconcurrent:5
@@ -46,6 +43,7 @@ DEPEND="${RDEPEND}
dev-cpp/eigen:3
test? ( dev-cpp/gtest )
"
+BDEPEND="dev-qt/linguist-tools:5"
PATCHES=(
"${FILESDIR}"/${P}-openexr3.patch
@@ -54,6 +52,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-no-git.patch
"${FILESDIR}"/${PN}-2.6.0-docs.patch
"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
+ # patch by ArchLinux
+ "${FILESDIR}"/${P}-exiv2-0.28.patch
)
pkg_pretend() {
diff --git a/media-gfx/skanpage/Manifest b/media-gfx/skanpage/Manifest
index cfa30abd5612..15ccfdf58e13 100644
--- a/media-gfx/skanpage/Manifest
+++ b/media-gfx/skanpage/Manifest
@@ -1,5 +1,5 @@
DIST skanpage-22.12.3.tar.xz 1295700 BLAKE2B a3ff1af77fb809434517d4204d70653b281f24b29c72e2c070bc4221f7bfe5433da3317b0f5801f96ada7e5f34a06741978e6db99b2d234f02d28b235b498a77 SHA512 9b5ad39ae3ede442ef9c5fa0b976752e8848d55029a14b60ea3c397c1a951017a0104c21eb66b667f78ae007355a1c59d0f72ccf860164bf8237277f34234eb5
-DIST skanpage-23.04.1.tar.xz 1298088 BLAKE2B 05fb047ba3d2b10ca55389f50741490d0d0c462428f31232bfd972e17a594ec47ae7d0b1fd7d001b9f3f51b06897f65293159efe383f565a11a2b4ec94103a64 SHA512 00b63fa964f31841dd0ec2ca1a4d0a9253de0d9e4f63da3f1cea7c3a24203fd7f95e2e73c1ce96b5c6a613c41f256f507f03842eb9de4de1671044a6e3780380
+DIST skanpage-23.04.2.tar.xz 1297928 BLAKE2B 904712ed997c2d44814a0d30c1850b6808ddba3d2612bbc9c30fb81c3f6322dd4c1988f36133c082a8c04277a84d3e0298a154242ac49d962f5f9336e0bdfca9 SHA512 fa5e414e3a623735b4d90ada67d264ce52d89099bbf8d617b94b4bf57a464b288f0ec7f63fbda739f7a9a2cdfd83e328300a0fad01ce40201f79c100aef690ea
EBUILD skanpage-22.12.3.ebuild 1351 BLAKE2B 5f5a1803b242dee76e01657e875a45e6e1c43bd99eef45b532df069d9e56edd93d974488a23555c1de185792a1ee8a45371b71e22050a641e730a892f4c46d8a SHA512 0710f13639f48dfed656c66f4f3c92147dc73527ff2286ceedaa35c44066b1e5219970b01a1241b2e214efa289155156bf55f96a4db7011240d128525a127768
-EBUILD skanpage-23.04.1.ebuild 1354 BLAKE2B 9efd68887a03ba26c385103b4619b56761e1ed20404662bc8e173e87fafc4478caccfc4393150032577c7639f2f38714e18d939043393e154a01edadc0ee0e64 SHA512 bfc3ebfdd08e26bcad8f0f76bf4b2ddde3a3a74c564b500ab5e37a0cd15c4b60233b0b43ecacc68ece5692cf38a0593a58649ce1a01c9c65b8e3361f43cb01c3
+EBUILD skanpage-23.04.2.ebuild 1354 BLAKE2B 99a75248286a2cd60c15949e188042c821b477267419388023dcbe2311f1f05ea857878c760441014e14d7a9d2818b93bb20f6fffd8882fec6b752308f3a4688 SHA512 ad06bc77f80507bb8ad7eb65a4422c381139930afa5085110d8bd4a8d5a156b486169f31d139f94008e0dd8222802c32532881e43c274ce8da5482f0eb421288
MISC metadata.xml 374 BLAKE2B 3666d82bcae95e5b38d777c81491cc25488aff6b55e112f6eebbaf80ef603d40e8287fe33d649e647c2f97b9caca237f2b9785ee49ff9c2f5c81576a2cf33379 SHA512 fcc360165d6fa100c9d92c2528f4f2ba291a0bf6b05a7b252b5bb215514144e9b699915f98d7aecda6869bf50bfbb51b42b3186679e5db2c3901cb4d6151e6e8
diff --git a/media-gfx/skanpage/skanpage-23.04.1.ebuild b/media-gfx/skanpage/skanpage-23.04.2.ebuild
index e143de472826..f2cca351be31 100644
--- a/media-gfx/skanpage/skanpage-23.04.1.ebuild
+++ b/media-gfx/skanpage/skanpage-23.04.2.ebuild
@@ -5,8 +5,8 @@ EAPI=8
KDE_ORG_CATEGORY="utilities"
PVCUT=$(ver_cut 1-3)
-KFMIN=5.104.0
-QTMIN=5.15.5
+KFMIN=5.106.0
+QTMIN=5.15.9
inherit ecm gear.kde.org
DESCRIPTION="Multi-page scanning application supporting image and pdf files"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-18 21:36:51 +0000