[neon/graphics/krita/Neon/unstable] debian/patches: Revert "backport patches that allow different pyqt6 versions"

Carlos De Maine null at kde.org
Fri Jul 31 05:34:01 BST 2026


Git commit 64136a40e3cdf0c379c8cddce39984c9868dc792 by Carlos De Maine.
Committed on 31/07/2026 at 04:33.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "backport patches that allow different pyqt6 versions"

This reverts commit 56e57f19dc77923639b083feeeceac50e6f05358.

D  +0    -13   debian/patches/30182dbfe789c9b44e5762978bf9ebb22c4f72b6.diff
D  +0    -25   debian/patches/bf7fa438058f95df35d98da73f6ba8b6751c01d4.diff
D  +0    -3    debian/patches/series

https://invent.kde.org/neon/graphics/krita/-/commit/64136a40e3cdf0c379c8cddce39984c9868dc792

diff --git a/debian/patches/30182dbfe789c9b44e5762978bf9ebb22c4f72b6.diff b/debian/patches/30182dbfe789c9b44e5762978bf9ebb22c4f72b6.diff
deleted file mode 100644
index 5f860e0..0000000
--- a/debian/patches/30182dbfe789c9b44e5762978bf9ebb22c4f72b6.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/modules/SIPMacros.cmake b/cmake/modules/SIPMacros.cmake
-index 113a3b3234c456db4d15b4264238088a1cbbe4dd..052cf80c17620826b323e2d87e34db624dee2cfb 100644
---- a/cmake/modules/SIPMacros.cmake
-+++ b/cmake/modules/SIPMacros.cmake
-@@ -152,7 +152,7 @@ else()
-         endif()
- 
-         if (QT_MAJOR_VERSION STREQUAL "6")
--            set(abi_version "13.0")
-+            set(abi_version "13.8")
-             set(sip_disabled_features "[\"Krita_Qt5\"]")
-         else()
-             set(abi_version "12.8")
diff --git a/debian/patches/bf7fa438058f95df35d98da73f6ba8b6751c01d4.diff b/debian/patches/bf7fa438058f95df35d98da73f6ba8b6751c01d4.diff
deleted file mode 100644
index dafad47..0000000
--- a/debian/patches/bf7fa438058f95df35d98da73f6ba8b6751c01d4.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/cmake/modules/SIPMacros.cmake b/cmake/modules/SIPMacros.cmake
-index 052cf80c17620826b323e2d87e34db624dee2cfb..a350222df900717d4f415d5fd30ba876649bb908 100644
---- a/cmake/modules/SIPMacros.cmake
-+++ b/cmake/modules/SIPMacros.cmake
-@@ -152,13 +152,19 @@ else()
-         endif()
- 
-         if (QT_MAJOR_VERSION STREQUAL "6")
--            set(abi_version "13.8")
-+            if ("${Qt6_VERSION}" VERSION_GREATER_EQUAL 6.10.0)
-+                set(abi_version "13.8")
-+            else() 
-+                set(abi_version "13.0")
-+            endif()
-             set(sip_disabled_features "[\"Krita_Qt5\"]")
-         else()
-             set(abi_version "12.8")
-             set(sip_disabled_features "[]")
-         endif()
- 
-+        message(STATUS "SIP ABI version: ${abi_version}")
-+
-         set(module_tags)
-         if (QT_MAJOR_VERSION STREQUAL "5")
-             foreach(_tag ${SIP_TAGS})
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e1eda46..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-30182dbfe789c9b44e5762978bf9ebb22c4f72b6.diff
-bf7fa438058f95df35d98da73f6ba8b6751c01d4.diff
-


More information about the Neon-commits mailing list