[neon/qt6/qbs/Neon/release] debian: update the patches

[Pino Toscano]

Git commit 2da538d8448cc3a3716fbbcf78ad048e806f37e7 by Pino Toscano.
Committed on 08/12/2024 at 18:10.
Pushed by carlosdem into branch 'Neon/release'.

update the patches

- upstream_cmake-Do-not-install-.gitignore-files.patch: drop,
  backported from upstream
- test_sanitizers_only_on_amd64.diff: refresh

M  +4    -0    debian/changelog
M  +0    -1    debian/patches/series
M  +1    -1    debian/patches/test_sanitizers_only_on_amd64.diff
D  +0    -32   debian/patches/upstream_cmake-Do-not-install-.gitignore-files.patch

https://invent.kde.org/neon/qt6/qbs/-/commit/2da538d8448cc3a3716fbbcf78ad048e806f37e7

diff --git a/debian/changelog b/debian/changelog
index 960cb26..2533b09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ qbs (2.5.0-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - upstream_cmake-Do-not-install-.gitignore-files.patch: drop, backported
+      from upstream
+    - test_sanitizers_only_on_amd64.diff: refresh
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Dec 2024 19:02:34 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 8948eba..ad6c86d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-upstream_cmake-Do-not-install-.gitignore-files.patch
 skip_test_concurrent.diff
 test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
diff --git a/debian/patches/test_sanitizers_only_on_amd64.diff b/debian/patches/test_sanitizers_only_on_amd64.diff
index 0772183..87067fb 100644
--- a/debian/patches/test_sanitizers_only_on_amd64.diff
+++ b/debian/patches/test_sanitizers_only_on_amd64.diff
@@ -9,7 +9,7 @@ Last-Update: 2023-08-09
 +++ b/tests/auto/blackbox/testdata/sanitizer/sanitizer.qbs
 @@ -6,8 +6,6 @@ CppApplication {
      property bool supportsSanitizer: {
-         if (qbs.toolchain.includes("mingw"))
+         if (qbs.toolchain.includes("mingw") || qbs.toolchain.contains("emscripten"))
              return false;
 -        if (sanitizer === "address")
 -            return Sanitizers.address._supported;
diff --git a/debian/patches/upstream_cmake-Do-not-install-.gitignore-files.patch b/debian/patches/upstream_cmake-Do-not-install-.gitignore-files.patch
deleted file mode 100644
index fcea494..0000000
--- a/debian/patches/upstream_cmake-Do-not-install-.gitignore-files.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 862deed5ec60c36c603d5ac84546804ea67cc675 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Sat, 26 Oct 2024 10:59:34 +0200
-Subject: [PATCH] cmake: Do not install .gitignore files
-
-Avoid installing .gitignore files from the resources, as they are of
-no much use.
-
-Change-Id: I606544a2125bb97124e6f2b1322ccdbfb695c08c
-Reviewed-by: Ivan Komissarov <ABBAPOH at gmail.com>
----
- share/CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
-index e47bd74f0..36244c536 100644
---- a/share/CMakeLists.txt
-+++ b/share/CMakeLists.txt
-@@ -52,7 +52,9 @@ add_custom_command(
-     )
- install(
-     DIRECTORY qbs
--    DESTINATION "${QBS_RESOURCES_INSTALL_DIR}")
-+    DESTINATION "${QBS_RESOURCES_INSTALL_DIR}"
-+    PATTERN ".gitignore" EXCLUDE
-+    )
- 
- # install examples dir
- install(
--- 
-2.45.2
-