krita: update to 4.4.7.

This commit is contained in:
John 2021-08-06 22:44:39 +02:00
parent 7b3b813454
commit bc55ef3e88
5 changed files with 34 additions and 38 deletions

View file

@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
libgexiv2.so.2 libgexiv2-0.6.1_1
libraw.so.20 libraw-0.20.2_1
libraw_r.so.20 libraw-0.20.2_1
libkritaversion.so.21 krita-4.4.5_1
libkritaglobal.so.21 krita-4.4.5_1
libkritaplugin.so.21 krita-4.4.5_1
libkritawidgetutils.so.21 krita-4.4.5_1
libkritawidgets.so.21 krita-4.4.5_1
libkritastore.so.21 krita-4.4.5_1
libkritaodf.so.21 krita-4.4.5_1
libkritaflake.so.21 krita-4.4.5_1
libkritabasicflakes.so.21 krita-4.4.5_1
libkritapigment.so.21 krita-4.4.5_1
libkritacommand.so.21 krita-4.4.5_1
libkritalibbrush.so.21 krita-4.4.5_1
libkritapsd.so.21 krita-4.4.5_1
libkritacolor.so.21 krita-4.4.5_1
libkritacolord.so.21 krita-4.4.5_1
libkritaimage.so.21 krita-4.4.5_1
libkritaui.so.21 krita-4.4.5_1
libkritaimpex.so.21 krita-4.4.5_1
libkritalibkis.so.21 krita-4.4.5_1
libkritaqml.so.21 krita-4.4.5_1
libkritatextlayout.so.21 krita-4.4.5_1
libkritatext.so.21 krita-4.4.5_1
libkritalibkra.so.21 krita-4.4.5_1
libkritalibpaintop.so.21 krita-4.4.5_1
libkritametadata.so.21 krita-4.4.5_1
libdjvulibre.so.21 libdjvulibre-3.5.24_1
libgxps.so.2 libgxps-0.2.0_1
libt1.so.5 libt1-5.1.2_1

View file

@ -0,0 +1,19 @@
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)

View file

@ -0,0 +1,13 @@
--- 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)

View file

@ -1,11 +0,0 @@
--- a/plugins/impex/jpeg/krita_jpeg.desktop 2020-06-16 14:21:56.000000000 +0200
+++ b/plugins/impex/jpeg/krita_jpeg.desktop 2020-06-16 14:21:56.000000000 +0200
@@ -2,7 +2,7 @@
Categories=Qt;KDE;Office;Graphics;
Exec=krita %F
Icon=krita
-MimeType=image/jpeg;jpeg/jfif
+MimeType=image/jpeg
Name=Krita
Name[af]=Krita
Name[ar]=كريتا

View file

@ -1,6 +1,6 @@
# Template file for 'krita'
pkgname=krita
version=4.4.5
version=4.4.7
revision=1
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-only"
homepage="https://krita.org/"
distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
python_version=3
replaces="calligra-krita>=0"