From fcc8319fba845b4792e101535117288800ef84e2 Mon Sep 17 00:00:00 2001 From: Kartik Singh Date: Fri, 16 Oct 2020 15:02:39 +0530 Subject: [PATCH 1/2] New package: seexpr-krita-3.4.4.0 --- common/shlibs | 2 ++ srcpkgs/seexpr-krita-devel | 1 + srcpkgs/seexpr-krita/template | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 120000 srcpkgs/seexpr-krita-devel create mode 100644 srcpkgs/seexpr-krita/template diff --git a/common/shlibs b/common/shlibs index e50e44f1246..d81a865a475 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3990,3 +3990,5 @@ libneatvnc.so.0 neatvnc-0.2.0_1 libtdjson.so.1.6.0 libtd-1.6.0_1 libJudy.so.1 judy-1.0.5_1 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2 +libSeExpr2Editor.so.3 seexpr-krita-3.4.4.0_1 +libSeExpr2.so.3 seexpr-krita-3.4.4.0_1 diff --git a/srcpkgs/seexpr-krita-devel b/srcpkgs/seexpr-krita-devel new file mode 120000 index 00000000000..77a712c7500 --- /dev/null +++ b/srcpkgs/seexpr-krita-devel @@ -0,0 +1 @@ +seexpr-krita \ No newline at end of file diff --git a/srcpkgs/seexpr-krita/template b/srcpkgs/seexpr-krita/template new file mode 100644 index 00000000000..3caaa54420a --- /dev/null +++ b/srcpkgs/seexpr-krita/template @@ -0,0 +1,30 @@ +# Template file for 'seexpr-krita' +pkgname=seexpr-krita +version=3.4.4.0 +revision=1 +wrksrc="seexpr-${version}" +build_style=cmake +configure_args="-DBUILD_DEMOS=OFF -DBUILD_TESTS=OFF \ + -DPYQT_SIP_DIR=/${py3_sitelib}/PyQt5/bindings" +hostmakedepends="extra-cmake-modules" +makedepends="qt5-tools-devel boost-devel python3-devel python3-PyQt5-devel python3-sip-devel" +short_desc="Embeddable expression evaluation engine (Krita fork)" +maintainer="Kartik Singh " +license="GPL-3.0-or-later" +homepage="https://krita.org" +distfiles="${KDE_SITE}/seexpr/seexpr-${version}.tar.gz" +checksum=3f5b5330667d398285c9f7086cc3fd7e1363f3fa75f79b39766c34fe2e233656 + +pre_configure() { + sed -i 's#share/SeExpr2/utils#lib/SeExpr2/utils#' src/utils/CMakeLists.txt +} + +seexpr-krita-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}-${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/share/cmake + vmove usr/share/pkgconfig + } +} From 7a384efa973b07fa7402e06a738be770f425d6b6 Mon Sep 17 00:00:00 2001 From: Kartik Singh Date: Wed, 14 Oct 2020 14:55:57 +0530 Subject: [PATCH 2/2] krita: update to 4.4.0. [ci skip] --- common/shlibs | 50 +++++++++---------- srcpkgs/krita/patches/pyqt_sip_dir-sip5.patch | 34 ------------- srcpkgs/krita/template | 8 +-- 3 files changed, 29 insertions(+), 63 deletions(-) delete mode 100644 srcpkgs/krita/patches/pyqt_sip_dir-sip5.patch diff --git a/common/shlibs b/common/shlibs index d81a865a475..a2259c736ec 100644 --- a/common/shlibs +++ b/common/shlibs @@ -929,32 +929,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 diff --git a/srcpkgs/krita/patches/pyqt_sip_dir-sip5.patch b/srcpkgs/krita/patches/pyqt_sip_dir-sip5.patch deleted file mode 100644 index f9aa4e4a6f8..00000000000 --- a/srcpkgs/krita/patches/pyqt_sip_dir-sip5.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c3cba340cfca43f216522464de5fd6f3e060718b Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -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"]) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 6d3a55e2912..64e74dcf935 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -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 " 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"