mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 14:43:52 +02:00
krita: update to 5.2.3.
This commit is contained in:
parent
13758ceeed
commit
b47562517f
2 changed files with 4 additions and 75 deletions
|
@ -1,71 +0,0 @@
|
||||||
From d9e258bf9d6af5f53467becf65bb21bf6f96a38e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Timo Gurr <timo.gurr@gmail.com>
|
|
||||||
Date: Fri, 29 Dec 2023 11:10:26 +0100
|
|
||||||
Subject: [PATCH] Fix build with libjxl 0.9.0
|
|
||||||
|
|
||||||
BUG:478987
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# Template file for 'krita'
|
# Template file for 'krita'
|
||||||
pkgname=krita
|
pkgname=krita
|
||||||
version=5.2.1
|
version=5.2.3
|
||||||
revision=6
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
|
configure_args="-Wno-dev -DBUILD_TESTING=OFF -DENABLE_UPDATERS=OFF"
|
||||||
hostmakedepends="extra-cmake-modules gettext pkg-config python3
|
hostmakedepends="extra-cmake-modules gettext pkg-config python3
|
||||||
qt5-qmake qt5-host-tools kcoreaddons python3-PyQt5
|
qt5-qmake qt5-host-tools kcoreaddons python3-PyQt5
|
||||||
python3-PyQt5-devel"
|
python3-PyQt5-devel"
|
||||||
|
@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
|
||||||
license="GPL-3.0-only"
|
license="GPL-3.0-only"
|
||||||
homepage="https://krita.org/"
|
homepage="https://krita.org/"
|
||||||
distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.xz"
|
distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.xz"
|
||||||
checksum=47978f50701be23a18b9c4c3cb2818717b712652807ac5ca954309fb0818b1f2
|
checksum=cf78ddb39700c92928cf14d7611b8ef3870d8f5b83ef590d43e218bec5dafd54
|
||||||
python_version=3
|
python_version=3
|
||||||
replaces="calligra-krita>=0"
|
replaces="calligra-krita>=0"
|
||||||
# FIXME
|
# FIXME
|
||||||
|
|
Loading…
Add table
Reference in a new issue