diff --git a/emacs.spec b/emacs.spec index 758322c..ff7fc88 100644 --- a/emacs.spec +++ b/emacs.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 10; + release_number = 12; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -43,6 +43,9 @@ Patch4: emacs-desktop.patch Patch5: 0001-configure-Remove-obsolete-check-for-b-i486-linuxaout.patch Patch6: emacs-pgtk-on-x-error-message.patch Patch7: emacs-man-el-shell-injection-vulnerability.patch +# Avoid trademark issues +Patch8: pong-and-tetris-are-excluded.patch +Patch9: fix-flymake-tests-with-gcc-14.patch BuildRequires: gcc BuildRequires: atk-devel @@ -240,18 +243,14 @@ Development header files for Emacs. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' + %autosetup -p1 -autoconf - -grep -v "tetris.elc" lisp/Makefile.in > lisp/Makefile.in.new \ - && mv lisp/Makefile.in.new lisp/Makefile.in -grep -v "pong.elc" lisp/Makefile.in > lisp/Makefile.in.new \ - && mv lisp/Makefile.in.new lisp/Makefile.in - # Avoid trademark issues -rm -f lisp/play/tetris.el lisp/play/tetris.elc -rm -f lisp/play/pong.el lisp/play/pong.elc +rm lisp/play/pong.el lisp/play/pong.elc \ + lisp/play/tetris.el lisp/play/tetris.elc + +autoconf %ifarch %{ix86} %define setarch setarch %{_arch} -R @@ -623,6 +622,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %changelog ## START: Generated by rpmautospec +* Tue Jun 17 2025 Jacek Migacz - 1:29.4-12 +- Fix flymake tests with GCC 14 + +* Tue Jun 17 2025 Jacek Migacz - 1:29.4-11 +- Pong and Tetris are excluded + * Mon Mar 10 2025 Jacek Migacz - 1:29.4-10 - Fix man.el shell injection vulnerability diff --git a/fix-flymake-tests-with-gcc-14.patch b/fix-flymake-tests-with-gcc-14.patch new file mode 100644 index 0000000..484561d --- /dev/null +++ b/fix-flymake-tests-with-gcc-14.patch @@ -0,0 +1,28 @@ +From a769f171e7ebb8e30f198f4328d46f47fe7958fb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ulrich=20M=C3=BCller?= +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 + diff --git a/pong-and-tetris-are-excluded.patch b/pong-and-tetris-are-excluded.patch new file mode 100644 index 0000000..989764a --- /dev/null +++ b/pong-and-tetris-are-excluded.patch @@ -0,0 +1,86 @@ +From 6f29ac0393bb0bb70c8122d9f1bda0ae5d8cee24 Mon Sep 17 00:00:00 2001 +From: Peter Oliver +Date: Thu, 26 Sep 2024 13:20:06 +0100 +Subject: [PATCH] Pong and Tetris are excluded. + +--- + doc/emacs/ack.texi | 2 +- + doc/emacs/misc.texi | 7 +------ + lisp/menu-bar.el | 6 ------ + test/src/doc-tests.el | 4 ++-- + 4 files changed, 4 insertions(+), 15 deletions(-) + +diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi +index 5ec5cd53fa6..26f174831ca 100644 +--- a/doc/emacs/ack.texi ++++ b/doc/emacs/ack.texi +@@ -228,7 +228,7 @@ Acknowledgments + + @item + Glynn Clements provided @file{gamegrid.el} and a couple of games that +-use it, Snake and Tetris. ++use it, including Snake. + + @item + Andrew Cohen wrote @file{spam-wash.el}, to decode and clean email before +diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi +index 41e37fd094e..38e281bf59c 100644 +--- a/doc/emacs/misc.texi ++++ b/doc/emacs/misc.texi +@@ -3248,14 +3248,9 @@ Amusements + nato-region} converts the text in the region to NATO phonetic + alphabet; @kbd{M-x denato-region} converts it back. + +-@findex pong +-@cindex Pong game +-@findex tetris +-@cindex Tetris + @findex snake + @cindex Snake +- @kbd{M-x pong}, @kbd{M-x snake} and @kbd{M-x tetris} are +-implementations of the well-known Pong, Snake and Tetris games. ++ @kbd{M-x snake} is an implementation of the well-known Snake game. + + @findex solitaire + @cindex solitaire +diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el +index bcfa83cf8e4..1b0a0bce6a5 100644 +--- a/lisp/menu-bar.el ++++ b/lisp/menu-bar.el +@@ -1658,18 +1658,12 @@ menu-bar-games-menu + (bindings--define-key menu [zone] + '(menu-item "Zone Out" zone + :help "Play tricks with Emacs display when Emacs is idle")) +- (bindings--define-key menu [tetris] +- '(menu-item "Tetris" tetris +- :help "Falling blocks game")) + (bindings--define-key menu [solitaire] + '(menu-item "Solitaire" solitaire + :help "Get rid of all the stones")) + (bindings--define-key menu [snake] + '(menu-item "Snake" snake + :help "Move snake around avoiding collisions")) +- (bindings--define-key menu [pong] +- '(menu-item "Pong" pong +- :help "Bounce the ball to your opponent")) + (bindings--define-key menu [mult] + '(menu-item "Multiplication Puzzle" mpuz + :help "Exercise brain with multiplication")) +diff --git a/test/src/doc-tests.el b/test/src/doc-tests.el +index b41a7ac5fb6..24befb737bc 100644 +--- a/test/src/doc-tests.el ++++ b/test/src/doc-tests.el +@@ -34,8 +34,8 @@ doc-tests-documentation/autoloaded-macro + + (ert-deftest doc-tests-documentation/autoloaded-defun () + (skip-unless noninteractive) +- (should (autoloadp (symbol-function 'tetris))) +- (should (stringp (documentation 'tetris)))) ; See Bug#52969. ++ (should (autoloadp (symbol-function 'doctor))) ++ (should (stringp (documentation 'doctor)))) ; See Bug#52969. + + (ert-deftest doc-tests-quoting-style () + (should (memq (text-quoting-style) '(grave straight curve)))) +-- +2.46.1 +