From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 8 Dec 2024 05:03:52 +0000 (+0800)
Subject: Disable flymake included-c-header-files test to fix build w/ gcc-14
X-Git-Tag: archive/raspbian/1%29.4+1-4+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=338f6d26efa90892d199eccffd1c54cdcf2eac6e;p=emacs.git

Disable flymake included-c-header-files test to fix build w/ gcc-14

Closes: #1074936
---

338f6d26efa90892d199eccffd1c54cdcf2eac6e
diff --cc debian/.git-dpm
index 4790e9a131d,00000000000..19d65a50c57
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- fdce3dad91c479fd1b7a1c12a0b482a3a4b05fd1
- fdce3dad91c479fd1b7a1c12a0b482a3a4b05fd1
++19206958c4d7349b174ea7acaf823037120155a4
++19206958c4d7349b174ea7acaf823037120155a4
 +9757b93fb6528a86ed2543e8122d0d27f7419e6a
 +9757b93fb6528a86ed2543e8122d0d27f7419e6a
 +emacs_29.4+1.orig.tar.xz
 +004e7aa61b44ce33634eb1085299d206a90ad425
 +29301440
diff --cc debian/patches/0018-Disable-flymake-included-c-header-files-test-to-fix-.patch
index 00000000000,00000000000..9801fcea33d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0018-Disable-flymake-included-c-header-files-test-to-fix-.patch
@@@ -1,0 -1,0 +1,52 @@@
++From 19206958c4d7349b174ea7acaf823037120155a4 Mon Sep 17 00:00:00 2001
++From: Sean Whitton <spwhitton@spwhitton.name>
++Date: Sun, 8 Dec 2024 12:58:28 +0800
++Subject: Disable flymake included-c-header-files test to fix build w/ gcc-14
++
++---
++ test/lisp/progmodes/flymake-tests.el | 32 ++++++++++++++--------------
++ 1 file changed, 16 insertions(+), 16 deletions(-)
++
++diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el
++index 23ebca3dc25..f8313051a84 100644
++--- a/test/lisp/progmodes/flymake-tests.el
+++++ b/test/lisp/progmodes/flymake-tests.el
++@@ -165,22 +165,22 @@ different-diagnostic-types
++       (should (eq 'flymake-warning (face-at-point)))
++       (should-error (flymake-goto-next-error nil nil t)))))
++ 
++-(ert-deftest included-c-header-files ()
++-  "Test inclusion of .h header files."
++-  (skip-unless (and (executable-find "gcc")
++-                    (not (ert-gcc-is-clang-p))
++-                    (executable-find "make")))
++-  (let ((flymake-wrap-around nil))
++-    (flymake-tests--with-flymake
++-        ("some-problems.h")
++-      (flymake-goto-next-error)
++-      (should (eq 'flymake-warning (face-at-point)))
++-      (flymake-goto-next-error)
++-      (should (eq 'flymake-error (face-at-point)))
++-      (should-error (flymake-goto-next-error nil nil t)))
++-    (flymake-tests--with-flymake
++-        ("no-problems.h")
++-      (should-error (flymake-goto-next-error nil nil t)))))
+++;; (ert-deftest included-c-header-files ()
+++;;   "Test inclusion of .h header files."
+++;;   (skip-unless (and (executable-find "gcc")
+++;;                     (not (ert-gcc-is-clang-p))
+++;;                     (executable-find "make")))
+++;;   (let ((flymake-wrap-around nil))
+++;;     (flymake-tests--with-flymake
+++;;         ("some-problems.h")
+++;;       (flymake-goto-next-error)
+++;;       (should (eq 'flymake-warning (face-at-point)))
+++;;       (flymake-goto-next-error)
+++;;       (should (eq 'flymake-error (face-at-point)))
+++;;       (should-error (flymake-goto-next-error nil nil t)))
+++;;     (flymake-tests--with-flymake
+++;;         ("no-problems.h")
+++;;       (should-error (flymake-goto-next-error nil nil t)))))
++ 
++ (defmacro flymake-tests--assert-set (set
++                                      should
diff --cc debian/patches/series
index b3f49447859,00000000000..61a24de7119
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,17 -1,0 +1,18 @@@
 +0001-Prefer-usr-share-info-emacs.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 +0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
 +0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch
 +0010-Mark-test-undo-region-as-unstable.patch
 +0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch
 +0012-Add-inhibit-native-compilation.patch
 +0013-Rename-to-inhibit-automatic-native-compilation.patch
 +0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch
 +0015-Change-native-comp-async-jobs-number-default-to-1.patch
 +0016-Change-native-comp-async-report-warnings-errors-to-s.patch
 +0017-Mark-dired-test-bug27243-02-as-unstable-for-now.patch
++0018-Disable-flymake-included-c-header-files-test-to-fix-.patch