Commit c1338d8f authored by Jan Beich's avatar Jan Beich
Browse files

graphics/krita: switch to upstreamable fix after 11b08d73

parent d53d9f30

graphics/krita/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ CATEGORIES= graphics kde 
MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}

DIST_SUBDIR=	KDE/${PORTNAME}



PATCH_SITES=	https://invent.kde.org/graphics/${PORTNAME}/-/commit/

PATCHFILES+=	d9e258bf9d6a.patch:-p1 # https://invent.kde.org/graphics/krita/-/merge_requests/2040



MAINTAINER=	kde@FreeBSD.org

COMMENT=	Sketching and painting program

WWW=		https://krita.org

graphics/krita/distinfo

+2 −0
Original line number Diff line number Diff line 
TIMESTAMP = 1702019416

SHA256 (KDE/krita/krita-5.2.2.tar.xz) = 41515784d65b5bf12919df909f7406dc90f37076587b8c459ef2abd569a71adb

SIZE (KDE/krita/krita-5.2.2.tar.xz) = 189146788

SHA256 (KDE/krita/d9e258bf9d6a.patch) = 657c94dba0f0acd3e0ea03a53be2d8225f0d1fbe29c404815236628b6733d046

SIZE (KDE/krita/d9e258bf9d6a.patch) = 4169

graphics/krita/files/patch-plugins_impex_jxl_JPEGXLImport.cpp

deleted100644 → 0
+0 −74
Original line number Diff line number Diff line 
plugins/impex/jxl/JPEGXLImport.cpp:513:20: error: no matching function for call to 'JxlDecoderGetColorAsEncodedProfile'

                == JxlDecoderGetColorAsEncodedProfile(dec.get(),

                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

/usr/local/include/jxl/decode.h:749:29: note: candidate function not viable: requires 3 arguments, but 4 were provided

JXL_EXPORT JxlDecoderStatus JxlDecoderGetColorAsEncodedProfile(

                            ^

plugins/impex/jxl/JPEGXLImport.cpp:638:24: error: no matching function for call to 'JxlDecoderGetICCProfileSize'

                    != JxlDecoderGetICCProfileSize(dec.get(), nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) {

                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~

/usr/local/include/jxl/decode.h:775:29: note: candidate function not viable: requires 3 arguments, but 4 were provided

JXL_EXPORT JxlDecoderStatus JxlDecoderGetICCProfileSize(

                            ^

plugins/impex/jxl/JPEGXLImport.cpp:645:24: error: no matching function for call to 'JxlDecoderGetColorAsICCProfile'

                    != JxlDecoderGetColorAsICCProfile(dec.get(),

                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

/usr/local/include/jxl/decode.h:793:29: note: candidate function not viable: requires 4 arguments, but 5 were provided

JXL_EXPORT JxlDecoderStatus JxlDecoderGetColorAsICCProfile(

                            ^

plugins/impex/jxl/JPEGXLImport.cpp:659:28: error: no matching function for call to 'JxlDecoderGetICCProfileSize'

                        != JxlDecoderGetICCProfileSize(dec.get(),

                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~

/usr/local/include/jxl/decode.h:775:29: note: candidate function not viable: requires 3 arguments, but 4 were provided

JXL_EXPORT JxlDecoderStatus JxlDecoderGetICCProfileSize(

                            ^

plugins/impex/jxl/JPEGXLImport.cpp:669:28: error: no matching function for call to 'JxlDecoderGetColorAsICCProfile'

                        != JxlDecoderGetColorAsICCProfile(dec.get(),

                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

/usr/local/include/jxl/decode.h:793:29: note: candidate function not viable: requires 4 arguments, but 5 were provided

JXL_EXPORT JxlDecoderStatus JxlDecoderGetColorAsICCProfile(

                            ^



--- plugins/impex/jxl/JPEGXLImport.cpp.orig	2023-12-06 11:38:26 UTC

+++ plugins/impex/jxl/JPEGXLImport.cpp

@@ -511,7 +511,6 @@ JPEGXLImport::convert(KisDocument *document, QIODevice

             JxlColorEncoding colorEncoding{};

             if (JXL_DEC_SUCCESS

                 == JxlDecoderGetColorAsEncodedProfile(dec.get(),

-                                                      nullptr,

                                                       JXL_COLOR_PROFILE_TARGET_DATA,

                                                       &colorEncoding)) {

                 const TransferCharacteristics transferFunction = [&]() {

@@ -635,7 +634,7 @@ JPEGXLImport::convert(KisDocument *document, QIODevice

                 size_t iccSize = 0;

                 QByteArray iccProfile;

                 if (JXL_DEC_SUCCESS

-                    != JxlDecoderGetICCProfileSize(dec.get(), nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) {

+                    != JxlDecoderGetICCProfileSize(dec.get(), 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 +642,6 @@ JPEGXLImport::convert(KisDocument *document, QIODevice

                 iccProfile.resize(static_cast<int>(iccSize));

                 if (JXL_DEC_SUCCESS

                     != JxlDecoderGetColorAsICCProfile(dec.get(),

-                                                      nullptr,

                                                       JXL_COLOR_PROFILE_TARGET_DATA,

                                                       reinterpret_cast<uint8_t *>(iccProfile.data()),

                                                       static_cast<size_t>(iccProfile.size()))) {

@@ -657,7 +655,6 @@ JPEGXLImport::convert(KisDocument *document, QIODevice

                 if (!d.m_info.uses_original_profile) {

                     if (JXL_DEC_SUCCESS

                         != JxlDecoderGetICCProfileSize(dec.get(),

-                                                       nullptr,

                                                        JXL_COLOR_PROFILE_TARGET_ORIGINAL,

                                                        &iccTargetSize)) {

                         errFile << "ICC profile size retrieval failed";

@@ -667,7 +664,6 @@ JPEGXLImport::convert(KisDocument *document, QIODevice

                     iccTargetProfile.resize(static_cast<int>(iccTargetSize));

                     if (JXL_DEC_SUCCESS

                         != JxlDecoderGetColorAsICCProfile(dec.get(),

-                                                          nullptr,

                                                           JXL_COLOR_PROFILE_TARGET_ORIGINAL,

                                                           reinterpret_cast<uint8_t *>(iccTargetProfile.data()),

                                                           static_cast<size_t>(iccTargetProfile.size()))) {