gentoo auto-resync : 07:08:2024 - 12:37:20

2 files changed, 0 insertions, 94 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 3dc950850fe8..c37af9f34046 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -4,7 +4,6 @@ AUX krita-5.1.5-lto.patch 1759 BLAKE2B 45fb3eb096bf61e767b2db682dad325261d17d894
 AUX krita-5.1.5-ocio-2.3.0.patch 1669 BLAKE2B 17ee793479946ca07788afb109ca338c3cd9ace486b2c7443ce850cc229766eb09d7b6608337c4d8ae7a7e24d633e233d36551253c3012042062a9d5c3b0fe4f SHA512 dc88f9e1b9836d8c8bc08731ac1878c3a35d4ebbd4cc361a1a4e7b59c5217709b4e207001b18a617ef4f8881a2608b548e14d383aa9db798f13acd2be02df925
 AUX krita-5.1.5-sip-6.8.patch 770 BLAKE2B b63fb65ffc4ea733e8698b255b5531ff55299ec8f7cd6c153f50faaf938795618c675a7c6fbf33c1f7225c8dddaec806a9fbd6f88b621ebcff52eb13aacc0479 SHA512 5f21376508c603ca33447119ad9fa492e83992f74314cd59053f270d2020a540b4c6708b67028a7567b9db460a6fbc0aa842020b4fe5b7d4be4265d2dc78ceff
 AUX krita-5.2.2-fftw.patch 689 BLAKE2B a0b62a65d8de4c661a571f0f671387d0571982bbc0acdf4dc879c21711093e7a3d6ef17e6a24f04d066ecd1f861b98f8a37e626075d3fdd445f408e77484eb3f SHA512 6db10de30c0f47ea3d65490d82176685144af580a6581d0ff2fc0363e6b65166c154ad3dd05a0dadf967afc39417936275d71911e89fcf79ecfa84b1bb6b94fa
-AUX krita-5.2.2-libjxl-0.9.patch 5557 BLAKE2B a901ad73bbc76be839fa5463662d5b99df41c101299cf12b5fd0956ba3901473adeb7da477c2f1e36fc5af5491e0f063f41bbaa9d90c7d772a37ec18e99e836e SHA512 b4932c1d9c6136203d8cff92a7ed65089cf5b6bd3f80ccf093d524d39fd3ddac408793fb7ae3287ce78d5574c34440bc849a5a90b618c39638854ea6f5fd3205
 AUX krita-5.2.3-tests-optional.patch 2807 BLAKE2B 7d0c0d26ce0cb1bf86f7933e8510bb5ea1e98986b811641874b4db6f622e5a31bf9b9c3b7e12267bf54f2d57d56459211df3e004dbc261e0d519f69d190e2149 SHA512 021d6d8fa1b976091088b317f54cf0be66f73b0dd9031497abc3101e4e43b69a0d4b5302e004b3ec81193bfecc0066cc4563a50b15e2c30109d3a57bafe23ca5
 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
diff --git a/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch b/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch
deleted file mode 100644
index 83caf604bf70..000000000000
--- a/media-gfx/krita/files/krita-5.2.2-libjxl-0.9.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From ace7edcca6ad322581ab39620f21ccf3ffbd3b5a Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr@gmail.com>
-Date: Fri, 5 Jan 2024 14:04:50 +0000
-Subject: [PATCH] Fix build with libjxl 0.9.0
-
-Fix build with libjxl 0.9.0
-
-BUG:478987
-
-Test Plan
----------
-
-* Upgrade to libjxl 0.9.0
-* Apply patch from MR and build krita (5.2.2)
-* Open/Display a sample image e.g. https://jpegxl.info/test-page/red-room.jxl
-
-Formalities Checklist
----------------------
-
-- [x] I confirmed this builds.
-- [x] I confirmed Krita ran and the relevant functions work (Could successfully open/display a sample image https://jpegxl.info/test-page/red-room.jxl).
-- [ ] I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
-- [x] I made sure my commits build individually and have good descriptions as per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy).
-- [x] I made sure my code conforms to the standards set in the HACKING file.
-- [x] I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per [KDE Licensing Policy](https://community.kde.org/Policies/Licensing_Policy).
-
-_**Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build.**_
-_**If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.**_
----
- plugins/impex/jxl/JPEGXLImport.cpp | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/impex/jxl/JPEGXLImport.cpp b/plugins/impex/jxl/JPEGXLImport.cpp
-index 573bae41247..f5b989b3b70 100644
---- a/plugins/impex/jxl/JPEGXLImport.cpp
-+++ b/plugins/impex/jxl/JPEGXLImport.cpp
-@@ -511,7 +511,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
-             JxlColorEncoding colorEncoding{};
-             if (JXL_DEC_SUCCESS
-                 == JxlDecoderGetColorAsEncodedProfile(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
-                                                       nullptr,
-+#endif
-                                                       JXL_COLOR_PROFILE_TARGET_DATA,
-                                                       &colorEncoding)) {
-                 const TransferCharacteristics transferFunction = [&]() {
-@@ -635,7 +637,12 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
-                 size_t iccSize = 0;
-                 QByteArray iccProfile;
-                 if (JXL_DEC_SUCCESS
--                    != JxlDecoderGetICCProfileSize(dec.get(), nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) {
-+                    != JxlDecoderGetICCProfileSize(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-+                                                   nullptr,
-+#endif
-+                                                   JXL_COLOR_PROFILE_TARGET_DATA,
-+                                                   &iccSize)) {
-                     errFile << "ICC profile size retrieval failed";
-                     document->setErrorMessage(i18nc("JPEG-XL errors", "Unable to read the image profile."));
-                     return ImportExportCodes::ErrorWhileReading;
-@@ -643,7 +650,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
-                 iccProfile.resize(static_cast<int>(iccSize));
-                 if (JXL_DEC_SUCCESS
-                     != JxlDecoderGetColorAsICCProfile(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-                                                       nullptr,
-+#endif
-                                                       JXL_COLOR_PROFILE_TARGET_DATA,
-                                                       reinterpret_cast<uint8_t *>(iccProfile.data()),
-                                                       static_cast<size_t>(iccProfile.size()))) {
-@@ -657,7 +666,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
-                 if (!d.m_info.uses_original_profile) {
-                     if (JXL_DEC_SUCCESS
-                         != JxlDecoderGetICCProfileSize(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-                                                        nullptr,
-+#endif
-                                                        JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                                        &iccTargetSize)) {
-                         errFile << "ICC profile size retrieval failed";
-@@ -667,7 +678,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
-                     iccTargetProfile.resize(static_cast<int>(iccTargetSize));
-                     if (JXL_DEC_SUCCESS
-                         != JxlDecoderGetColorAsICCProfile(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-                                                           nullptr,
-+#endif
-                                                           JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                                           reinterpret_cast<uint8_t *>(iccTargetProfile.data()),
-                                                           static_cast<size_t>(iccTargetProfile.size()))) {
--- 
-GitLab
-