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 3218F158015 for ; Tue, 26 Dec 2023 09:00:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 49F992BC01B; Tue, 26 Dec 2023 09:00:01 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D4A42BC01B for ; Tue, 26 Dec 2023 09:00:01 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 179E9335DEB for ; Tue, 26 Dec 2023 09:00:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BB841256 for ; Tue, 26 Dec 2023 08:59:58 +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: <1703581175.039e05313098a299f93038ea55934ebfd5b6bb9a.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-5.1.5-sip-6.8.patch media-gfx/krita/krita-5.1.5.ebuild X-VCS-Directories: media-gfx/krita/files/ media-gfx/krita/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 039e05313098a299f93038ea55934ebfd5b6bb9a X-VCS-Branch: master Date: Tue, 26 Dec 2023 08:59:58 +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: 36f78aa5-4c03-4e36-a7a5-02a1b9365ecf X-Archives-Hash: 9b97ea9c72d5c618df95d78d63b13a50 commit: 039e05313098a299f93038ea55934ebfd5b6bb9a Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 26 08:58:54 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 26 08:59:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=039e0531 media-gfx/krita: Fix build w/ >=dev-python/sip-6.8.0 Closes: https://bugs.gentoo.org/919139 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/krita/files/krita-5.1.5-sip-6.8.patch | 26 +++++++++++++++++++++++++ media-gfx/krita/krita-5.1.5.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch b/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch new file mode 100644 index 000000000000..d9bcd937a3d2 --- /dev/null +++ b/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch @@ -0,0 +1,26 @@ +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 + diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild index f313dc477e04..ab68ac1db844 100644 --- a/media-gfx/krita/krita-5.1.5.ebuild +++ b/media-gfx/krita/krita-5.1.5.ebuild @@ -90,6 +90,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.3.1-tests-optional.patch" "${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472 "${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107 + "${FILESDIR}/${P}-sip-6.8.patch" # bug 919139 ) pkg_setup() {