PR#5: Updated to version 5.0.0. - rpms/krita

rpms / krita

#5 Updated to version 5.0.0.

Merged 2 years ago by rdieter. Opened 2 years ago by xvitaly.

Unknown source release/5.0 into rawhide

Vitaly Zaitsev • 2 years ago

aa7d99c

.gitignore

file modified

		`@@ -3,3 +3,4 @@`
		`/krita-4.4.3-beta1.tar.xz`
		`/krita-4.4.5.tar.xz`
		`/krita-4.4.8.tar.xz`
		`+ /krita-5.0.0.tar.xz`

4523-Support-building-with-OpenEXR-3.patch

file removed

-156

		`@@ -1,156 +0,0 @@`
		`- From d66383f6c593d21463c658fbcc6adef28a7f570f Mon Sep 17 00:00:00 2001`
		`- From: Antonio Rojas <arojas@archlinux.org>`
		`- Date: Fri, 23 Apr 2021 23:42:14 +0200`
		`- Subject: [PATCH 4523/5371] 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 0fb28e41ea..59fa487eda 100644`
		`- --- a/CMakeLists.txt`
		`- +++ b/CMakeLists.txt`
		`- @@ -649,15 +649,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 e9ff363df3..59e567fa04 100644`
		`- --- a/libs/image/CMakeLists.txt`
		`- +++ b/libs/image/CMakeLists.txt`
		`- @@ -367,7 +367,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 3e8bcf9e25..d55fd8714f 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 86b83710dc..801783c1f3 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 ae69220698..8c5fe5d061 100644`
		`- --- a/plugins/color/lcms2engine/tests/CMakeLists.txt`
		`- +++ b/plugins/color/lcms2engine/tests/CMakeLists.txt`
		`- @@ -11,7 +11,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 63df1fd69a..c94674b381 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 f63ab73cd9..d620062594 100644`
		`- --- a/plugins/impex/exr/exr_converter.cc`
		`- +++ b/plugins/impex/exr/exr_converter.cc`
		`- @@ -11,6 +11,8 @@`
		`-`
		`- #include <ImfAttribute.h>`
		`- #include <ImfChannelList.h>`
		`- +#include <ImfFrameBuffer.h>`
		`- +#include <ImfHeader.h>`
		`- #include <ImfInputFile.h>`
		`- #include <ImfOutputFile.h>`
		`-`
		`- 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.31.1`
		`-`

krita.spec

file modified

+15 -4

		`@@ -9,8 +9,8 @@`
		`%endif`

		`Name: krita`
		`- Version: 4.4.8`
		`- Release: 3%{?dist}`
		`+ Version: 5.0.0`
		`+ Release: 1%{?dist}`

		`Summary: Krita is a sketching and painting program`
		`License: GPLv2+`
		`@@ -20,7 +20,6 @@`
		`## downstream patches`

		`## upstream patches`
		`- Patch4523: 4523-Support-building-with-OpenEXR-3.patch`

		`BuildRequires: extra-cmake-modules >= %{kf5_ver}`
		`BuildRequires: kf5-rpm-macros`
		`@@ -103,6 +102,13 @@`
		`%description libs`
		`%{summary}.`

		`+ %package devel`
		`+ Summary: Development files for %{name}`
		`+ Requires: %{name}-libs%{?_isa} = %{version}-%{release}`
		`+`
		`+ %description devel`
		`+ %{summary}.`
		`+`

		`%prep`
		`%autosetup -n %{name}-%{version}%{?pre:-%{pre}} -p1`
		`@@ -144,11 +150,16 @@`

		`%files libs`
		`%{_kf5_libdir}/libkrita.so.`
		`- # FIXME: exclude (only) lib*.so symlinks`
		`+`
		`+ %files devel`
		`%{_kf5_libdir}/libkrita*.so`
		`+ %{_includedir}/.h`


		`%changelog`
		`+ * Tue Dec 28 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 5.0.0-1`
		`+ - Updated to version 5.0.0.`
		`+`
		`* Fri Nov 12 2021 Rex Dieter <rdieter@fedoraproject.org> - 4.4.8-3`
		`- disable python bindings`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (krita-4.4.8.tar.xz) = 106c44e63617dcb7e8768327e8bcb02bc6a9df152347aba6cd5fadf8ed6db7434d7a9c0f75f93a8c10ebea82d6d58644c03a6495da407724f90997bc419bf6d8`
		`+ SHA512 (krita-5.0.0.tar.xz) = 29ad09f00b85688b7150a2705e0b3317e449d932b9906bc994397c4686d6d1058573f5ce84449e7c611d04385ee5ec82182b361fd067630a292ec5f88f0c9007`