[neon/forks/sip6/Neon/release] debian: Drop disabled_superclass.diff, included in the new release.

[Dmitry Shachnev]

Git commit 921c8727d08f61945a899df10e26680c3d8f547f by Dmitry Shachnev.
Committed on 21/12/2025 at 09:14.
Pushed by carlosdem into branch 'Neon/release'.

Drop disabled_superclass.diff, included in the new release.

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

https://invent.kde.org/neon/forks/sip6/-/commit/921c8727d08f61945a899df10e26680c3d8f547f

diff --git a/debian/changelog b/debian/changelog
index f8f2e13..a2a419b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sip6 (6.15.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop disabled_superclass.diff, included in the new release.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 21 Dec 2025 12:13:20 +0300
 
diff --git a/debian/patches/disabled_superclass.diff b/debian/patches/disabled_superclass.diff
deleted file mode 100644
index db7e280..0000000
--- a/debian/patches/disabled_superclass.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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 c554a5a..457087d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-disabled_superclass.diff
 intersphinx_local.diff
 system_ply.diff