Received: (at 70945) by debbugs.gnu.org; 14 May 2024 20:45:16 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 14 16:45:16 2024 Received: from localhost ([127.0.0.1]:41448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1s6z1P-0002AD-Sf for submit <at> debbugs.gnu.org; Tue, 14 May 2024 16:45:16 -0400 Received: from 5.mo550.mail-out.ovh.net ([178.33.45.107]:57863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1s6z1M-00029m-8I for 70945 <at> debbugs.gnu.org; Tue, 14 May 2024 16:45:13 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.176.51]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Vf7dw6YJ7z1HNX for <70945 <at> debbugs.gnu.org>; Tue, 14 May 2024 20:45:08 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-pdfqg (unknown [10.110.113.175]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 9B3DE1FE10; Tue, 14 May 2024 20:45:08 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-6684bf9d7b-pdfqg with ESMTPSA id mDvLIVTNQ2ZrzwgARJCOCQ (envelope-from <ngraves@HIDDEN>); Tue, 14 May 2024 20:45:08 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R0017bc4c3c6-5420-49eb-9c69-395be807f082, FB6FD368DB1A33EEB5BF94B3542A6D01FB5CDC61) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves <ngraves@HIDDEN> To: control <at> debbugs.gnu.org,70945 <at> debbugs.gnu.org Subject: QA review for 70945 Date: Tue, 14 May 2024 22:45:07 +0200 Message-ID: <871q64p1gs.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 14795450676142268955 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdegiedgudehudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedufeehuedtvdevtefhudfhfedttddujeefhfejhefhfeeljeeljeffvdduieefhfenucffohhmrghinhepkhhrihhtrgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdelgeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70945 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) user guix usertag 70945 + reviewed-looks-good thanks Guix QA review form submission: lint warns that it can be updated to 5.2.2. litn doesn't like krita.org redirection but it works on the browser. Builds properly. Items marked as checked: Lint warnings, Package builds, Commit messages -- Best regards, Nicolas Graves
guix-patches@HIDDEN:bug#70945; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 14 May 2024 16:02:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 14 12:02:56 2024
Received: from localhost ([127.0.0.1]:40117 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s6ucA-00072t-11
for submit <at> debbugs.gnu.org; Tue, 14 May 2024 12:02:56 -0400
Received: from lists.gnu.org ([209.51.188.17]:60404)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <rwv@HIDDEN>) id 1s6uc4-00072n-LD
for submit <at> debbugs.gnu.org; Tue, 14 May 2024 12:02:53 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <rwv@HIDDEN>) id 1s6ubv-0003kU-Hr
for guix-patches@HIDDEN; Tue, 14 May 2024 12:02:46 -0400
Received: from wfout5-smtp.messagingengine.com ([64.147.123.148])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <rwv@HIDDEN>) id 1s6ube-00077e-Uo
for guix-patches@HIDDEN; Tue, 14 May 2024 12:02:33 -0400
Received: from compute5.internal (compute5.nyi.internal [10.202.2.45])
by mailfout.west.internal (Postfix) with ESMTP id 0C5C41C00082;
Tue, 14 May 2024 12:02:14 -0400 (EDT)
Received: from mailfrontend2 ([10.202.2.163])
by compute5.internal (MEProxy); Tue, 14 May 2024 12:02:15 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=remworks.net; h=
cc:cc:content-transfer-encoding:content-type:content-type:date
:date:from:from:in-reply-to:message-id:mime-version:reply-to
:subject:subject:to:to; s=fm2; t=1715702534; x=1715788934; bh=8O
CgvrMn+eI2/81ySHgpmpNl1C6lMdfbu3tkHBCh/Pw=; b=B8MpeVHAm3O5QNhnq5
hhzzMZCodMFOQc00hqUWFXvwd/R6LX/bpZYSFv0tIHPb28UiLir7j7YxboeMgCAC
62DUZA03bevmDjTj6Des1A0m1R6RbXH5CaSq0iIFVqtAFKDh/JYEID0QyJSXp1C6
uncgc+MgQ8Kz2WN1yHqV5z2XE+Rc+SrzunBFjFU/NBzlkc84RA+8qmlsKXBYy2As
xHd3SXOr+HO118XabSKh95qzTmdk4/cpSlCqKLR21vhJKBY8ChRjanc2cp+KKzQS
AHSa6wUag16Fj8t5gwdsP5U63e626q00+uAFeyi/CmgDqOmqguBkbT2q8vc4sSXJ
4ZYQ==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:cc:content-transfer-encoding
:content-type:content-type:date:date:feedback-id:feedback-id
:from:from:in-reply-to:message-id:mime-version:reply-to:subject
:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
:x-sasl-enc; s=fm3; t=1715702534; x=1715788934; bh=8OCgvrMn+eI2/
81ySHgpmpNl1C6lMdfbu3tkHBCh/Pw=; b=DL3WH5j7DlIwCmgoldztNlzStHVZn
DzefHeQEURG9JxvoPwi3Os51kJSpYgNDGTbKm9TUOlElQ3t/oYU6SbkBzrzz7icg
HbfO7Nom3Z4bsz4O9q3dOPO0qHOTDvrY+vUw1PL1sWoLP8J53l86FzaCLoPrnkjl
xSzDlrKz+iwVzufEg1Leb62+oh9tw6ybuMJwaq7wpKdtPMqGc0Y8ZnKDgKgbDj6/
zdbYnpVV0sh9qlU24R1xOGSRRR61B62F3KYfhchrUlm6Nv25s9e7dwVdCN0h5CaF
plONR5apzlUCIzdr280Ccw1m4QI004qZ04STkwPhsjAj2j/ck+ib1Dp6w==
X-ME-Sender: <xms:BotDZhfCOlF_PmjoyaamHVr2g-x2HbNuZ4gBWXZDWCky5J9dOFSiGA>
<xme:BotDZvNpj4cuGUVGAt2Ji-sN6GGf1XmE4ImiB_ewLHmAnb58r91zsSRnzrk2APSvA
hYsR5RLDxFhcI9C_g>
X-ME-Received: <xmr:BotDZqjGpO5xy6Pqbcc3_YBflpc7S5mSRTiDTXr-Yc1RCfyODzy-VTT0_mllNTR_nJDCG1tirtvhl25mT2HL_wPrC8hlJQ>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdegiedgleegucetufdoteggodetrfdotf
fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffogggtgfesthekre
dtredtjeenucfhrhhomheptfgvmhgtohcuvhgrnhcukdhtucggvggvrhcuoehrvghmtgho
sehrvghmfihorhhkshdrnhgvtheqnecuggftrfgrthhtvghrnhepgedvffduveelfffgje
efueefleefhedujedvhfegjeehteeuffetieduheegueevnecuffhomhgrihhnpehtohhm
lhdrihhnnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh
eprhifvhesfhgrshhtmhgrihhlrdgtohhm
X-ME-Proxy: <xmx:BotDZq_xZr5k9x1g3kGOFMjIOBytJrMDftJ9Vz_1Ly3Hj7bTi1kSgQ>
<xmx:BotDZtvlj1oTZMLJ-ubfv3kJWZj10K4daUspmx1b84d2xg3QS1bLPw>
<xmx:BotDZpE8kiikw5Vz4XldBbw3xKRPWBGOaSNt6WszjHPZY1Q4khEgNQ>
<xmx:BotDZkOh966UFFCt3CSUx-mGmNm6D6PM7OwjKp5FYDZoKY8_9Uuspg>
<xmx:BotDZm6zwQZToQgpd1jWh0HfQqxokBdk8QE_PzqbrUtYvRVll5P_p0od>
Feedback-ID: if0694934:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue,
14 May 2024 12:02:13 -0400 (EDT)
From: Remco van 't Veer <remco@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: krita: Fix build.
Date: Tue, 14 May 2024 18:01:26 +0200
Message-ID: <f763f0796e81105ecca7d004d0a772e0a3ccbc6f.1715702486.git.remco@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=64.147.123.148; envelope-from=rwv@HIDDEN;
helo=wfout5-smtp.messagingengine.com
X-Spam_score_int: -23
X-Spam_score: -2.4
X-Spam_bar: --
X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001,
FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25,
RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001,
T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.1 (-)
X-Debbugs-Envelope-To: submit
Cc: Remco van 't Veer <remco@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.1 (--)
* gnu/packages/kde.scm (krita): Fix build.
[source]: Apply krita-bump-sip-abi-version-to-12.8 patch.
* gnu/packages/patches/krita-bump-sip-abi-version-to-12.8.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Change-Id: I322c32716a676af7c90e019b53a1fd5395701b49
---
gnu/local.mk | 5 ++--
gnu/packages/kde.scm | 4 ++-
.../krita-bump-sip-abi-version-to-12.8.patch | 25 +++++++++++++++++++
3 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 gnu/packages/patches/krita-bump-sip-abi-version-to-12.8.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index e3389731ef..2556b2a198 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -48,7 +48,7 @@
# Copyright © 2021 Andrew Tropin <andrew@HIDDEN>
# Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN>
# Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@HIDDEN>
-# Copyright © 2022 Remco van 't Veer <remco@HIDDEN>
+# Copyright © 2022, 2024 Remco van 't Veer <remco@HIDDEN>
# Copyright © 2022, 2024 Artyom V. Poptsov <poptsov.artyom@HIDDEN>
# Copyright © 2022, 2023 John Kehayias <john.kehayias@HIDDEN>
# Copyright © 2022 muradm <mail@HIDDEN>
@@ -1570,8 +1570,9 @@ dist_patch_DATA = \
%D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \
%D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \
%D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \
- %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
%D%/packages/patches/kodi-mesa-eglchromium.patch \
+ %D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch \
+ %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
%D%/packages/patches/laby-make-install.patch \
%D%/packages/patches/laby-use-tmpdir-from-runtime.patch \
%D%/packages/patches/ldns-drill-examples.patch \
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 51c4fc2751..6d02547c4e 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -18,6 +18,7 @@
;;; Copyright © 2022 Brendan Tildesley <mail@HIDDEN>
;;; Copyright © 2022 Petr Hodina <phodina@HIDDEN>
;;; Copyright © 2023 Mehmet Tekman <mtekman89@HIDDEN>
+;;; Copyright © 2024 Remco van 't Veer <remco@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -726,7 +727,8 @@ (define-public krita
"mirror://kde/stable/krita/" version "/krita-" version
".tar.gz"))
(sha256
- (base32 "1kzmn89b1vrasba7z8hp8izyrrskgc7ggnz82zqyyy1v5d8mnri7"))))
+ (base32 "1kzmn89b1vrasba7z8hp8izyrrskgc7ggnz82zqyyy1v5d8mnri7"))
+ (patches (search-patches "krita-bump-sip-abi-version-to-12.8.patch"))))
(build-system qt-build-system)
(arguments
`(#:tests? #f
diff --git a/gnu/packages/patches/krita-bump-sip-abi-version-to-12.8.patch b/gnu/packages/patches/krita-bump-sip-abi-version-to-12.8.patch
new file mode 100644
index 0000000000..02852e0f5a
--- /dev/null
+++ b/gnu/packages/patches/krita-bump-sip-abi-version-to-12.8.patch
@@ -0,0 +1,25 @@
+From 2d71c47661d43a4e3c1ab0c27803de980bdf2bb2 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@HIDDEN>
+Date: Mon, 11 Dec 2023 20:26:13 +0100
+Subject: [PATCH] Bump SIP ABI version to 12.8
+
+Fixes build with SIP 6.8
+---
+ cmake/modules/pyproject.toml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/pyproject.toml.in b/cmake/modules/pyproject.toml.in
+index 090b2d4b0cb..085ddf41799 100644
+--- a/cmake/modules/pyproject.toml.in
++++ b/cmake/modules/pyproject.toml.in
+@@ -9,7 +9,7 @@ name = "@module_name_toml@"
+ sip-module = "@sip_name@"
+ sip-include-dirs = @sip_include_dirs@
+ sip-files-dir = "@module_srcs@"
+-abi-version = "12"
++abi-version = "12.8"
+
+ [tool.sip.bindings.@module_name_toml@]
+ tags = @module_tags@
+--
+GitLab
base-commit: 6e86089d563ccb67ae04cd941ca7b66c1777831f
--
2.41.0
Remco van 't Veer <remco@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#70945; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.