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

[Dmitry Shachnev]

Git commit 3542ad9d616beb7b350d4c6fe1b4b54867c69389 by Dmitry Shachnev.
Committed on 23/10/2025 at 18:36.
Pushed by carlosdem into branch 'Neon/release'.

Drop composite_modules.diff, included in the new release.

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

https://invent.kde.org/neon/forks/sip6/-/commit/3542ad9d616beb7b350d4c6fe1b4b54867c69389

diff --git a/debian/changelog b/debian/changelog
index 9cab900..6763285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sip6 (6.14.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop composite_modules.diff, included in the new release.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 23 Oct 2025 21:33:39 +0300
 
diff --git a/debian/patches/composite_modules.diff b/debian/patches/composite_modules.diff
deleted file mode 100644
index 4df8753..0000000
--- a/debian/patches/composite_modules.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Phil Thompson <phil at riverbankcomputing.com>
-Date: Thu, 16 Oct 2025 13:16:47 +0100
-Subject: Fixed a regression in v6.13.1 in the handling of composite modules
-
-Resolves #95
-
-(cherry picked from commit b6a7ec2453899b878ffe0b2b5b1f642a0992aa6d)
----
- sipbuild/generator/resolver/resolver.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/sipbuild/generator/resolver/resolver.py b/sipbuild/generator/resolver/resolver.py
-index 9dbc2e9..492b2e3 100644
---- a/sipbuild/generator/resolver/resolver.py
-+++ b/sipbuild/generator/resolver/resolver.py
-@@ -38,6 +38,10 @@ def resolve(spec, modules):
-         # Set the base name of the module.  This is done for efficiency.
-         mod.py_name = mod.fq_py_name.name.split('.')[-1]
- 
-+    # There is nothing else that needs doing for composite modules.
-+    if spec.is_composite:
-+        return
-+
-     # Set the default meta-type for the main module if it doesn't have one
-     # explicitly set.
-     if spec.module.default_metatype is None:
diff --git a/debian/patches/series b/debian/patches/series
index e3a2c7e..457087d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 intersphinx_local.diff
 system_ply.diff
-composite_modules.diff