From patchwork Tue May 14 16:01:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Remco van 't Veer X-Patchwork-Id: 64425 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 91D9127BBE2; Tue, 14 May 2024 17:03:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7366C27BBE9 for ; Tue, 14 May 2024 17:03:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6ucS-0004DI-4K; Tue, 14 May 2024 12:03:13 -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 ) id 1s6ucK-00047T-Rw for guix-patches@gnu.org; Tue, 14 May 2024 12:03:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s6ucK-0007JA-G0 for guix-patches@gnu.org; Tue, 14 May 2024 12:03:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6ucI-00073B-5c for guix-patches@gnu.org; Tue, 14 May 2024 12:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70945] [PATCH] gnu: krita: Fix build. Resent-From: Remco van 't Veer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 May 2024 16:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70945 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70945@debbugs.gnu.org Cc: Remco van 't Veer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171570257627091 (code B ref -1); Tue, 14 May 2024 16:03:01 +0000 Received: (at submit) by debbugs.gnu.org; 14 May 2024 16:02:56 +0000 Received: from localhost ([127.0.0.1]:40117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6ucA-00072t-11 for submit@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 ) id 1s6uc4-00072n-LD for submit@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 ) id 1s6ubv-0003kU-Hr for guix-patches@gnu.org; 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 ) id 1s6ube-00077e-Uo for guix-patches@gnu.org; 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: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdegiedgleegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffogggtgfesthekre dtredtjeenucfhrhhomheptfgvmhgtohcuvhgrnhcukdhtucggvggvrhcuoehrvghmtgho sehrvghmfihorhhkshdrnhgvtheqnecuggftrfgrthhtvghrnhepgedvffduveelfffgje efueefleefhedujedvhfegjeehteeuffetieduheegueevnecuffhomhgrihhnpehtohhm lhdrihhnnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh eprhifvhesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: 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 Date: Tue, 14 May 2024 18:01:26 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.148; envelope-from=rwv@fastmail.com; 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 base-commit: 6e86089d563ccb67ae04cd941ca7b66c1777831f 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 # Copyright © 2021 Simon Tournier # Copyright © 2022 Daniel Meißner -# Copyright © 2022 Remco van 't Veer +# Copyright © 2022, 2024 Remco van 't Veer # Copyright © 2022, 2024 Artyom V. Poptsov # Copyright © 2022, 2023 John Kehayias # Copyright © 2022 muradm @@ -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 ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Mehmet Tekman +;;; Copyright © 2024 Remco van 't Veer ;;; ;;; 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 +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