[neon/forks/sip6/Neon/release] debian: Backport upstream patch to ignore super-class of a disabled class.

[Dmitry Shachnev]

Git commit 48ef85910fefd8a2fdb57d180783880981dc3072 by Dmitry Shachnev.
Committed on 14/12/2025 at 15:35.
Pushed by carlosdem into branch 'Neon/release'.

Backport upstream patch to ignore super-class of a disabled class.

M  +6    -0    debian/changelog
A  +26   -0    debian/patches/disabled_superclass.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/forks/sip6/-/commit/48ef85910fefd8a2fdb57d180783880981dc3072

diff --git a/debian/changelog b/debian/changelog
index 2b715e7..2fd2e89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sip6 (6.15.0-2) UNRELEASED; urgency=medium
+
+  * Backport upstream patch to ignore super-class of a disabled class.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 14 Dec 2025 18:35:06 +0300
+
 sip6 (6.15.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/disabled_superclass.diff b/debian/patches/disabled_superclass.diff
new file mode 100644
index 0000000..db7e280
--- /dev/null
+++ b/debian/patches/disabled_superclass.diff
@@ -0,0 +1,26 @@
+From: Phil Thompson <phil at riverbankcomputing.com>
+Date: Sat, 13 Dec 2025 22:45:54 +0000
+Subject: Bug fixes
+
+- A super-class of a disabled class was not ignored if it was disabled
+  itself.
+
+(cherry picked from commit 79da3321082f17d594b29c22dd94e58276d5d23e)
+---
+ sipbuild/generator/parser/rules.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sipbuild/generator/parser/rules.py b/sipbuild/generator/parser/rules.py
+index 8b9b429..7f3993d 100644
+--- a/sipbuild/generator/parser/rules.py
++++ b/sipbuild/generator/parser/rules.py
+@@ -1986,6 +1986,9 @@ def p_simple_superclass(p):
+ 
+     pm = p.parser.pm
+ 
++    if pm.skipping:
++        return
++
+     # Handle templates.
+     if len(p) == 5:
+         if pm.parsing_template:
diff --git a/debian/patches/series b/debian/patches/series
index 457087d..c554a5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+disabled_superclass.diff
 intersphinx_local.diff
 system_ply.diff