On Monday, February 27 2023, David Bremner wrote: > Sergio Durigan Junior <sergiodj@debian.org> writes: >> >> I was testing with an upstream build. For Debian's Emacs, we should >> use: >> >> buttercup --eval "(setq comp-enable-subr-trampolines nil)" -L . >> > > Did you get that working with the upstream version currently in master > or with a new upstream snapshot? I tried cherry picking 8379be91 but it > seemed not to be enough (there was a bunch of conflicts, so maybe I > missed something). I backported 8379be91, and it needed manual adjustments to apply cleanly. After that, it was enough to solve the other two failures. Here's the full diff. If you're OK with it I can upload the package. -- Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible https://sergiodj.net/ diff --git a/debian/changelog b/debian/changelog index cd3ad07b..30f802ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +flycheck (32-2) unstable; urgency=medium + + * Team upload. + * d/p/fix-buttercup-tests-on-emacs-28.patch: Adjust tests for Emacs 28. + * d/rules: Invoke buttercup disabling subr-trampolines. + Workaround issue described at + https://github.com/jorgenschaefer/emacs-buttercup/issues/230. + (Closes: #1028725) + + -- Sergio Durigan Junior <sergiodj@debian.org> Mon, 27 Feb 2023 22:17:21 -0500 + flycheck (32-1) unstable; urgency=medium * new upstream release diff --git a/debian/patches/fix-buttercup-tests-on-emacs-28.patch b/debian/patches/fix-buttercup-tests-on-emacs-28.patch new file mode 100644 index 00000000..c41e7bff --- /dev/null +++ b/debian/patches/fix-buttercup-tests-on-emacs-28.patch @@ -0,0 +1,58 @@ +From: Philipp Stephani <phst@google.com> +Date: Mon, 6 Dec 2021 16:55:24 +0100 +Subject: Fix Buttercup tests on Emacs 28. +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +- On Emacs 28, Checkdoc has a new customization option + ‘checkdoc-column-zero-backslash-before-paren’. + +- The header line format is slightly different. + +Origin: backport, https://github.com/flycheck/flycheck/commit/8fefc5079107cd8f047f2f6cf6e22ff6772a90fe +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1028725 +--- + flycheck.el | 6 ++++-- + test/specs/test-error-list.el | 4 +++- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/flycheck.el b/flycheck.el +index a1298fe..19847dc 100644 +--- a/flycheck.el ++++ b/flycheck.el +@@ -8519,7 +8519,7 @@ See Info Node `(elisp)Byte Compilation'." + (kill-buffer))))))) + + (defconst flycheck-emacs-lisp-checkdoc-variables +- '(checkdoc-symbol-words ++ `(checkdoc-symbol-words + checkdoc-arguments-in-order-flag + checkdoc-force-history-flag + checkdoc-permit-comma-termination-flag +@@ -8528,7 +8528,9 @@ See Info Node `(elisp)Byte Compilation'." + checkdoc-spellcheck-documentation-flag + checkdoc-verb-check-experimental-flag + checkdoc-max-keyref-before-warn +- sentence-end-double-space) ++ sentence-end-double-space ++ ,@(and (>= emacs-major-version 28) ++ '(checkdoc-column-zero-backslash-before-paren))) + "Variables inherited by the checkdoc subprocess.") + + (defun flycheck-emacs-lisp-checkdoc-variables-form () +diff --git a/test/specs/test-error-list.el b/test/specs/test-error-list.el +index 70f132a..226e235 100644 +--- a/test/specs/test-error-list.el ++++ b/test/specs/test-error-list.el +@@ -67,7 +67,9 @@ + (it "has a local header line" + (flycheck/with-error-list-buffer + (expect header-line-format +- :to-equal " File Line Col Level ID Message (Checker) ") ++ :to-equal (if (< emacs-major-version 28) ++ " File Line Col Level ID Message (Checker) " ++ " File Line ▼ Col Level ID Message (Checker) ")) + (expect 'header-line-format :to-be-local)))) + + (describe "Columns" diff --git a/debian/patches/series b/debian/patches/series index 6603290d..6d1290ed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ skip-rpmlint-test.patch skip-flaky-tests.patch python3-in-test.patch skip-truncated-stdin-tests.patch +fix-buttercup-tests-on-emacs-28.patch diff --git a/debian/rules b/debian/rules index f298da1f..7e12c97f 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,11 @@ override_dh_installchangelogs: override_dh_auto_build: ( cd doc && make OFFLINE=yes html ) +# Temporary workaround for +# https://github.com/jorgenschaefer/emacs-buttercup/issues/230 +override_dh_elpa_test: + buttercup --eval '(setq comp-enable-subr-trampolines nil)' -L . + # The file flycheck.html in the _downloads subdir is generated from # the old texinfo manual, which is deprecated by upstream. Don't # install it as parts could be out-of-date
Attachment:
signature.asc
Description: PGP signature