rpms/emacs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix flymake tests with GCC 14

Browse Source 
Resolves: RHEL-94297
This commit is contained in:
Jacek Migacz 2025-06-17 14:50:10 +02:00
parent 0336f75e83
commit a3af0f24ec
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
emacs-fix-flymake-tests-with-gcc-14.patch Normal file
View File

@ -0,0 +1,28 @@
From a769f171e7ebb8e30f198f4328d46f47fe7958fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Mon, 24 Jun 2024 15:20:26 +0200
Subject: [PATCH] ; Fix flymake tests with GCC 14.
* test/lisp/progmodes/flymake-tests.el (included-c-header-files):
Fix test failure with GCC 14. (Bug#71749)
---
test/lisp/progmodes/flymake-tests.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el
index 21dbb0711d2..93bc9028031 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -174,7 +174,8 @@ included-c-header-files
(flymake-tests--with-flymake
("some-problems.h")
(flymake-goto-next-error)
- (should (eq 'flymake-warning (face-at-point)))
+ ;; implicit-int was promoted from warning to error in GCC 14
+ (should (memq (face-at-point) '(flymake-warning flymake-error)))
(flymake-goto-next-error)
(should (eq 'flymake-error (face-at-point)))
(should-error (flymake-goto-next-error nil nil t)))
--
2.45.2

7
emacs.spec
View File

@ -5,7 +5,7 @@ Summary: GNU Emacs text editor
Name: emacs Name: emacs
Epoch: 1 Epoch: 1
Version: 27.2 Version: 27.2
Release: 16%{?dist} Release: 17%{?dist}
License: GPLv3+ and CC0-1.0 License: GPLv3+ and CC0-1.0
URL: http://www.gnu.org/software/emacs/ URL: http://www.gnu.org/software/emacs/
Source0: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz Source0: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
@ -41,6 +41,7 @@ Patch14: emacs-man-el-shell-injection-vulnerability.patch
Patch15: emacs-CVE-2024-53920.patch Patch15: emacs-CVE-2024-53920.patch
# Avoid trademark issues # Avoid trademark issues
Patch16: emacs-pong-and-tetris-are-excluded.patch Patch16: emacs-pong-and-tetris-are-excluded.patch
Patch17: emacs-fix-flymake-tests-with-gcc-14.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: atk-devel BuildRequires: atk-devel
@ -216,6 +217,7 @@ Development header files for Emacs.
%patch -P 14 -p1 -b .man-el-shell-injection-vulnerability %patch -P 14 -p1 -b .man-el-shell-injection-vulnerability
%patch -P 15 -p1 -b .CVE-2024-53920 %patch -P 15 -p1 -b .CVE-2024-53920
%patch -P 16 -p1 -b .pong-and-tetris-are-excluded %patch -P 16 -p1 -b .pong-and-tetris-are-excluded
%patch -P 17 -p1 -b .fix-flymake-tests-with-gcc-14
# Avoid trademark issues # Avoid trademark issues
rm lisp/play/pong.el lisp/play/pong.elc \ rm lisp/play/pong.el lisp/play/pong.elc \
@ -502,8 +504,9 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg
%{_includedir}/emacs-module.h %{_includedir}/emacs-module.h
%changelog %changelog
* Tue Jun 18 2025 Jacek Migacz <jmigacz@redhat.com> - 1:27.2-17 * Wed Jun 18 2025 Jacek Migacz <jmigacz@redhat.com> - 1:27.2-17
- Pong and Tetris are excluded (RHEL-94297) - Pong and Tetris are excluded (RHEL-94297)
- Fix flymake tests with GCC 14 (RHEL-94297)
* Fri May 09 2025 Jacek Migacz <jmigacz@redhat.com> - 1:27.2-16 * Fri May 09 2025 Jacek Migacz <jmigacz@redhat.com> - 1:27.2-16
- Restore definition of variable "enable-dir-local-variables" (RHEL-92550) - Restore definition of variable "enable-dir-local-variables" (RHEL-92550)