[neon/forks/sip6/Neon/release] debian: Backport upstream patch to fix handling of composite modules.

[Dmitry Shachnev]

Git commit 71d7d551ba4e44b65f43f0e575f8f7b2f6cd8cd9 by Dmitry Shachnev.
Committed on 16/10/2025 at 19:47.
Pushed by carlosdem into branch 'Neon/release'.

Backport upstream patch to fix handling of composite modules.

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

https://invent.kde.org/neon/forks/sip6/-/commit/71d7d551ba4e44b65f43f0e575f8f7b2f6cd8cd9

diff --git a/debian/changelog b/debian/changelog
index 90cbe1f..9231de4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sip6 (6.13.1-2) UNRELEASED; urgency=medium
+
+  * Backport upstream patch to fix handling of composite modules.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 16 Oct 2025 22:46:55 +0300
+
 sip6 (6.13.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/composite_modules.diff b/debian/patches/composite_modules.diff
new file mode 100644
index 0000000..4df8753
--- /dev/null
+++ b/debian/patches/composite_modules.diff
@@ -0,0 +1,26 @@
+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 457087d..e3a2c7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 intersphinx_local.diff
 system_ply.diff
+composite_modules.diff