From nobody Fri Dec 29 12:58:30 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1lml15PDz5643q; Fri, 29 Dec 2023 12:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1lmk5yTZz3YTq; Fri, 29 Dec 2023 12:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703854710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XLgLV52+dBnu8TJUGZzbk+xuYIbmxfdg237UD0tI3qk=; b=HPlbUiiaEBfYpHVl2TKbHIsxXC/UQWiSmgEZMhvUJDXo8lGa6OXKLmhEcZ67FKKmwd68Xn ou2X2myB4QRXz9Ifm/JRzqN0DqcHdZXcRCbRfxxjHc4q19REOiL7/f7U7IC30MnY81LtzV byX7Q5pdjeh0kmNgtwlfYQRoFDK/o5JnVPoCOsYkaZekWzO5zY43fu1zArTG8gMKLaAGrv WD5CH4x3usm6ylf0Wm0jvAX3Wiw/OSwbqvjivb2z0doAjS7XoUNDsps6sSyDK7hCHTRXm/ rSrv618hW9Zz3MgtWW1sKRvJobnmABFlDFd55HvhCubPpYqu3bK/+vMKv2CF5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703854710; a=rsa-sha256; cv=none; b=t7ZVSrq4/8foGggzs/dmNGkfUSz8s4R8ufAkIziGtiN4dP5u2TeIMBpoWQWARt6e4T9t8g K0mu5dZtw65kd7bnWlC4hgGIM0mDzx86dXD7x5UlYQwMq+EoVBXwqMFZ9omTwygkvhqH6W mv+cp9CT98wIsI6y+fpagX2qbwCecinUpigvFylw4r8Z27R9cB/nvnb4fiL8d4ecIdttva r91ndqqKYEUJHEGBZC0E83gFyTt5b2rmXerVgd5lHoeD0Vd7HwAw+2hSYCdbBRIGwRY42d X6unKtkY9UyCYWFSwb8lqxCIepVuqHQyIrWJuxZJlU7JgnmZb0+fQrEvhxcAMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703854710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XLgLV52+dBnu8TJUGZzbk+xuYIbmxfdg237UD0tI3qk=; b=LfHnz4vDoTsbAqcKbyKbf9ZB0bgKTMqrY2sfbAU1HC8BTTNyhs2F0B7BB/D30bXvzooSTd UeCUGhn5twzkQD733+yE1Ha+Pahx28N0qS6fn7z6zI+kqjA90JgjkrXfJpZbCJ4zLBZVEs mOp91Wy7Idj2ujTvZPJIM6pFgiiKUfnO4fk64T/Bxa+YmVEJ/os47I5zpuk1Q4WdTlfdEO IGtY2OeuTDJgvCZZ81c+t8+MbQzUaKrBOQDEnxN3hbdDayNXaB7tPgNNyKZiYE6sq4/q37 aOM/8WWpqxeOI1yj8mz17k7zHS/5SApqAhEVSLIZPrmQj9P1exiyakHHrHgPag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1lmk543Zz160j; Fri, 29 Dec 2023 12:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTCwU2Q049912; Fri, 29 Dec 2023 12:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTCwUtw049909; Fri, 29 Dec 2023 12:58:30 GMT (envelope-from git) Date: Fri, 29 Dec 2023 12:58:30 GMT Message-Id: <202312291258.3BTCwUtw049909@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: c1338d8f8d3c - main - graphics/krita: switch to upstreamable fix after 11b08d733b7c List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1338d8f8d3c96e292423b627e39ee6c813aef2c Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1338d8f8d3c96e292423b627e39ee6c813aef2c commit c1338d8f8d3c96e292423b627e39ee6c813aef2c Author: Jan Beich AuthorDate: 2023-12-29 10:39:22 +0000 Commit: Jan Beich CommitDate: 2023-12-29 12:57:37 +0000 graphics/krita: switch to upstreamable fix after 11b08d733b7c --- graphics/krita/Makefile | 3 + graphics/krita/distinfo | 2 + .../files/patch-plugins_impex_jxl_JPEGXLImport.cpp | 74 ---------------------- 3 files changed, 5 insertions(+), 74 deletions(-) diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index 2d918764c54f..950961a10b26 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -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 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()))) {