From 9ea48ccd76dc6f6b5fd37e50b86910cfbb6d4114beb08f3cda93759d9734a511 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 26 Jan 2024 17:47:36 +0000 Subject: [PATCH] Accepting request 1141776 from home:bnavigator:pyqt:dependers - Add 0004-Fix-build-with-sip6.8.patch to support sip 6.8 OBS-URL: https://build.opensuse.org/request/show/1141776 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=195 --- 0004-Fix-build-with-sip6.8.patch | 26 ++++++++++++++++++++++++++ krita.changes | 5 +++++ krita.spec | 1 + 3 files changed, 32 insertions(+) create mode 100644 0004-Fix-build-with-sip6.8.patch diff --git a/0004-Fix-build-with-sip6.8.patch b/0004-Fix-build-with-sip6.8.patch new file mode 100644 index 0000000..64e4213 --- /dev/null +++ b/0004-Fix-build-with-sip6.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/krita.changes b/krita.changes index 6a8c9d5..75d9c42 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 26 15:34:05 UTC 2024 - Ben Greiner + +- Add 0004-Fix-build-with-sip6.8.patch to support sip 6.8 + ------------------------------------------------------------------- Fri Jan 19 09:40:36 UTC 2024 - Fabian Vogt diff --git a/krita.spec b/krita.spec index 1cd3f4f..503b8f4 100644 --- a/krita.spec +++ b/krita.spec @@ -46,6 +46,7 @@ Source2: krita.keyring Patch1: 0001-Fix-build-with-libjxl-0.9.0.patch Patch2: 0002-KisFileIconCreator-add-workaround-for-JPEG-XL-too.patch Patch3: 0003-JPEG-XL-Disable-export-bug-workaround-for-libjxl-0.9.patch +Patch4: 0004-Fix-build-with-sip6.8.patch BuildRequires: OpenEXR-devel BuildRequires: extra-cmake-modules BuildRequires: fftw3-devel