From 692f34f41af3071fc8ae5067a686b0a42f328025d1a26d01b5ac3c2295c99bd5 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 11 Aug 2021 11:35:13 +0000 Subject: [PATCH 1/4] Accepting request 911418 from home:wolfi323:branches:KDE:Extra - Update to 4.4.7: * See https://krita.org/en/item/krita-4-4-7-released/ * Fix for a performance regression in Krita 4.4.5 * Fix a crash on exit with certain versions of Qt and PyQt * Fix moving selection with the magnetic selection tool (kde#433633) * Fix crashes in the magnetic selection tool when deleting nodes (kde#439896) * Fix an assert when converting the image color space from Python (kde#437980) * Fix a crash when closing a gamut mask document (kde#438914) * Fix drag and drop of clone layers between images (kde#414699) * Fix crash when saving the image with trimming enabled (kde#437626) OBS-URL: https://build.opensuse.org/request/show/911418 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=151 --- krita-4.4.5.tar.xz | 3 --- krita-4.4.7.tar.xz | 3 +++ krita.changes | 18 ++++++++++++++++++ krita.spec | 5 ++++- 4 files changed, 25 insertions(+), 4 deletions(-) delete mode 100644 krita-4.4.5.tar.xz create mode 100644 krita-4.4.7.tar.xz diff --git a/krita-4.4.5.tar.xz b/krita-4.4.5.tar.xz deleted file mode 100644 index 908ea23..0000000 --- a/krita-4.4.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84c53686056d8f7485658004ca454eb275e35221307362e65daaac934a5c3b78 -size 174217180 diff --git a/krita-4.4.7.tar.xz b/krita-4.4.7.tar.xz new file mode 100644 index 0000000..9b66b22 --- /dev/null +++ b/krita-4.4.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fc0f9addadfec8b784840ba6190e4a0ff8c80f6f486f65e3e6f93a8cbaf5396 +size 171839920 diff --git a/krita.changes b/krita.changes index 67c58c5..6f3fd1e 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sun Aug 8 13:01:02 UTC 2021 - Wolfgang Bauer + +- Update to 4.4.7: + * See https://krita.org/en/item/krita-4-4-7-released/ + * Fix for a performance regression in Krita 4.4.5 + * Fix a crash on exit with certain versions of Qt and PyQt + * Fix moving selection with the magnetic selection tool + (kde#433633) + * Fix crashes in the magnetic selection tool when deleting nodes + (kde#439896) + * Fix an assert when converting the image color space from Python + (kde#437980) + * Fix a crash when closing a gamut mask document (kde#438914) + * Fix drag and drop of clone layers between images (kde#414699) + * Fix crash when saving the image with trimming enabled + (kde#437626) + ------------------------------------------------------------------- Sat Jul 24 07:35:18 UTC 2021 - Christophe Giboudeaux diff --git a/krita.spec b/krita.spec index 6de0a35..38a37bc 100644 --- a/krita.spec +++ b/krita.spec @@ -24,7 +24,7 @@ %bcond_with vc %endif Name: krita -Version: 4.4.5 +Version: 4.4.7 Release: 0 Summary: Digital Painting Application License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND CC0-1.0 AND LGPL-2.0-only @@ -143,6 +143,9 @@ export CXXFLAGS="%{optflags} -DHAS_ONLY_OPENGL_ES" chmod -x %{buildroot}/%{_kf5_applicationsdir}/*.desktop +# remove shebang to avoid rpmlint warning, that file is not supposed to be run directly anyway +sed -i "/#!\/usr\/bin\/env/d" %{buildroot}/%{_kf5_libdir}/krita-python-libs/krita/sceditor/highlighter.py + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig From 2092968cddc8938a83a09f4b1f3b29f3ecf3a1a505242c5e9d434b9a8baded2b Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 11 Aug 2021 13:39:44 +0000 Subject: [PATCH 2/4] openEXR 3 fix OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=152 --- 0001-Support-building-with-OpenEXR-3.patch | 156 +++++++++++++++++++++ krita.changes | 6 + krita.spec | 2 + 3 files changed, 164 insertions(+) create mode 100644 0001-Support-building-with-OpenEXR-3.patch diff --git a/0001-Support-building-with-OpenEXR-3.patch b/0001-Support-building-with-OpenEXR-3.patch new file mode 100644 index 0000000..22bd391 --- /dev/null +++ b/0001-Support-building-with-OpenEXR-3.patch @@ -0,0 +1,156 @@ +From 5a720e94e62b8ae4a17dc8bee844f0baee923a9b Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Fri, 23 Apr 2021 23:42:14 +0200 +Subject: [PATCH] Support building with OpenEXR 3 + +Try to find OpenEXR 3 first via the upstream cmake config and fallback to using our FindOpenEXR +--- + CMakeLists.txt | 11 ++++++++--- + libs/image/CMakeLists.txt | 2 +- + libs/pigment/CMakeLists.txt | 2 +- + plugins/color/lcms2engine/CMakeLists.txt | 6 +++--- + plugins/color/lcms2engine/tests/CMakeLists.txt | 2 +- + plugins/impex/CMakeLists.txt | 2 +- + plugins/impex/exr/exr_converter.cc | 2 ++ + plugins/impex/raw/CMakeLists.txt | 2 +- + 8 files changed, 18 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d2aaadf6fe..bc6a0207e9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -628,15 +628,20 @@ set_package_properties(ZLIB PROPERTIES + PURPOSE "Optionally used by the G'Mic and the PSD plugins") + macro_bool_to_01(ZLIB_FOUND HAVE_ZLIB) + +-find_package(OpenEXR) ++find_package(OpenEXR 3.0 CONFIG QUIET) ++if(TARGET OpenEXR::OpenEXR) ++ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR) ++else() ++ find_package(OpenEXR) ++endif() + set_package_properties(OpenEXR PROPERTIES + DESCRIPTION "High dynamic-range (HDR) image file format" + URL "https://www.openexr.com" + TYPE OPTIONAL + PURPOSE "Required by the Krita OpenEXR filter") +-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR) ++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR) + set(LINK_OPENEXR_LIB) +-if(OPENEXR_FOUND) ++if(OpenEXR_FOUND) + include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS}) + set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES}) + add_definitions(${OPENEXR_DEFINITIONS}) +diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt +index 79e5b55059..4841ab139d 100644 +--- a/libs/image/CMakeLists.txt ++++ b/libs/image/CMakeLists.txt +@@ -360,7 +360,7 @@ if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB) + endif() + endif() + +-if(OPENEXR_FOUND) ++if(OpenEXR_FOUND) + target_link_libraries(kritaimage PUBLIC ${OPENEXR_LIBRARIES}) + endif() + +diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt +index 2da577f043..8c1a70f4c7 100644 +--- a/libs/pigment/CMakeLists.txt ++++ b/libs/pigment/CMakeLists.txt +@@ -14,7 +14,7 @@ include_directories( + + set(FILE_OPENEXR_SOURCES) + set(LINK_OPENEXR_LIB) +-if(OPENEXR_FOUND) ++if(OpenEXR_FOUND) + include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS}) + set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES}) + add_definitions(${OPENEXR_DEFINITIONS}) +diff --git a/plugins/color/lcms2engine/CMakeLists.txt b/plugins/color/lcms2engine/CMakeLists.txt +index e14de2ba7c..04d0841953 100644 +--- a/plugins/color/lcms2engine/CMakeLists.txt ++++ b/plugins/color/lcms2engine/CMakeLists.txt +@@ -28,7 +28,7 @@ include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles + ) + +-if (HAVE_LCMS24 AND OPENEXR_FOUND) ++if (HAVE_LCMS24 AND OpenEXR_FOUND) + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16 + ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16 +@@ -38,7 +38,7 @@ endif () + + set(FILE_OPENEXR_SOURCES) + set(LINK_OPENEXR_LIB) +-if(OPENEXR_FOUND) ++if(OpenEXR_FOUND) + include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS}) + set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES}) + add_definitions(${OPENEXR_DEFINITIONS}) +@@ -77,7 +77,7 @@ set ( lcmsengine_SRCS + LcmsEnginePlugin.cpp + ) + +-if (HAVE_LCMS24 AND OPENEXR_FOUND) ++if (HAVE_LCMS24 AND OpenEXR_FOUND) + set ( lcmsengine_SRCS + ${lcmsengine_SRCS} + colorspaces/gray_f16/GrayF16ColorSpace.cpp +diff --git a/plugins/color/lcms2engine/tests/CMakeLists.txt b/plugins/color/lcms2engine/tests/CMakeLists.txt +index b548dfa19f..2bcddec635 100644 +--- a/plugins/color/lcms2engine/tests/CMakeLists.txt ++++ b/plugins/color/lcms2engine/tests/CMakeLists.txt +@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16 + ../colorprofiles + .. + ) +-if(OPENEXR_FOUND) ++if(OpenEXR_FOUND) + include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS}) + endif() + include_directories( ${LCMS2_INCLUDE_DIR} ) +diff --git a/plugins/impex/CMakeLists.txt b/plugins/impex/CMakeLists.txt +index 499b1c97d0..82d936575b 100644 +--- a/plugins/impex/CMakeLists.txt ++++ b/plugins/impex/CMakeLists.txt +@@ -19,7 +19,7 @@ if(PNG_FOUND) + add_subdirectory(csv) + endif() + +-if(OPENEXR_FOUND) ++if(OpenEXR_FOUND) + add_subdirectory(exr) + endif() + +diff --git a/plugins/impex/exr/exr_converter.cc b/plugins/impex/exr/exr_converter.cc +index bde4784379..4f90c25a1f 100644 +--- a/plugins/impex/exr/exr_converter.cc ++++ b/plugins/impex/exr/exr_converter.cc +@@ -24,6 +24,8 @@ + + #include + #include ++#include ++#include + #include + #include + +diff --git a/plugins/impex/raw/CMakeLists.txt b/plugins/impex/raw/CMakeLists.txt +index 71cb5b355c..f65bc770a5 100644 +--- a/plugins/impex/raw/CMakeLists.txt ++++ b/plugins/impex/raw/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_subdirectory(tests) + +-if(OPENEXR_FOUND) ++if(OpenEXR_FOUND) + include_directories(${OPENEXR_INCLUDE_DIRS}) + endif() + include_directories(${LibRaw_INCLUDE_DIR}) +-- +2.32.0 + diff --git a/krita.changes b/krita.changes index 6f3fd1e..50f8131 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 11 13:38:26 UTC 2021 - Christophe Giboudeaux + +- Add patch to allow building krita with OpenEXR 3 (boo#1189327): + * 0001-Support-building-with-OpenEXR-3.patch + ------------------------------------------------------------------- Sun Aug 8 13:01:02 UTC 2021 - Wolfgang Bauer diff --git a/krita.spec b/krita.spec index 38a37bc..e77c306 100644 --- a/krita.spec +++ b/krita.spec @@ -31,6 +31,8 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND Group: Productivity/Graphics/Bitmap Editors URL: https://www.krita.org/ Source0: https://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Support-building-with-OpenEXR-3.patch %ifnarch %{arm} aarch64 # Causes build failure on ARM currently # 2021-07-24: Disabled for Tumbleweed (kde#435474) From ca9ea7757219e1f2846e6e51904ca76e5cd31a51ca6f0dca66c60d7200094030 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 11 Aug 2021 13:40:06 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=153 --- krita.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krita.spec b/krita.spec index e77c306..771a143 100644 --- a/krita.spec +++ b/krita.spec @@ -146,7 +146,7 @@ export CXXFLAGS="%{optflags} -DHAS_ONLY_OPENGL_ES" chmod -x %{buildroot}/%{_kf5_applicationsdir}/*.desktop # remove shebang to avoid rpmlint warning, that file is not supposed to be run directly anyway -sed -i "/#!\/usr\/bin\/env/d" %{buildroot}/%{_kf5_libdir}/krita-python-libs/krita/sceditor/highlighter.py +sed -i "/#!\/usr\/bin\/env/d" %{buildroot}%{_kf5_libdir}/krita-python-libs/krita/sceditor/highlighter.py %post -p /sbin/ldconfig %postun -p /sbin/ldconfig From c3115ea4cbf91c5fe917e3bc420a9bae162711e2baab48364fcae90d758d2ff5 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 11 Aug 2021 13:40:16 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=154 --- krita.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krita.spec b/krita.spec index 771a143..48882f7 100644 --- a/krita.spec +++ b/krita.spec @@ -143,7 +143,7 @@ export CXXFLAGS="%{optflags} -DHAS_ONLY_OPENGL_ES" %kf5_find_lang %{name} %endif -chmod -x %{buildroot}/%{_kf5_applicationsdir}/*.desktop +chmod -x %{buildroot}%{_kf5_applicationsdir}/*.desktop # remove shebang to avoid rpmlint warning, that file is not supposed to be run directly anyway sed -i "/#!\/usr\/bin\/env/d" %{buildroot}%{_kf5_libdir}/krita-python-libs/krita/sceditor/highlighter.py