From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Krita: update to 5.0,0
Date: Sat, 25 Dec 2021 21:17:26 +0100 [thread overview]
Message-ID: <20211225201726.cF-sTHLTwiQ4r_OAi78jXbg6aehwvrPGCaVnFYvRYWI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34693@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages krita
https://github.com/void-linux/void-packages/pull/34693
Krita: update to 5.0,0
- krita: update to 5.0.0.
- gmic: switch gmic-krita to the krita patchset
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34693.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-krita-34693.patch --]
[-- Type: text/x-diff, Size: 9378 bytes --]
From 00ca8294391e547e37ac1d28acc03bcf681f4786 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 23 Dec 2021 16:32:32 +0100
Subject: [PATCH 1/2] krita: update to 5.0.0.
---
common/shlibs | 1 +
srcpkgs/krita-devel | 1 +
...5beaa1fdba03d38f887b93a15a58fc0830c7.patch | 50 +++++++++++++++++++
srcpkgs/krita/patches/aarch64.patch | 19 -------
srcpkgs/krita/patches/cross.patch | 13 -----
srcpkgs/krita/template | 19 +++++--
6 files changed, 67 insertions(+), 36 deletions(-)
create mode 120000 srcpkgs/krita-devel
create mode 100644 srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch
delete mode 100644 srcpkgs/krita/patches/aarch64.patch
delete mode 100644 srcpkgs/krita/patches/cross.patch
diff --git a/common/shlibs b/common/shlibs
index 86b3a4f42422..a05a5fff92d3 100644
--- a/common/shlibs
+++ b/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
diff --git a/srcpkgs/krita-devel b/srcpkgs/krita-devel
new file mode 120000
index 000000000000..12b23cdf747f
--- /dev/null
+++ b/srcpkgs/krita-devel
@@ -0,0 +1 @@
+krita
\ No newline at end of file
diff --git a/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch b/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch
new file mode 100644
index 000000000000..6c9c71d4fca2
--- /dev/null
+++ b/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
+
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -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)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -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)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 1e3ec253c1db..835ed0cfa749 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
-version=4.4.8
-revision=2
+version=5.0.0
+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"
+ }
+}
From 3e484fc30fd3b90648fb11969a3636ef510bca8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 25 Dec 2021 18:06:10 +0100
Subject: [PATCH 2/2] gmic: switch gmic-krita to the krita patchset
krita>5.0.0 does require gmic to be a krita plugin
instead of a standalone bin, upstream gmic doesn't
support this (yet (?))
---
srcpkgs/gmic-krita | 1 -
srcpkgs/gmic-krita/template | 20 ++++++++++++++++++++
srcpkgs/gmic/template | 10 +---------
3 files changed, 21 insertions(+), 10 deletions(-)
delete mode 120000 srcpkgs/gmic-krita
create mode 100644 srcpkgs/gmic-krita/template
diff --git a/srcpkgs/gmic-krita b/srcpkgs/gmic-krita
deleted file mode 120000
index 433883885ce6..000000000000
--- a/srcpkgs/gmic-krita
+++ /dev/null
@@ -1 +0,0 @@
-gmic
\ No newline at end of file
diff --git a/srcpkgs/gmic-krita/template b/srcpkgs/gmic-krita/template
new file mode 100644
index 000000000000..e7d1cb154902
--- /dev/null
+++ b/srcpkgs/gmic-krita/template
@@ -0,0 +1,20 @@
+# Template file for 'gmic-krita'
+pkgname=gmic-krita
+version=3.0.0.1
+revision=1
+_krita_version=5.0.0
+wrksrc=gmic-${version}-patched
+build_wrksrc="gmic-qt"
+build_style=cmake
+configure_args="-DGMIC_QT_HOST=krita-plugin
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo"
+hostmakedepends="pkg-config extra-cmake-modules qt5-qmake
+ qt5-host-tools kcoreaddons"
+makedepends="fftw-devel qt5-devel qt5-tools-devel
+ kcoreaddons-devel krita-devel"
+short_desc="GREYC's Magic for Image Computing - Krita plugin"
+maintainer="John <me@johnnynator.dev>"
+license="CECILL-2.1"
+homepage="http://gmic.eu/"
+distfiles="https://files.kde.org/krita/build/dependencies/gmic-${version}-patched.tar.gz"
+checksum=05e25367af01039a97c52d48694f00daf36ee180fa68220f72522aaf245a782b
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 8c1fa6962d8d..46ce0133821f 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -42,7 +42,7 @@ do_build() {
CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
cli lib libc
- for _target in gimp krita gmic_qt zart; do
+ for _target in gimp gmic_qt zart; do
make $_target
done
}
@@ -59,14 +59,6 @@ gmic-gimp_package() {
}
}
-gmic-krita_package() {
- short_desc+=" - Krita plugin"
- depends="krita ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/bin/gmic_krita_qt
- }
-}
-
gmic-zart_package() {
short_desc+=" - ZArt tool"
depends="${sourcepkg}>=${version}_${revision}"
next prev parent reply other threads:[~2021-12-25 20:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-25 17:14 [PR PATCH] " Johnnynator
2021-12-25 20:17 ` Johnnynator [this message]
2021-12-25 23:25 ` [PR PATCH] [Merged]: " Johnnynator
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211225201726.cF-sTHLTwiQ4r_OAi78jXbg6aehwvrPGCaVnFYvRYWI@z \
--to=johnnynator@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).