Accepting request 1201403 from editors

- Add patch emacs-gcc14.patch to make flymake-tests work even with
  gcc14 (backport from upstream master)

OBS-URL: https://build.opensuse.org/request/show/1201403
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=193
This commit is contained in:
Ana Guerrero 2024-09-18 13:26:48 +00:00 committed by Git OBS Bridge
commit e517b0097f
3 changed files with 39 additions and 24 deletions

29
emacs-gcc14.patch Normal file
View File

@ -0,0 +1,29 @@
--- ../emacs-29.4/test/lisp/progmodes/flymake-tests.el 2024-06-21 15:10:29.000000000 +0200
+++ test/lisp/progmodes/flymake-tests.el 2024-09-16 11:44:22.804661284 +0200
@@ -174,7 +174,8 @@ SEVERITY-PREDICATE is used to setup
(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)))
@@ -213,6 +214,7 @@ SEVERITY-PREDICATE is used to setup
(ert-deftest dummy-backends ()
"Test many different kinds of backends."
+ (let ((debug-on-error nil))
(with-temp-buffer
(cl-letf
(((symbol-function 'error-backend)
@@ -291,7 +293,7 @@ SEVERITY-PREDICATE is used to setup
(should (eq 'flymake-warning (face-at-point))) ; dolor
(flymake-goto-next-error)
(should (eq 'flymake-error (face-at-point))) ; prognata
- (should-error (flymake-goto-next-error nil nil t))))))
+ (should-error (flymake-goto-next-error nil nil t)))))))
(ert-deftest recurrent-backend ()
"Test a backend that calls REPORT-FN multiple times."

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 16 10:47:37 UTC 2024 - Dr. Werner Fink <werner@suse.de>
- Add patch emacs-gcc14.patch to make flymake-tests work even with
gcc14 (backport from upstream master)
-------------------------------------------------------------------
Wed Aug 28 11:03:31 UTC 2024 - Dr. Werner Fink <werner@suse.de>

View File

@ -55,14 +55,6 @@ BuildRequires: fdupes
BuildRequires: fontconfig-devel
BuildRequires: fonts-config
BuildRequires: freetype2-devel
%if 0%{?suse_version} >= 1550
%ifarch %ix86 %arm
BuildRequires: gcc13
BuildRequires: gcc13-PIE
#!BuildIgnore: gcc14
#!BuildIgnore: gcc14-PIE
%endif
%endif
BuildRequires: gettext-devel
BuildRequires: giflib-devel
BuildRequires: git
@ -143,14 +135,8 @@ BuildRequires: pkgconfig(libacl)
BuildRequires: libacl-devel
%endif
%if %{with nativecomp}
%ifarch %ix86 %arm
BuildRequires: gcc13
BuildRequires: libgccjit0-devel-gcc13
BuildRequires: libgccjit0-gcc13
%else
BuildRequires: libgccjit-devel
%endif
%endif
BuildRequires: pkgconfig(atspi-2)
BuildRequires: pkgconfig(jansson)
BuildRequires: pkgconfig(json)
@ -213,6 +199,7 @@ Source9: macros.emacs
Patch0: emacs-29.1.dif
# Currently disabled
Patch2: emacs-24.4-glibc.patch
Patch3: emacs-gcc14.patch
Patch4: emacs-24.3-asian-print.patch
Patch5: emacs-24.4-ps-bdf.patch
Patch7: emacs-24.1-ps-mule.patch
@ -336,7 +323,7 @@ Summary: Info files for GNU Emacs
Group: Documentation/Other
%if 0%{?suse_version} <= 1500
Requires(post): %install_info_prereq
Requires(preun): %install_info_prereq
Requires(preun):%install_info_prereq
%endif
BuildArch: noarch
@ -364,7 +351,7 @@ group called "games".
Summary: Generate Tag Files for Use with Emacs
Group: Development/Tools/Navigators
Requires(post): coreutils update-alternatives
Requires(preun): coreutils update-alternatives
Requires(preun):coreutils update-alternatives
Provides: ctags:/usr/bin/etags
%description -n etags
@ -377,6 +364,7 @@ and most assembler-like syntaxes.
%if %{with memmmap}
%patch -P2 -p0 -b .glibc
%endif
%patch -P3 -p0 -b .gcc14
%patch -P4 -p0 -b .print
%patch -P5 -p0 -b .psbdf
%patch -P7 -p0 -b .psmu
@ -424,14 +412,6 @@ fi
%else
autoreconf -fiv -I $PWD -I $PWD/m4
%endif
%if 0%{?suse_version} >= 1550
%ifarch %ix86 %arm
export CC=gcc-13
export AR=gcc-ar-13
export RANLIB=gcc-ranlib-13
%endif
%endif
cflags ()
{
local flag=$1; shift