Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package krita for openSUSE:Factory checked in at 2025-08-20 14:40:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krita (Old) and /work/SRC/openSUSE:Factory/.krita.new.29662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krita" Wed Aug 20 14:40:26 2025 rev:85 rq:1300466 version:5.2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/krita/krita.changes 2025-07-10 22:14:10.168758503 +0200 +++ /work/SRC/openSUSE:Factory/.krita.new.29662/krita.changes 2025-08-20 14:40:30.952589270 +0200 @@ -1,0 +2,13 @@ +Wed Aug 20 07:35:32 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 5.2.11 + https://krita.org/en/posts/2025/krita-5.2.11-released/ + * Fix an issue updating the canvas when entering/exiting + canvas-only mode + * Fix an issue in the index colors filter when trying to apply + the filter to a layer that has only one, non-transparent color + * Fix Python invalid escape sequence warnings (kde#489526) +- Add upstream change: + * 0001-Fix-compilation-with-heif-1.20.2.patch + +------------------------------------------------------------------- Old: ---- krita-5.2.10.tar.xz krita-5.2.10.tar.xz.sig New: ---- 0001-Fix-compilation-with-heif-1.20.2.patch krita-5.2.11.tar.xz krita-5.2.11.tar.xz.sig ----------(New B)---------- New:- Add upstream change: * 0001-Fix-compilation-with-heif-1.20.2.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krita.spec ++++++ --- /var/tmp/diff_new_pack.XuajDn/_old 2025-08-20 14:40:33.260685241 +0200 +++ /var/tmp/diff_new_pack.XuajDn/_new 2025-08-20 14:40:33.264685408 +0200 @@ -1,7 +1,7 @@ # # spec file for package krita # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ %define pyver python311 %endif Name: krita -Version: 5.2.10 +Version: 5.2.11 Release: 0 Summary: Digital Painting Application License: BSD-2-Clause AND GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND CC0-1.0 AND LGPL-2.0-only @@ -45,6 +45,8 @@ Patch1: 5d44af277b005692241a09f30e11bb0d16166823.patch # PATCH-FIX-UPSTREAM Patch2: 0001-Fix-build-with-libheif-1.20.patch +# PATCH-FIX-UPSTREAM +Patch3: 0001-Fix-compilation-with-heif-1.20.2.patch BuildRequires: %{pyver}-devel BuildRequires: %{pyver}-qt5-devel BuildRequires: %{pyver}-sip-devel ++++++ 0001-Fix-compilation-with-heif-1.20.2.patch ++++++ >From 6da631dcb7599537b0aa7c1c3982e1a0ceee5e4e Mon Sep 17 00:00:00 2001 From: Dmitry Kazakov <dimul...@gmail.com> Date: Thu, 14 Aug 2025 14:08:40 +0200 Subject: [PATCH] Fix compilation with heif 1.20.2 They changed API again (reverted the original patch) https://github.com/strukturag/libheif/commit/b8deaab965a2860df9824c8813f55953e8d2812b krita#12 --- plugins/impex/heif/HeifExport.cpp | 26 ++++++++++++++++---------- plugins/impex/heif/HeifImport.cpp | 23 ++++++++++++++--------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/plugins/impex/heif/HeifExport.cpp b/plugins/impex/heif/HeifExport.cpp index ccbc803..ab38ca7 100644 --- a/plugins/impex/heif/HeifExport.cpp +++ b/plugins/impex/heif/HeifExport.cpp @@ -137,12 +137,18 @@ KisImportExportErrorCode HeifExport::convert(KisDocument *document, QIODevice *i HeifLock lock; #endif -#if LIBHEIF_HAVE_VERSION(1, 20, 0) +#if LIBHEIF_HAVE_VERSION(1, 20, 2) using HeifStrideType = size_t; + auto heifGetPlaneMethod = std::mem_fn(qNonConstOverload<heif_channel, HeifStrideType*>(&heif::Image::get_plane2)); +#elif LIBHEIF_HAVE_VERSION(1, 20, 0) + using HeifStrideType = size_t; + auto heifGetPlaneMethod = std::mem_fn(qNonConstOverload<heif_channel, HeifStrideType*>(&heif::Image::get_plane)); #else using HeifStrideType = int; + auto heifGetPlaneMethod = std::mem_fn(qNonConstOverload<heif_channel, HeifStrideType*>(&heif::Image::get_plane)); #endif + KisImageSP image = document->savingImage(); const KoColorSpace *cs = image->colorSpace(); @@ -261,14 +267,14 @@ KisImportExportErrorCode HeifExport::convert(KisDocument *document, QIODevice *i HeifStrideType strideB = 0; HeifStrideType strideA = 0; - uint8_t *ptrR = img.get_plane(heif_channel_R, &strideR); - uint8_t *ptrG = img.get_plane(heif_channel_G, &strideG); - uint8_t *ptrB = img.get_plane(heif_channel_B, &strideB); + uint8_t *ptrR = heifGetPlaneMethod(img, heif_channel_R, &strideR); + uint8_t *ptrG = heifGetPlaneMethod(img, heif_channel_G, &strideG); + uint8_t *ptrB = heifGetPlaneMethod(img, heif_channel_B, &strideB); uint8_t *ptrA = [&]() -> uint8_t * { if (hasAlpha) { img.add_plane(heif_channel_Alpha, width, height, 8); - return img.get_plane(heif_channel_Alpha, &strideA); + return heifGetPlaneMethod(img, heif_channel_Alpha, &strideA); } else { return nullptr; } @@ -297,7 +303,7 @@ KisImportExportErrorCode HeifExport::convert(KisDocument *document, QIODevice *i HeifStrideType stride = 0; - uint8_t *ptr = img.get_plane(heif_channel_interleaved, &stride); + uint8_t *ptr = heifGetPlaneMethod(img, heif_channel_interleaved, &stride); KisPaintDeviceSP pd = image->projection(); KisHLineConstIteratorSP it = @@ -339,11 +345,11 @@ KisImportExportErrorCode HeifExport::convert(KisDocument *document, QIODevice *i HeifStrideType strideG = 0; HeifStrideType strideA = 0; - uint8_t *ptrG = img.get_plane(heif_channel_Y, &strideG); + uint8_t *ptrG = heifGetPlaneMethod(img, heif_channel_Y, &strideG); uint8_t *ptrA = [&]() -> uint8_t * { if (hasAlpha) { img.add_plane(heif_channel_Alpha, width, height, 8); - return img.get_plane(heif_channel_Alpha, &strideA); + return heifGetPlaneMethod(img, heif_channel_Alpha, &strideA); } else { return nullptr; } @@ -372,11 +378,11 @@ KisImportExportErrorCode HeifExport::convert(KisDocument *document, QIODevice *i HeifStrideType strideG = 0; HeifStrideType strideA = 0; - uint8_t *ptrG = img.get_plane(heif_channel_Y, &strideG); + uint8_t *ptrG = heifGetPlaneMethod(img, heif_channel_Y, &strideG); uint8_t *ptrA = [&]() -> uint8_t * { if (hasAlpha) { img.add_plane(heif_channel_Alpha, width, height, 12); - return img.get_plane(heif_channel_Alpha, &strideA); + return heifGetPlaneMethod(img, heif_channel_Alpha, &strideA); } else { return nullptr; } diff --git a/plugins/impex/heif/HeifImport.cpp b/plugins/impex/heif/HeifImport.cpp index 6bceea8..aab60c0 100644 --- a/plugins/impex/heif/HeifImport.cpp +++ b/plugins/impex/heif/HeifImport.cpp @@ -214,10 +214,15 @@ KisImportExportErrorCode HeifImport::convert(KisDocument *document, QIODevice *i HeifLock lock; #endif -#if LIBHEIF_HAVE_VERSION(1, 20, 0) +#if LIBHEIF_HAVE_VERSION(1, 20, 2) using HeifStrideType = size_t; + auto heifGetPlaneMethod = std::mem_fn(qNonConstOverload<heif_channel, HeifStrideType*>(&heif::Image::get_plane2)); +#elif LIBHEIF_HAVE_VERSION(1, 20, 0) + using HeifStrideType = size_t; + auto heifGetPlaneMethod = std::mem_fn(qNonConstOverload<heif_channel, HeifStrideType*>(&heif::Image::get_plane)); #else using HeifStrideType = int; + auto heifGetPlaneMethod = std::mem_fn(qNonConstOverload<heif_channel, HeifStrideType*>(&heif::Image::get_plane)); #endif // Wrap input stream into heif Reader object @@ -395,9 +400,9 @@ KisImportExportErrorCode HeifImport::convert(KisDocument *document, QIODevice *i dbgFile << "monochrome heif file, bits:" << luma; HeifStrideType strideG = 0; HeifStrideType strideA = 0; - const uint8_t *imgG = heifimage.get_plane(heif_channel_Y, &strideG); + const uint8_t *imgG = heifGetPlaneMethod(heifimage, heif_channel_Y, &strideG); const uint8_t *imgA = - heifimage.get_plane(heif_channel_Alpha, &strideA); + heifGetPlaneMethod(heifimage, heif_channel_Alpha, &strideA); const int width = heifimage.get_width(heif_channel_Y); const int height = heifimage.get_height(heif_channel_Y); KisHLineIteratorSP it = @@ -419,11 +424,11 @@ KisImportExportErrorCode HeifImport::convert(KisDocument *document, QIODevice *i HeifStrideType strideG = 0; HeifStrideType strideB = 0; HeifStrideType strideA = 0; - const uint8_t* imgR = heifimage.get_plane(heif_channel_R, &strideR); - const uint8_t* imgG = heifimage.get_plane(heif_channel_G, &strideG); - const uint8_t* imgB = heifimage.get_plane(heif_channel_B, &strideB); + const uint8_t* imgR = heifGetPlaneMethod(heifimage, heif_channel_R, &strideR); + const uint8_t* imgG = heifGetPlaneMethod(heifimage, heif_channel_G, &strideG); + const uint8_t* imgB = heifGetPlaneMethod(heifimage, heif_channel_B, &strideB); const uint8_t *imgA = - heifimage.get_plane(heif_channel_Alpha, &strideA); + heifGetPlaneMethod(heifimage, heif_channel_Alpha, &strideA); KisHLineIteratorSP it = layer->paintDevice()->createHLineIteratorNG(0, 0, width); Planar::readPlanarLayer(luma, @@ -448,7 +453,7 @@ KisImportExportErrorCode HeifImport::convert(KisDocument *document, QIODevice *i HeifStrideType stride = 0; dbgFile << "interleaved SDR heif file, bits:" << luma; - const uint8_t *img = heifimage.get_plane(heif_channel_interleaved, &stride); + const uint8_t *img = heifGetPlaneMethod(heifimage, heif_channel_interleaved, &stride); width = heifimage.get_width(heif_channel_interleaved); height = heifimage.get_height(heif_channel_interleaved); KisHLineIteratorSP it = @@ -471,7 +476,7 @@ KisImportExportErrorCode HeifImport::convert(KisDocument *document, QIODevice *i dbgFile << "interleaved HDR heif file, bits:" << luma; const uint8_t *img = - heifimage.get_plane(heif_channel_interleaved, &stride); + heifGetPlaneMethod(heifimage, heif_channel_interleaved, &stride); KisHLineIteratorSP it = layer->paintDevice()->createHLineIteratorNG(0, 0, width); -- 2.50.1 ++++++ krita-5.2.10.tar.xz -> krita-5.2.11.tar.xz ++++++ /work/SRC/openSUSE:Factory/krita/krita-5.2.10.tar.xz /work/SRC/openSUSE:Factory/.krita.new.29662/krita-5.2.11.tar.xz differ: char 27, line 1
