[neon/forks/sip6/Neon/release] debian: Drop two patches that were included in the new release.

[Dmitry Shachnev]

Git commit 84930dde1da1b6d563abc22009a364dd568ce5d7 by Dmitry Shachnev.
Committed on 24/03/2026 at 13:14.
Pushed by carlosdem into branch 'Neon/release'.

Drop two patches that were included in the new release.

M  +3    -0    debian/changelog
D  +0    -50   debian/patches/fix_stack_smashing.diff
M  +0    -2    debian/patches/series
D  +0    -24   debian/patches/test_cxxflags.diff

https://invent.kde.org/neon/forks/sip6/-/commit/84930dde1da1b6d563abc22009a364dd568ce5d7

diff --git a/debian/changelog b/debian/changelog
index fbdde7c..7d6b194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 sip6 (6.15.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patches, included in the new release:
+    - test_cxxflags.diff
+    - fix_stack_smashing.diff
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 24 Mar 2026 16:13:36 +0300
 
diff --git a/debian/patches/fix_stack_smashing.diff b/debian/patches/fix_stack_smashing.diff
deleted file mode 100644
index 3e8b638..0000000
--- a/debian/patches/fix_stack_smashing.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Phil Thompson <phil at riverbankcomputing.com>
-Date: Sat, 14 Mar 2026 15:47:26 +0000
-Subject: Fixed the handling of virtuals that return enums with a non-int base
- type
-
-(cherry picked from commit 7b9e5a72ed44981aa06655fbeb8bbaf7c1ee8d5b)
----
- sipbuild/generator/outputs/code/snippets.py | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/sipbuild/generator/outputs/code/snippets.py b/sipbuild/generator/outputs/code/snippets.py
-index 8c0f619..a49a338 100644
---- a/sipbuild/generator/outputs/code/snippets.py
-+++ b/sipbuild/generator/outputs/code/snippets.py
-@@ -3893,7 +3893,14 @@ f'''
-     sf.write(')\n{\n')
- 
-     if result_is_returned:
--        result_plain_decl = fmt_argument_as_cpp_type(spec, result, plain=True)
-+        decl = fmt_argument_as_cpp_type(spec, result, plain=True)
-+
-+        if _arg_is_v13_typed_enum(spec, result):
-+            result_plain_decl = 'int'
-+            result_cast = '(' + decl + ')'
-+        else:
-+            result_plain_decl = decl
-+            result_cast = ''
- 
-         if result_instance_code is not None:
-             sf.write(
-@@ -3995,8 +4002,8 @@ f'''
- 
-         if result_is_returned:
-             sf.write(
--'''
--    return sipRes;
-+f'''
-+    return {result_cast}sipRes;
- ''')
- 
-         sf.write('}\n')
-@@ -4097,7 +4104,7 @@ f'    PyObject *sipResObj = sipCallMethod({context}SIP_NULLPTR, sipMethod, ')
- 
-         sf.write(
- f'''
--    return {result_ref}sipRes;
-+    return {result_cast}{result_ref}sipRes;
- ''')
- 
-     sf.write('}\n')
diff --git a/debian/patches/series b/debian/patches/series
index e94f536..457087d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 intersphinx_local.diff
 system_ply.diff
-test_cxxflags.diff
-fix_stack_smashing.diff
diff --git a/debian/patches/test_cxxflags.diff b/debian/patches/test_cxxflags.diff
deleted file mode 100644
index 405b207..0000000
--- a/debian/patches/test_cxxflags.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Dmitry Shachnev <mitya57 at debian.org>
-Date: Tue, 10 Mar 2026 14:09:05 +0300
-Subject: test: Amend CXXFLAGS instead of overwriting them
-
-Forwarded: https://github.com/Python-SIP/sip/pull/104
----
- test/conftest.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/test/conftest.py b/test/conftest.py
-index 749ad67..38563d2 100644
---- a/test/conftest.py
-+++ b/test/conftest.py
-@@ -292,7 +292,9 @@ def _build_test_module(sip_file, test_dir, abi_version, package, exceptions,
-                 f.write(f'tags = [{tags_s}]\n')
- 
-     # Configure the C++11 support.
--    os.environ['CXXFLAGS'] = '-std=c++11'
-+    cxxflags = os.environ.get('CXXFLAGS', '')
-+    if '-std=c++11' not in cxxflags:
-+        os.environ['CXXFLAGS'] = f'{cxxflags} -std=c++11'
- 
-     # Build and move the test module.
-     _build_module(module_name, package,