From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 5 Dec 2021 02:47:11 +0000
Subject: gentoo resync : 05.12.2021

---
 media-gfx/krita/Manifest                           |  3 +-
 .../krita-4.4.8-prefer-newer-sip-to-build.patch    | 56 ++++++++++++++++++++++
 media-gfx/krita/krita-4.4.8-r1.ebuild              |  1 +
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch

(limited to 'media-gfx/krita')

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index caedb68a9062..f7c184ddeb8f 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,7 +1,8 @@
 AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
 AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5
 AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc1086f2890a8f45506ca8cf0b5abf089b68e469200513f9be0a5516bad17b131e4afecc9560c8903ed6b1aaecd7c245a432ac8a2cd02 SHA512 44f023f49a0c5bfd895f65a013787bf2870b06fbba6fe292fb97c791b05965de176184d6a669225748848bc0ae1c7984d0c8dfaf3fd3ccf5ae0dbee953a08f92
+AUX krita-4.4.8-prefer-newer-sip-to-build.patch 2000 BLAKE2B 762d2230e866f7db639802dcf55ba3ff57cd125d115246721e645458376e1a26864f4e0506338300c533f18b8ed52e96374d97d2da161987fc5f8786c59f0edd SHA512 da79a6c457e3b7e04370c5ff527f7ba34e49d0e2493ec747d76af5e728ca72372476dbf85a4b69064ce5cc2f6d20b028883028c0ae59c2c5af6dc2074c8bff9e
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
-EBUILD krita-4.4.8-r1.ebuild 3538 BLAKE2B 4b86b38f7d895e6700e06e88410493e163d6f1e5e45a14a2cb361a9c6011af962d6772c52c5718f49ed3e315e167e5b9c47492acc54a7e2211e5ad52f110dfc2 SHA512 ea76466a573f895ed98fa42e2b6aaac32ef64cd2b1db7bf169637bd5447f7391768867205e3c31105702325a6b299e8e5e7ffdcfecbfb300a0fedde7d2ecdd67
+EBUILD krita-4.4.8-r1.ebuild 3603 BLAKE2B e3d9d8a9d6060c2b1e621627623668ae29fce652769533ad898064e7f491ee9859fabd9df154bad3346aba37a8a5024061beca045547a87cfb6aa2d8b781ebc1 SHA512 3c3a5b4d98393c6ece66e15b6ca636689da97ce4423855d36d9c02e2fbaa71d51ad91873ae03e47f0fee3c0074307225189b8194a2fa1c4a3472cccb1a6b500d
 MISC metadata.xml 765 BLAKE2B 9e75410b77b00e7f45ff2bd1a730396c51302380f7c372084975bc763745d7e3c8bb65e8e94bb211872ea398e806f8f423d5ee2dc9c17db9ab7257dbb9e5cf44 SHA512 78524fb64544cefcec05bbf9a8fcf3b175f1aa6ca8377600470096bd2f4b6afae3c00dad4e2c58610cc84501515167e400050bc90de30c11c9fcf3d4b4668579
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() {
-- 
cgit v1.2.3