From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3CC20158086 for ; Mon, 15 Nov 2021 13:38:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9506E0871; Mon, 15 Nov 2021 13:38:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F125E0871 for ; Mon, 15 Nov 2021 13:38:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17E5D342EE5 for ; Mon, 15 Nov 2021 13:37:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99A051C0 for ; Mon, 15 Nov 2021 13:37:56 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1636983467.62306e5005656ea05a0ef00b2ffb57ebba8d7e24.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch media-gfx/krita/krita-4.4.8-r1.ebuild X-VCS-Directories: media-gfx/krita/files/ media-gfx/krita/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 62306e5005656ea05a0ef00b2ffb57ebba8d7e24 X-VCS-Branch: master Date: Mon, 15 Nov 2021 13:37:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cfc15dd9-87d9-45b5-944b-036f112c5663 X-Archives-Hash: ac6860500f6d617a61356d6e6437811e commit: 62306e5005656ea05a0ef00b2ffb57ebba8d7e24 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 15 13:28:37 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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() {