From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
Date: Mon, 15 Nov 2021 13:37:56 +0000 (UTC) [thread overview]
Message-ID: <1636983467.62306e5005656ea05a0ef00b2ffb57ebba8d7e24.asturm@gentoo> (raw)
commit: 62306e5005656ea05a0ef00b2ffb57ebba8d7e24
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 13:28:37 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 13:37:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62306e50
media-gfx/krita: Fix build with >=PyQt5-5.15.6
See also:
ttps://www.riverbankcomputing.com/pipermail/pyqt/2021-November/044346.html
Closes: https://bugs.gentoo.org/822843
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../krita-4.4.8-prefer-newer-sip-to-build.patch | 56 ++++++++++++++++++++++
media-gfx/krita/krita-4.4.8-r1.ebuild | 1 +
2 files changed, 57 insertions(+)
diff --git a/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch b/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
new file mode 100644
index 000000000000..c60b53ffc64b
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
@@ -0,0 +1,56 @@
+From d2f29d77db58b54a8bcabfb68df66e4dd44f0c27 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Fri, 12 Nov 2021 12:27:07 +0100
+Subject: [PATCH] Try (and thus prefer) sip >=5 first
+
+If one has sip 4.x and sip 6.x installed sip 4 is picked up
+("Found SIP version: 4.19.24") just because it is searched first.
+
+This matters not only because it is nice to use the "latest and
+greatest", but also because software using the latest PyQt5 (including
+krita) can't be built with sip 4 at the moment and the maintainer is
+apparently in no hurry to fix it [1].
+
+[1] https://www.riverbankcomputing.com/pipermail/pyqt/2021-November/044345.html
+---
+ cmake/modules/FindSIP.py | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/cmake/modules/FindSIP.py b/cmake/modules/FindSIP.py
+index 7b92abd36e..600805c329 100644
+--- a/cmake/modules/FindSIP.py
++++ b/cmake/modules/FindSIP.py
+@@ -15,6 +15,16 @@ def osAwareSuffix():
+ return os.path.join("lib", "python3.8", "site-packages","sipconfig.py") if os.name != 'nt' else os.path.join("lib","krita-python-libs","sipconfig.py")
+
+ try:
++ import sipbuild
++
++ print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
++ print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
++
++ import shutil
++
++ # sip v5 and higher need to invoke sip-build
++ print("sip_bin:%s" % shutil.which("sip-build"))
++except ImportError: # Code for SIP <5
+ import sipconfig
+
+ sipcfg = sipconfig.Configuration()
+@@ -41,13 +51,4 @@ try:
+ print("sip_bin:%s" % sip_bin)
+ print("default_sip_dir:%s" % default_sip_dir)
+ print("sip_inc_dir:%s" % sip_inc_dir)
+-except ImportError: # Code for SIP v5+
+- import sipbuild
+-
+- print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
+- print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
+
+- import shutil
+-
+- # sip v5 and higher need to invoke sip-build
+- print("sip_bin:%s" % shutil.which("sip-build"))
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-4.4.8-r1.ebuild b/media-gfx/krita/krita-4.4.8-r1.ebuild
index 614c5a0ad5d4..dedc461115e7 100644
--- a/media-gfx/krita/krita-4.4.8-r1.ebuild
+++ b/media-gfx/krita/krita-4.4.8-r1.ebuild
@@ -92,6 +92,7 @@ PATCHES=(
"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
"${FILESDIR}"/${PN}-4.4.7-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master
+ "${FILESDIR}"/${P}-prefer-newer-sip-to-build.patch # bug 822843
)
pkg_setup() {
next reply other threads:[~2021-11-15 13:38 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 13:37 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-02 21:51 [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/ Andreas Sturmlechner
2025-07-16 21:25 Andreas Sturmlechner
2024-08-26 23:37 Sam James
2024-07-13 19:59 Andreas Sturmlechner
2024-07-13 18:02 Sam James
2024-02-05 20:26 Andreas Sturmlechner
2023-12-26 8:59 Andreas Sturmlechner
2022-12-20 19:00 Andreas Sturmlechner
2022-06-15 17:18 Andreas Sturmlechner
2021-12-29 16:34 Andreas Sturmlechner
2021-08-10 18:14 Andreas Sturmlechner
2021-06-20 8:33 Andreas Sturmlechner
2020-12-17 10:23 Andreas Sturmlechner
2020-06-18 23:03 Andreas Sturmlechner
2020-04-03 14:57 Andreas Sturmlechner
2019-07-31 9:45 Andreas Sturmlechner
2019-01-14 16:04 Andreas Sturmlechner
2018-12-28 17:48 Andreas Sturmlechner
2018-11-09 18:54 Andreas Sturmlechner
2018-09-01 19:31 Andreas Sturmlechner
2018-08-29 16:48 Andreas Sturmlechner
2018-08-29 16:48 Andreas Sturmlechner
2017-09-08 21:00 Johannes Huber
2017-07-01 13:41 Andreas Sturmlechner
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=1636983467.62306e5005656ea05a0ef00b2ffb57ebba8d7e24.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.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