diff --git a/0001-Support-building-with-OpenEXR-3.patch b/0001-Support-building-with-OpenEXR-3.patch deleted file mode 100644 index 22bd391..0000000 --- a/0001-Support-building-with-OpenEXR-3.patch +++ /dev/null @@ -1,156 +0,0 @@ -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-4.4.8.tar.xz b/krita-4.4.8.tar.xz deleted file mode 100644 index 25ae0b8..0000000 --- a/krita-4.4.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45112bf9d59beaf70de1e221699711a66b617a680d07e59d037d3b93ae77f450 -size 172636696 diff --git a/krita-5.0.2.tar.xz b/krita-5.0.2.tar.xz new file mode 100644 index 0000000..9993587 --- /dev/null +++ b/krita-5.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:634102e0bf0c03c0ec9dc4dd647d5f618c8f136cf79bd50136e6f012be6b4e63 +size 179049488 diff --git a/krita-5.0.2.tar.xz.sig b/krita-5.0.2.tar.xz.sig new file mode 100644 index 0000000..6799dc9 --- /dev/null +++ b/krita-5.0.2.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEBkGCRAxnTZ+ND2+LTaee2iMchSsFAmHVf1QACgkQTaee2iMc +hSsXwhAA3e8rKU/dMLZVma0pp0JB5mUnKqaYmfGD+Cniw5OgpxBwLOyEsOxgAHsd +/n+6jRhthjQbm26NCg+PpE2g7L9HskYdMgpXUqXbrgVEFYSoVOW+7W6bJTLcUNU3 +uAlKjLeuLLVV05DBm2pZ7JO0oD6pQmwcsmQvaBtxtWcT9TDhwObqn9hE4zqkInGr +qNqMN8vSxMdPPAyogGOKvZCsGpavSsEdG4pgbn+YMEtTafpY+dRErtniONmnPxiS +o0NxYBUsgrJhy93Bi6zHZu5X2HxnYW3A6h8sCpQ2vjINYiUzSxOEL7kSvPHYMoER +2LyyMsHylzYQ2J6zxwbfS2WnCKNaliqmaCv83guOPVbEd335J5csyjHtZ69tRwCU +zsk0sod8X/0MVI9S4PT8zNqtJU53eN/xGDmx7xMa3QT0OEj6hRdhar5K5E4p0iYz +LMwwAo2HczaWMMbDP4aE+0eFP71WdxedEMN9L7ABAdagFHDWSD1b4Jn2FywBFyNU +tWWwPFyIgYItjrge2Iju2SAW2qgF7kZFjzHeQZ5ctRr8fddecBETdx2p44++dAvB +gqNC/so+pZatzb2AJqcS0drBbsP+5ReJJuwwoTrI8xNG5nBc12K87Qvr18WkURmA +CbGtWHrY3LXqoUJreI9xbv5sxjO7O41JD4j1s93q87eZmNIBtkg= +=AIKW +-----END PGP SIGNATURE----- diff --git a/krita.changes b/krita.changes index d42d8bf..97ae3bd 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Fri Jan 7 08:11:30 UTC 2022 - Wolfgang Bauer + +- Update to 5.0.2 + * See https://krita.org/en/item/krita-5-0-2/ + * Fix a crash when changing the Instant Preview setting of a + brush preset + * Fix a crash when there are ABR brush libraries present with an + uppercase ABR extension (kde#447454) + * Fix a similar issue with Krita resource bundles with an upper + case .BUNDLE extension + * Fix a crash when undoing multiple layer operations too quickly + (kde#447462) + * Workaround a crash when a transform mask is applied to a + passthrough group (kde#447506) + * Fix toolbox arrow buttons not visible on starting Krita + * Fix the photoshop compatibilty shortcut profile (kde#447771) + * Restore the QImageIO fallback for loading WebP images + * Make the dock widget titlebars so they can be smaller + * Disable all accelerator keys for dockers + * Fix a race condition in the image metadata system + * Fix the tool option widget's layout sporadically going wrong + (kde#447522) + * Update fill layers correctly when changing the options from a + Python script (kde#447807) + * Fix the built-in file dialog's image preview (kde#447806) + * Fix the slowness opening and closing documents if there are + many resource bundles present (kde#447298) +- Drop redundant recommendation of the -lang package +- Add signature file and keyring + +------------------------------------------------------------------- +Thu Dec 23 19:10:11 UTC 2021 - Marcus Rueckert + +- Update to 5.0.0 + * See https://krita.org/en/item/krita-5-0-released/ +- drop 0001-Support-building-with-OpenEXR-3.patch: + included in update +- add BR to mypaint to enable the new brushes +- add BR for OpenColorIO and WebP to enable both features as well + ------------------------------------------------------------------- Wed Aug 25 09:39:44 UTC 2021 - Wolfgang Bauer diff --git a/krita.keyring b/krita.keyring new file mode 100644 index 0000000..3e33023 --- /dev/null +++ b/krita.keyring @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +KB2ZRfm/7sIVbgvukA== +=dd6m +-----END PGP PUBLIC KEY BLOCK----- diff --git a/krita.spec b/krita.spec index 65577e9..7b1f62a 100644 --- a/krita.spec +++ b/krita.spec @@ -1,7 +1,7 @@ # # spec file for package krita # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%bcond_without lang +%bcond_without released # Enable VC only on x86* %ifarch %{ix86} x86_64 %bcond_without vc @@ -24,21 +24,16 @@ %bcond_with vc %endif Name: krita -Version: 4.4.8 +Version: 5.0.2 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 +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 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) -%if 0%{?suse_version} < 1550 -BuildRequires: OpenColorIO-devel -%endif +%if %{with released} +Source1: https://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.xz.sig +Source2: krita.keyring %endif BuildRequires: OpenEXR-devel BuildRequires: extra-cmake-modules @@ -92,15 +87,19 @@ BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5X11Extras) BuildRequires: cmake(Qt5Xml) +BuildRequires: pkgconfig(OpenColorIO) +BuildRequires: pkgconfig(libmypaint) +BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(xcb-atom) BuildRequires: pkgconfig(xi) >= 1.4.99.1 -Recommends: %{name}-lang = %{version} Recommends: python3-qt5 Obsoletes: calligra-krita < %{version} Provides: calligra-krita = %{version} %if %{with vc} BuildRequires: Vc-devel-static %endif +# it has an intree copy now and no longer works with the external copy +Conflicts: krita-plugin-gmic %description Krita is a painting program. It supports concept art, texture and @@ -132,7 +131,7 @@ export CXXFLAGS="%{optflags} -DHAS_ONLY_OPENGL_ES" %install %kf5_makeinstall -C build %suse_update_desktop_file -r org.kde.krita Qt KDE Graphics RasterGraphics -%if %{with lang} +%if %{with released} %kf5_find_lang %{name} %endif @@ -141,6 +140,11 @@ 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 +rm \ + %{buildroot}%{_includedir}/kis_qmic_interface.h \ + %{buildroot}%{_includedir}/kis_qmic_plugin_interface.h \ + %{buildroot}%{_includedir}/kritaqmicinterface_export.h + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -176,7 +180,7 @@ sed -i "/#!\/usr\/bin\/env/d" %{buildroot}%{_kf5_libdir}/krita-python-libs/krita %files devel %{_kf5_libdir}/libkrita*.so -%if %{with lang} +%if %{with released} %files lang -f %{name}.lang %endif