krita: update to 4.4.0.

[ci skip]
This commit is contained in:
Kartik Singh 2020-10-14 14:55:57 +05:30 committed by John Zimmermann
parent 685310e11c
commit b48932c739
3 changed files with 29 additions and 63 deletions

View File

@ -930,32 +930,32 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
libgexiv2.so.2 libgexiv2-0.6.1_1
libraw.so.19 libraw-0.19.0_1
libraw_r.so.19 libraw-0.19.0_1
libkritaversion.so.19 krita-4.3.0_1
libkritaglobal.so.19 krita-4.3.0_1
libkritaplugin.so.19 krita-4.3.0_1
libkritawidgetutils.so.19 krita-4.3.0_1
libkritawidgets.so.19 krita-4.3.0_1
libkritastore.so.19 krita-4.3.0_1
libkritaodf.so.19 krita-4.3.0_1
libkritaflake.so.19 krita-4.3.0_1
libkritabasicflakes.so.19 krita-4.3.0_1
libkritapigment.so.19 krita-4.3.0_1
libkritacommand.so.19 krita-4.3.0_1
libkritalibbrush.so.19 krita-4.3.0_1
libkritapsd.so.19 krita-4.3.0_1
libkritacolor.so.19 krita-4.3.0_1
libkritacolord.so.19 krita-4.3.0_1
libkritaimage.so.19 krita-4.3.0_1
libkritaui.so.19 krita-4.3.0_1
libkritaversion.so.20 krita-4.4.0_1
libkritaglobal.so.20 krita-4.4.0_1
libkritaplugin.so.20 krita-4.4.0_1
libkritawidgetutils.so.20 krita-4.4.0_1
libkritawidgets.so.20 krita-4.4.0_1
libkritastore.so.20 krita-4.4.0_1
libkritaodf.so.20 krita-4.4.0_1
libkritaflake.so.20 krita-4.4.0_1
libkritabasicflakes.so.20 krita-4.4.0_1
libkritapigment.so.20 krita-4.4.0_1
libkritacommand.so.20 krita-4.4.0_1
libkritalibbrush.so.20 krita-4.4.0_1
libkritapsd.so.20 krita-4.4.0_1
libkritacolor.so.20 krita-4.4.0_1
libkritacolord.so.20 krita-4.4.0_1
libkritaimage.so.20 krita-4.4.0_1
libkritaui.so.20 krita-4.4.0_1
libkritavectorimage.so.18 krita-4.2.0_1
libkritaimpex.so.19 krita-4.3.0_1
libkritalibkis.so.19 krita-4.3.0_1
libkritaqml.so.19 krita-4.3.0_1
libkritatextlayout.so.19 krita-4.3.0_1
libkritatext.so.19 krita-4.3.0_1
libkritalibkra.so.19 krita-4.3.0_1
libkritalibpaintop.so.19 krita-4.3.0_1
libkritametadata.so.19 krita-4.3.0_1
libkritaimpex.so.20 krita-4.4.0_1
libkritalibkis.so.20 krita-4.4.0_1
libkritaqml.so.20 krita-4.4.0_1
libkritatextlayout.so.20 krita-4.4.0_1
libkritatext.so.20 krita-4.4.0_1
libkritalibkra.so.20 krita-4.4.0_1
libkritalibpaintop.so.20 krita-4.4.0_1
libkritametadata.so.20 krita-4.4.0_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

@ -1,34 +0,0 @@
From c3cba340cfca43f216522464de5fd6f3e060718b Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
Date: Sat, 4 Jul 2020 13:01:27 +0300
Subject: [PATCH] Update pyqt_sip_dir for pyqt5 compiled with sip5
---
https://github.com/KDE/krita/commit/c3cba340cfca43f216522464de5fd6f3e060718b
cmake/modules/FindPyQt5.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git cmake/modules/FindPyQt5.py cmake/modules/FindPyQt5.py
index e0ef9d7bdb..e138ad3107 100644
--- cmake/modules/FindPyQt5.py
+++ cmake/modules/FindPyQt5.py
@@ -4,6 +4,7 @@
import sys
import os
+from distutils.sysconfig import get_python_lib
try:
# On Windows and Python 3.8+ python doesn't load module DLL's
@@ -40,8 +41,9 @@
except ValueError:
pass
-# FIXME This next line is just a little bit too crude.
-pyqt_sip_dir = os.path.join(sys.prefix, "share", "sip", "PyQt5")
+pyqt_sip_dir = os.path.join(get_python_lib(plat_specific=1), "PyQt5", "bindings")
+if not os.path.exists(pyqt_sip_dir): # Fallback for older PyQt5/SIP
+ pyqt_sip_dir = os.path.join(sys.prefix, "share", "sip", "PyQt5")
print("pyqt_sip_dir:%s" % pyqt_sip_dir)
print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION["sip_flags"])

View File

@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=4.3.0
revision=3
version=4.4.0
revision=1
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@ -13,13 +13,13 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-sip-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel"
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-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=d071887c73bffbdc179054826b9752f5e5ab43fdcd9ffdd0402e9ab2ceee4bda
checksum=fc5f8376e4712c26178688284aeaf2fa1d48473535ed5b214297178a1fe9278f
python_version=3
replaces="calligra-krita>=0"