* [PR PATCH] krita: update to 4.4.0.
@ 2020-10-16 9:50 kartikynwa
2020-10-16 9:52 ` [PR PATCH] [Updated] " kartikynwa
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: kartikynwa @ 2020-10-16 9:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 595 bytes --]
There is a new pull request by kartikynwa against master on the void-packages repository
https://github.com/kartikynwa/void-packages krita-update
https://github.com/void-linux/void-packages/pull/25651
krita: update to 4.4.0.
I have built both packages and can confirm they work perfectly at least for x86_64. The SeExpr module for Krita is working as well.
Should I test cross-building for `seexpr-krita`? I can't do it for `krita` cuz my computer is slow but can test the `seexpr-krita` if needed.
A patch file from https://github.com/void-linux/void-packages/pull/25651.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-krita-update-25651.patch --]
[-- Type: text/x-diff, Size: 7818 bytes --]
From fcc8319fba845b4792e101535117288800ef84e2 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
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 <kartik.ynwa@gmail.com>"
+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 f11984d73bae2de6b85db436fcee08f8e8dfa558 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Wed, 14 Oct 2020 14:55:57 +0530
Subject: [PATCH 2/2] krita: update to 4.4.0.
---
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 <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"])
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 <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"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] krita: update to 4.4.0.
2020-10-16 9:50 [PR PATCH] krita: update to 4.4.0 kartikynwa
@ 2020-10-16 9:52 ` kartikynwa
2020-10-18 12:10 ` [PR REVIEW] " Johnnynator
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: kartikynwa @ 2020-10-16 9:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
There is an updated pull request by kartikynwa against master on the void-packages repository
https://github.com/kartikynwa/void-packages krita-update
https://github.com/void-linux/void-packages/pull/25651
krita: update to 4.4.0.
I have built both packages and can confirm they work perfectly at least for x86_64. The SeExpr module for Krita is working as well.
Should I test cross-building for `seexpr-krita`? I can't do it for `krita` cuz my computer is slow but can test the `seexpr-krita` if needed.
A patch file from https://github.com/void-linux/void-packages/pull/25651.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-krita-update-25651.patch --]
[-- Type: text/x-diff, Size: 7828 bytes --]
From fcc8319fba845b4792e101535117288800ef84e2 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
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 <kartik.ynwa@gmail.com>"
+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 <kartik.ynwa@gmail.com>
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 <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"])
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 <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"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] krita: update to 4.4.0.
2020-10-16 9:50 [PR PATCH] krita: update to 4.4.0 kartikynwa
2020-10-16 9:52 ` [PR PATCH] [Updated] " kartikynwa
@ 2020-10-18 12:10 ` Johnnynator
2020-10-18 12:10 ` Johnnynator
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2020-10-18 12:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/25651#discussion_r507119935
Comment:
Add `vmove "usr/lib/*.so"`
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] krita: update to 4.4.0.
2020-10-16 9:50 [PR PATCH] krita: update to 4.4.0 kartikynwa
` (2 preceding siblings ...)
2020-10-18 12:10 ` Johnnynator
@ 2020-10-18 12:10 ` Johnnynator
2020-10-18 18:31 ` kartikynwa
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2020-10-18 12:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/25651#discussion_r507120038
Comment:
Add `checkdepends="gtest-devel"`
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] krita: update to 4.4.0.
2020-10-16 9:50 [PR PATCH] krita: update to 4.4.0 kartikynwa
2020-10-16 9:52 ` [PR PATCH] [Updated] " kartikynwa
2020-10-18 12:10 ` [PR REVIEW] " Johnnynator
@ 2020-10-18 12:10 ` Johnnynator
2020-10-18 12:10 ` Johnnynator
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2020-10-18 12:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 702 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/25651#discussion_r507119632
Comment:
No need to escape a newline in a quoted string. Also don't hard disable tests. add smth like
```
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
else
configure_args+=" -DBUILD_TESTS=OFF"
fi
```
after checksum and
```
do_check() {
cd build
# BlockTests requires llvm, we don't build it with llvm
ctest -E 'BlockTests'
}
post_install() {
[ -d "${DESTDIR}/usr/share/test/SeExpr2" ] && rm -r "${DESTDIR}/usr/share/test/SeExpr2" || true
}
```
after pre_configure
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: krita: update to 4.4.0.
2020-10-16 9:50 [PR PATCH] krita: update to 4.4.0 kartikynwa
` (3 preceding siblings ...)
2020-10-18 12:10 ` Johnnynator
@ 2020-10-18 18:31 ` kartikynwa
2020-10-18 18:32 ` kartikynwa
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: kartikynwa @ 2020-10-18 18:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 430 bytes --]
New comment by kartikynwa on void-packages repository
https://github.com/void-linux/void-packages/pull/25651#issuecomment-711363994
Comment:
@Johnnynator I tried cross-building it for `aarch64-musl`. Many of the errors were fixed by moving the `makedepends` to `hostmakedepends`. [This](http://ix.io/2BaS) is the template I have now. But I get [this](http://ix.io/2BaJ) error now that I don't have any idea about. Any pointers?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: krita: update to 4.4.0.
2020-10-16 9:50 [PR PATCH] krita: update to 4.4.0 kartikynwa
` (4 preceding siblings ...)
2020-10-18 18:31 ` kartikynwa
@ 2020-10-18 18:32 ` kartikynwa
2020-10-20 14:38 ` [PR PATCH] [Updated] " kartikynwa
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: kartikynwa @ 2020-10-18 18:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
New comment by kartikynwa on void-packages repository
https://github.com/void-linux/void-packages/pull/25651#issuecomment-711363994
Comment:
@Johnnynator I tried cross-building `seexpr-krita` for `aarch64-musl`. Many of the errors were fixed by moving the `makedepends` to `hostmakedepends`. [This](http://ix.io/2BaS) is the template I have now. But I get [this](http://ix.io/2BaJ) error now that I don't have any idea about. Any pointers?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] krita: update to 4.4.0.
2020-10-16 9:50 [PR PATCH] krita: update to 4.4.0 kartikynwa
` (5 preceding siblings ...)
2020-10-18 18:32 ` kartikynwa
@ 2020-10-20 14:38 ` kartikynwa
2020-10-20 14:42 ` kartikynwa
2020-10-22 9:55 ` [PR PATCH] [Merged]: " Johnnynator
8 siblings, 0 replies; 10+ messages in thread
From: kartikynwa @ 2020-10-20 14:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
There is an updated pull request by kartikynwa against master on the void-packages repository
https://github.com/kartikynwa/void-packages krita-update
https://github.com/void-linux/void-packages/pull/25651
krita: update to 4.4.0.
I have built both packages and can confirm they work perfectly at least for x86_64. The SeExpr module for Krita is working as well.
Should I test cross-building for `seexpr-krita`? I can't do it for `krita` cuz my computer is slow but can test the `seexpr-krita` if needed.
A patch file from https://github.com/void-linux/void-packages/pull/25651.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-krita-update-25651.patch --]
[-- Type: text/x-diff, Size: 8130 bytes --]
From 2beeb351ce1165c3f536b65d5869d8c0d9719677 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
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 | 47 +++++++++++++++++++++++++++++++++++
3 files changed, 50 insertions(+)
create mode 120000 srcpkgs/seexpr-krita-devel
create mode 100644 srcpkgs/seexpr-krita/template
diff --git a/common/shlibs b/common/shlibs
index 35f08f5f099..8d5e7877a73 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,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..01490dd15a2
--- /dev/null
+++ b/srcpkgs/seexpr-krita/template
@@ -0,0 +1,47 @@
+# 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 -DUSE_PYTHON=OFF"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel"
+checkdepends="gtest-devel"
+short_desc="Embeddable expression evaluation engine (Krita fork)"
+maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://krita.org"
+distfiles="${KDE_SITE}/seexpr/seexpr-${version}.tar.gz"
+checksum=3f5b5330667d398285c9f7086cc3fd7e1363f3fa75f79b39766c34fe2e233656
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DBUILD_TESTS=ON"
+else
+ configure_args+=" -DBUILD_TESTS=OFF"
+fi
+
+do_check() {
+ cd build
+ # BlockTests requires llvm, we don't build it with llvm
+ ctest -E 'BlockTests'
+}
+
+pre_configure() {
+ sed -i 's#share/SeExpr2/utils#lib/SeExpr2/utils#' src/utils/CMakeLists.txt
+}
+
+post_install() {
+ [ -d "${DESTDIR}/usr/share/test/SeExpr2" ] && rm -r "${DESTDIR}/usr/share/test/SeExpr2" || true
+}
+
+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
+ vmove "usr/lib/*.so"
+ }
+}
From 3ed4928d42243884b374bd2a66b53e1fc20ff55d Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
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 8d5e7877a73..047bfcd6c98 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -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
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 <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"])
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 <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"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: krita: update to 4.4.0.
2020-10-16 9:50 [PR PATCH] krita: update to 4.4.0 kartikynwa
` (6 preceding siblings ...)
2020-10-20 14:38 ` [PR PATCH] [Updated] " kartikynwa
@ 2020-10-20 14:42 ` kartikynwa
2020-10-22 9:55 ` [PR PATCH] [Merged]: " Johnnynator
8 siblings, 0 replies; 10+ messages in thread
From: kartikynwa @ 2020-10-20 14:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
New comment by kartikynwa on void-packages repository
https://github.com/void-linux/void-packages/pull/25651#issuecomment-712904231
Comment:
@Johnnynator I put the `-DUSE_PYTHON=OFF` flag in `seexpr-krita`. It can now be cross-built (tested with armv6l-musl and armv7) and still has full functionality with `krita`.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: krita: update to 4.4.0.
2020-10-16 9:50 [PR PATCH] krita: update to 4.4.0 kartikynwa
` (7 preceding siblings ...)
2020-10-20 14:42 ` kartikynwa
@ 2020-10-22 9:55 ` Johnnynator
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2020-10-22 9:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 433 bytes --]
There's a merged pull request on the void-packages repository
krita: update to 4.4.0.
https://github.com/void-linux/void-packages/pull/25651
Description:
I have built both packages and can confirm they work perfectly at least for x86_64. The SeExpr module for Krita is working as well.
Should I test cross-building for `seexpr-krita`? I can't do it for `krita` cuz my computer is slow but can test the `seexpr-krita` if needed.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-10-22 9:55 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-16 9:50 [PR PATCH] krita: update to 4.4.0 kartikynwa
2020-10-16 9:52 ` [PR PATCH] [Updated] " kartikynwa
2020-10-18 12:10 ` [PR REVIEW] " Johnnynator
2020-10-18 12:10 ` Johnnynator
2020-10-18 12:10 ` Johnnynator
2020-10-18 18:31 ` kartikynwa
2020-10-18 18:32 ` kartikynwa
2020-10-20 14:38 ` [PR PATCH] [Updated] " kartikynwa
2020-10-20 14:42 ` kartikynwa
2020-10-22 9:55 ` [PR PATCH] [Merged]: " Johnnynator
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).