diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index 2d918764c54f..950961a10b26 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -1,81 +1,84 @@ PORTNAME= krita DISTVERSION= 5.2.2 PORTREVISION= 1 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 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= boost-libs>=1.65:devel/boost-libs \ immer>=0:devel/immer \ lager>=0:devel/lager \ zug>=0:devel/zug BUILD_DEPENDS+= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_aarch64= xsimd>=8.1:devel/xsimd BUILD_DEPENDS_amd64= xsimd>=8.1:devel/xsimd LIB_DEPENDS= libImath.so:math/Imath \ libOpenColorIO.so:graphics/opencolorio \ libX11.so:x11/libX11 \ libexiv2.so:graphics/exiv2 \ libfftw3.so:math/fftw3 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ libgif.so:graphics/giflib \ libgsl.so:math/gsl \ libharfbuzz.so:print/harfbuzz \ libheif.so:graphics/libheif \ libjson-c.so:devel/json-c \ libjxl.so:graphics/libjxl \ liblcms2.so:graphics/lcms2 \ libmypaint.so:graphics/libmypaint \ libopenjp2.so:graphics/openjpeg \ libpng16.so:graphics/png \ libpoppler.so:graphics/poppler \ libpoppler-qt5.so:graphics/poppler-qt5 \ libquazip1-qt5.so:archivers/quazip@qt5 \ libtiff.so:graphics/tiff \ libturbojpeg.so:graphics/libjpeg-turbo \ libunibreak.so:textproc/libunibreak \ libwebp.so:graphics/webp USES= cmake compiler:c++11-lib desktop-file-utils eigen:3 gettext \ gnome jpeg kde:5 localbase:ldflags mlt:7 pkgconfig python qt:5 \ sdl shared-mime-info tar:xz xorg USE_GNOME= glib20 USE_KDE= completion config coreaddons crash guiaddons i18n \ itemmodels itemviews libkdcraw service widgetsaddons \ windowsystem ecm:build USE_QT= concurrent core dbus declarative gui network \ printsupport sql svg widgets x11extras xml \ buildtools:build qmake:build testlib:build \ sql-sqlite3:run USE_SDL= sdl2 USE_XORG= ice sm xcb xext xi # Make Cmake use the python we installed dependencies for. CMAKE_ARGS= -DPython_EXECUTABLE:STRING=${PYTHON_CMD} PLIST_SUB= SHLIB_VER=19.0.0 \ SHLIB_SHVER=19 OPTIONS_DEFINE= PYTHON OPENEXR OPTIONS_DEFAULT= PYTHON OPENEXR OPTIONS_SUB= yes OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ libKSeExpr.so:graphics/kseexpr OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR PYTHON_BUILD_DEPENDS= ${PY_SETUPTOOLS} PYTHON_USES= pyqt:5 PYTHON_USE= PYQT=pyqt5,sip,pysip PYTHON_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PyQt5 .include diff --git a/graphics/krita/distinfo b/graphics/krita/distinfo index 52e5120f2608..f0fb54880b67 100644 --- a/graphics/krita/distinfo +++ b/graphics/krita/distinfo @@ -1,3 +1,5 @@ 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 diff --git a/graphics/krita/files/patch-plugins_impex_jxl_JPEGXLImport.cpp b/graphics/krita/files/patch-plugins_impex_jxl_JPEGXLImport.cpp deleted file mode 100644 index f3fdc06afac7..000000000000 --- a/graphics/krita/files/patch-plugins_impex_jxl_JPEGXLImport.cpp +++ /dev/null @@ -1,74 +0,0 @@ -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(iccSize)); - if (JXL_DEC_SUCCESS - != JxlDecoderGetColorAsICCProfile(dec.get(), -- nullptr, - JXL_COLOR_PROFILE_TARGET_DATA, - reinterpret_cast(iccProfile.data()), - static_cast(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(iccTargetSize)); - if (JXL_DEC_SUCCESS - != JxlDecoderGetColorAsICCProfile(dec.get(), -- nullptr, - JXL_COLOR_PROFILE_TARGET_ORIGINAL, - reinterpret_cast(iccTargetProfile.data()), - static_cast(iccTargetProfile.size()))) {