krita: update to 5.0.0.

common/shlibs

@@ -3945,6 +3945,7 @@ libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
 libKSeExpr.so.4.0.1.0 seexpr-krita-4.0.1.0_1
+libkritaqmicinterface.so.17 krita-5.0.0_1
 liburing.so.2 liburing-2.0_1
 libbson-1.0.so.0 libbson-1.17.4_2
 libsonic.so.0 libsonic-0.2.0_1

srcpkgs/krita-devel

@@ -0,0 +1 @@
+krita

srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch

@@ -0,0 +1,50 @@
+From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
+From: Sharaf Zaman <shzam@sdf.org>
+Date: Wed, 27 Oct 2021 22:19:07 +0000
+Subject: [PATCH] Fix build on linux clang targets
+
+In CheckAtomic.cmake we include is_lock_free because these routines
+don't seem to be included in the compiler's "simple atomics". This
+triggers a failure in clang toolchain, forcing it to link libatomic.
+
+Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
+
+CCBUG:444247
+CCBUG:444547
+---
+ cmake/modules/CheckAtomic.cmake | 1 +
+ libs/image/CMakeLists.txt       | 6 ++----
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
+index b061e2d65b..df6b70504c 100644
+--- a/cmake/modules/CheckAtomic.cmake
++++ b/cmake/modules/CheckAtomic.cmake
+@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
+ 	std::atomic<uint64_t> x (0);
+ 	int main() {
+ 		uint64_t i = x.load(std::memory_order_relaxed);
++		x.is_lock_free();
+ 		return 0;
+ 	}
+ 	" ${varname})
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index e883c7f1c8..43c945fad3 100644
+--- a/libs/image/CMakeLists.txt
++++ b/libs/image/CMakeLists.txt
+@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
+ 
+ target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
+ 
+-if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+-    if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+-        target_link_libraries(kritaimage PUBLIC atomic)
+-    endif()
++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
++   target_link_libraries(kritaimage PUBLIC atomic)
+ endif()
+ 
+ if(OpenEXR_FOUND)
+-- 
+GitLab
+

srcpkgs/krita/patches/aarch64.patch

@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)

srcpkgs/krita/patches/cross.patch

@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)

srcpkgs/krita/template

@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.8
+version=5.0.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -14,15 +14,17 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
  opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
  poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
  python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
- libopenjpeg2-devel"
+ libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
+ qt5-plugin-pgsql qt5-plugin-tds libwebp-devel libmypaint-devel"
 short_desc="Painting and image editing program"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=bcc68a5711d92515d6553611a0bddd53f3259843fd3534b9b3e535d7ed430df8
+checksum=84d5833dbcab3fd3a418f4c37670d82ad919430f0c6d0a57b993907471eecc57
 python_version=3
 replaces="calligra-krita>=0"
+make_check=no
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) makedepends+=" vc";;
@@ -39,3 +41,12 @@ pre_configure() {
 		configure_args+=" -D_find_pyqt5_py=$wrksrc/cmake/modules/FindPyQt5.py"
 	fi
 }
+
+krita-devel_package() {
+	depends="krita>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}