From bfeb333323acb75940489ea186b9c35455d75ef5 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Feb 24 2025 20:44:39 +0000 Subject: Update to version 30.0.91. --- diff --git a/.gitignore b/.gitignore index 71d5258..5a24e8f 100644 --- a/.gitignore +++ b/.gitignore @@ -40,5 +40,7 @@ /emacs-29.3.tar.xz.sig /emacs-29.4.tar.xz /emacs-29.4.tar.xz.sig +/emacs-30.0.91.tar.xz +/emacs-30.0.91.tar.xz.sig /php-mode.el /results_emacs/ diff --git a/0001-Apply-display-kluge-for-PGTK-too.patch b/0001-Apply-display-kluge-for-PGTK-too.patch deleted file mode 100644 index 13c9cb3..0000000 --- a/0001-Apply-display-kluge-for-PGTK-too.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2f348ffee3777a8e2b02814d8cc50d282d98d366 Mon Sep 17 00:00:00 2001 -From: Peter Oliver -Date: Sun, 14 Jul 2024 21:50:33 +0100 -Subject: [PATCH 1/2] Apply --display kluge for PGTK too - -* src/emacs.c (main): The --display option needs the same handling -with the PGTK backend as it does with the X11 backends. (Bug#72118) ---- - src/emacs.c | 4 ++-- - src/lisp.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/emacs.c b/src/emacs.c -index 712826d57b7..ec284b16f8d 100644 ---- a/src/emacs.c -+++ b/src/emacs.c -@@ -181,7 +181,7 @@ #define MAIN_PROGRAM - data on the first attempt to change it inside asynchronous code. */ - bool running_asynch_code; - --#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS) -+#if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK) || defined (HAVE_NS) - /* If true, -d was specified, meaning we're using some window system. */ - bool display_arg; - #endif -@@ -2014,7 +2014,7 @@ main (int argc, char **argv) - { - int count_before = skip_args; - --#ifdef HAVE_X_WINDOWS -+#if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK) - char *displayname = 0; - - /* Skip any number of -d options, but only use the last one. */ -diff --git a/src/lisp.h b/src/lisp.h -index 5fa48cec2f0..05daceb5dff 100644 ---- a/src/lisp.h -+++ b/src/lisp.h -@@ -4889,7 +4889,7 @@ fast_c_string_match_ignore_case (Lisp_Object regexp, - extern char **initial_argv; - extern int initial_argc; - extern char const *emacs_wd; --#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS) -+#if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK) || defined (HAVE_NS) - extern bool display_arg; - #endif - extern Lisp_Object decode_env_path (const char *, const char *, bool); --- -2.45.2 - diff --git a/0001-Fix-failing-help-fns-test.patch b/0001-Fix-failing-help-fns-test.patch deleted file mode 100644 index c24d7f5..0000000 --- a/0001-Fix-failing-help-fns-test.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 75ca15f2a3146b17fde5e2a50ad9102c6108ba7f Mon Sep 17 00:00:00 2001 -From: Stefan Kangas -Date: Sun, 23 Jun 2024 20:54:22 +0200 -Subject: [PATCH] Fix failing help-fns-test - -* test/lisp/help-fns-tests.el (help-fns-test-lisp-defun): -Fix failing test. ---- - test/lisp/help-fns-tests.el | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/test/lisp/help-fns-tests.el b/test/lisp/help-fns-tests.el -index c3e8ca49723..fabf1959658 100644 ---- a/test/lisp/help-fns-tests.el -+++ b/test/lisp/help-fns-tests.el -@@ -63,9 +63,8 @@ help-fns-test-lisp-macro - (should (string-match regexp result)))) - - (ert-deftest help-fns-test-lisp-defun () -- (let ((regexp (if (featurep 'native-compile) -- "a native-compiled Lisp function in .+subr\\.el" -- "a byte-compiled Lisp function in .+subr\\.el")) -+ (let ((regexp (rx "a " (or "byte-compiled" "native-compiled") -+ " Lisp function in " nonl "subr.el" nonl)) - (result (help-fns-tests--describe-function 'last))) - (should (string-match regexp result)))) - --- -2.45.2 - diff --git a/0001-Fix-flymake-tests-with-GCC-14.patch b/0001-Fix-flymake-tests-with-GCC-14.patch deleted file mode 100644 index 484561d..0000000 --- a/0001-Fix-flymake-tests-with-GCC-14.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/0001-Fix-intermittent-failure-of-dired-test-bug27243-02.patch b/0001-Fix-intermittent-failure-of-dired-test-bug27243-02.patch deleted file mode 100644 index f3e821f..0000000 --- a/0001-Fix-intermittent-failure-of-dired-test-bug27243-02.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c86645dde30fbd54ae0f187e4428a09ad75e0ba8 Mon Sep 17 00:00:00 2001 -From: Peter Oliver -Date: Mon, 15 Jul 2024 12:03:47 +0100 -Subject: [PATCH] Fix intermittent failure of dired-test-bug27243-02 - -* test/lisp/dired-tests.el (dired-test-bug27243-02): Exclude free disk -space from dired listing in this test, in case it changes while it's -running and confuses the result. ---- - test/lisp/dired-tests.el | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el -index 2589281e5e1..ea47043dfc5 100644 ---- a/test/lisp/dired-tests.el -+++ b/test/lisp/dired-tests.el -@@ -189,7 +189,9 @@ dired-test-bug27243-01 - (ert-deftest dired-test-bug27243-02 () - "Test for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27243#28 ." - (ert-with-temp-directory test-dir -- (let ((dired-auto-revert-buffer t) buffers) -+ (let ((dired-auto-revert-buffer t) -+ (dired-free-space nil) -+ buffers) - ;; On MS-Windows, get rid of 8+3 short names in test-dir, if the - ;; corresponding long file names exist, otherwise such names trip - ;; string comparisons below. --- -2.45.2 - diff --git a/0001-Fix-wdired-test-unfinished-edit-01-when-temp-dirname.patch b/0001-Fix-wdired-test-unfinished-edit-01-when-temp-dirname.patch deleted file mode 100644 index 370d314..0000000 --- a/0001-Fix-wdired-test-unfinished-edit-01-when-temp-dirname.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 90734f5a3ba9998886e0b03382878a2fb514d015 Mon Sep 17 00:00:00 2001 -From: Peter Oliver -Date: Fri, 12 Jul 2024 10:52:23 +0100 -Subject: [PATCH] Fix wdired-test-unfinished-edit-01 when temp dirname contains - "foo" - -* test/lisp/wdired-tests.el (wdired-test-unfinished-edit-01): Don't -modify the random directory name if, by chance, it happens to contain -the substring "foo". ---- - test/lisp/wdired-tests.el | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/lisp/wdired-tests.el b/test/lisp/wdired-tests.el -index f7bff743058..f6d2194e998 100644 ---- a/test/lisp/wdired-tests.el -+++ b/test/lisp/wdired-tests.el -@@ -114,7 +114,7 @@ wdired-test-unfinished-edit-01 - (setq test-dir (file-truename test-dir)) - (let* ((test-file (concat (file-name-as-directory test-dir) "foo.c")) - (replace "bar") -- (new-file (string-replace "foo" replace test-file))) -+ (new-file (string-replace "/foo" (concat "/" replace) test-file))) - (write-region "" nil test-file nil 'silent) - (let ((buf (find-file-noselect test-dir))) - (unwind-protect --- -2.45.2 - diff --git a/0002-Test-eshell-test-subcommand-reset-in-pipeline-is-uns.patch b/0002-Test-eshell-test-subcommand-reset-in-pipeline-is-uns.patch deleted file mode 100644 index 94b83bf..0000000 --- a/0002-Test-eshell-test-subcommand-reset-in-pipeline-is-uns.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8ae158173d1d748d55e2605c04d33a95739e055c Mon Sep 17 00:00:00 2001 -From: Peter Oliver -Date: Mon, 15 Jul 2024 16:17:38 +0100 -Subject: [PATCH 2/3] Test eshell-test/subcommand-reset-in-pipeline is unstable - -Could be related to https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65602 ---- - test/lisp/eshell/eshell-tests.el | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test/lisp/eshell/eshell-tests.el b/test/lisp/eshell/eshell-tests.el -index 3812a4117ac..8c13d4af237 100644 ---- a/test/lisp/eshell/eshell-tests.el -+++ b/test/lisp/eshell/eshell-tests.el -@@ -79,6 +79,7 @@ eshell-test/pipe-subcommand-with-pipe - - (ert-deftest eshell-test/subcommand-reset-in-pipeline () - "Check that subcommands reset `eshell-in-pipeline-p'." -+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) - (skip-unless (executable-find "cat")) - (dolist (template '("echo {%s} | *cat" - "echo ${%s} | *cat" --- -2.45.2 - diff --git a/12BB9B400EE3F77282864D18272B5C54E015416A b/12BB9B400EE3F77282864D18272B5C54E015416A new file mode 100644 index 0000000..47fb297 --- /dev/null +++ b/12BB9B400EE3F77282864D18272B5C54E015416A @@ -0,0 +1,31 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: 12BB 9B40 0EE3 F772 8286 4D18 272B 5C54 E015 416A +Comment: Andrea Corallo + +xsFNBGa/sd8BEAC7hQAGte6YvxDaiTutpSkVrb+zJBGcEW/AroE/dduBn8mfxa/Y +i71C2GV/y03aibdaO+cXPULAkkuJVDnFk57hn3w9zo98LzqDSEgNFcAUSSSQdyj7 +Wn3J26doRpFQKnv3dbx1yZRZccbLgt/AH6hzhvNjFbYZ53LYE9rKzUYLTNHDhUI4 +QTda2PvgWoySXcjBKhyIgg9zZLSc2w4ZwhO9WDVai58xNsl+YyU2HqVPpJZSCX0j +liIooHOEL2D601ByrWmePRGFR0tD6V9xj5jWuusErb78r57NOPsRCRKCKcg/v/kl +fA5+byvanw27PDa8zoheXgF41uDf96keOQPBve3TE1Oy4x+G55zuP9KNQ5aSCG49 +x0Cc7BET23JmiWUnz1GUbM7vka5ell+smmq+kTDtK47L+4N954a6CR0esPLJMLF6 +Ub2y8SY2XPn1Bv8lsN77f0L5yyhnK72H+mf4fS/qjJlN0F+DWx49Z8it9rbG8Atc +X6Vqzv5qaDPbCpAqdqs2qrv3nAdvYOlwxmVh6Hxq1EOFT2v49dmn3viVBNnuT7yW +tyvpTDyvfLKOnfH+OLLuqPUFZnxt8mU8ieNEnvIYojSOFyddJAh2uOI3sqjLHrDg +PRAYFv9jp7K7pk+S054mdF31qD+TTxjWQtNI8Sxh/Q71Vtz7JyqYWd/JCQARAQAB +zSFBbmRyZWEgQ29yYWxsbyA8YWNvcmFsbG9AZ251Lm9yZz7CwZQEEwEKAD4WIQQS +u5tADuP3coKGTRgnK1xU4BVBagUCZr+x3wIbAwUJA8JnAAULCQgHAgYVCgkICwIE +FgIDAQIeAQIXgAAKCRAnK1xU4BVBaj/0D/4ogwPjg6Cwyi8pmRYx9gOjQNIRtjOb +2aHFYQs9luFy20Wlt/7QtelDH+NLCAb5PKvhDI3Sw+SIoheAndhbzqW7GEW5J9G7 +10PPkCUCjbicJOKsUkMv03wS6IrelUYzgjbmGYRo2vYcSb+BHXQR4MuxDSL/2vPD +LHYKwij9K+FozgJVfjq5n97l/wsGsc/orRiST23ykiXyCZweulGLhXnoCghHrnB1 +B+xBaCv3P1GW/BZZgXGPQ+1XMOsFlP951vfjirlHnJMvMDkMkNhT6Qh282jTokWN +TVQqKUv5tpdNkId+QmUhzC+DcfoOsegB3wWa6VQ/w1cG9mkoPUTT8Y8fo4FXnWwV +U4472JuZdQYFDAKEnTsW1TRNgBb5xLNNCUmDUVDndgn1WtZIZx18QBtJ1CHhycaN +C68McWuvvENhEM8clUXIHundgeDce4gcQC23Un7NT0PbNTwvGPfBSaoVax5ZVHuZ +Tr2pTHqAqqi4YLnrE5R06OIWQzVOVs5NZplDPZGXZOxryXa3ssLxjL2VYbo4AAUZ +h3fyVOzNHlGLT3Egj4XHDuDFcswUimD5SmrqQQwg94CgXExDisqH9Uo8L7Zxf/AG +UpIsxpDv219GOdTffbzl01W6oaP4obiTwMFUaQ7ljdCfq19KYdo576touTU+/48q +7AjjL28Eznhz0Q== +=goOm +-----END PGP PUBLIC KEY BLOCK----- diff --git a/emacs-pgtk-on-x-error-message.patch b/emacs-pgtk-on-x-error-message.patch index cfc7c3d..b49abee 100644 --- a/emacs-pgtk-on-x-error-message.patch +++ b/emacs-pgtk-on-x-error-message.patch @@ -12,12 +12,12 @@ index c00e13550bd..ce51bff5947 100644 --- a/src/pgtkterm.c +++ b/src/pgtkterm.c @@ -6680,7 +6680,8 @@ pgtk_display_x_warning (GdkDisplay *display) - " System. That configuration is unsupported and" - " will lead to sporadic crashes during transfer of" - " large selection data. It will also lead to" -- " various problems with keyboard input."); -+ " various problems with keyboard input." -+ "\nInstall emacs-gtk+x11 or emacs-lucid package."); + " System. That configuration is unsupported and\n" + " will lead to sporadic crashes during transfer of\n" + " large selection data. It will also lead to\n" +- " various problems with keyboard input.\n"); ++ " various problems with keyboard input.\n" ++ "\nInstall emacs-gtk+x11 or emacs-lucid package.\n"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_container_add (GTK_CONTAINER (content_area), label); gtk_widget_show (label); diff --git a/emacs-system-crypto-policies.patch b/emacs-system-crypto-policies.patch index 2f2435c..f9321ce 100644 --- a/emacs-system-crypto-policies.patch +++ b/emacs-system-crypto-policies.patch @@ -1,11 +1,12 @@ --- a/src/gnutls.c 2016-01-24 10:29:58.000000000 +0100 +++ b/src/gnutls.c 2016-02-02 09:32:28.477274274 +0100 -@@ -1557,7 +1557,7 @@ +@@ -1557,8 +1557,8 @@ gnutls_certificate_credentials_t x509_cred = NULL; gnutls_anon_client_credentials_t anon_cred = NULL; Lisp_Object global_init; - char const *priority_string_ptr = "NORMAL"; /* default priority string. */ + char const *priority_string_ptr = "@SYSTEM"; /* default priority string. */ char *c_hostname; + const char *c_pass; /* Placeholders for the property list elements. */ diff --git a/emacs.spec b/emacs.spec index 4beea30..4ad89b9 100644 --- a/emacs.spec +++ b/emacs.spec @@ -8,14 +8,21 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 -Version: 29.4 +Version: 30.0.91 Release: %autorelease License: GPL-3.0-or-later AND CC0-1.0 URL: https://www.gnu.org/software/emacs/ +%if %{lua: print(select(3, string.find(rpm.expand('%version'), '%d+%.%d+%.(%d+)')))} >= 90 +Source0: https://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.xz +Source1: https://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.xz.sig +%else Source0: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz.sig -Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/17E90D521672C04631B1183EE78DAE0F3115E06B -Source3: https://keys.openpgp.org/vks/v1/by-fingerprint/CEA1DE21AB108493CC9C65742E82323B8F4353EE +%endif +Source100: https://keys.openpgp.org/vks/v1/by-fingerprint/17E90D521672C04631B1183EE78DAE0F3115E06B +Source101: https://keys.openpgp.org/vks/v1/by-fingerprint/CEA1DE21AB108493CC9C65742E82323B8F4353EE +Source102: https://keys.openpgp.org/vks/v1/by-fingerprint/12BB9B400EE3F77282864D18272B5C54E015416A + Source4: dotemacs.el Source5: site-start.el Source6: default.el @@ -37,25 +44,15 @@ Patch: emacs-libdir-vs-systemd.patch Patch: emacs-desktop.patch Patch: emacs-pgtk-on-x-error-message.patch -# Skip failing tests (patches taken from Emacs Git) -Patch: 0001-Fix-failing-help-fns-test.patch -Patch: 0001-Fix-flymake-tests-with-GCC-14.patch - -# Fix intermittently failing test (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=72073) -Patch: 0001-Fix-wdired-test-unfinished-edit-01-when-temp-dirname.patch - # Fix intermittently failing test (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=72120) -Patch: 0001-Fix-intermittent-failure-of-dired-test-bug27243-02.patch Patch: 0004-Try-harder-to-stabalise-dired-test-bug27243-02.patch # Skip intermittently failing tests -Patch: 0002-Test-eshell-test-subcommand-reset-in-pipeline-is-uns.patch Patch: 0003-Mark-multiple-mml-sec-tests-as-unstable-when-built-i.patch # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2276822 # (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63555). If GDK ever # gets any new backends, this patch may need extending. -Patch: 0001-Apply-display-kluge-for-PGTK-too.patch Patch: 0002-Fall-back-to-the-terminal-from-pure-GTK-when-no-disp.patch BuildRequires: alsa-lib-devel @@ -76,7 +73,6 @@ BuildRequires: gnutls-devel BuildRequires: gtk3-devel BuildRequires: gzip BuildRequires: harfbuzz-devel -BuildRequires: jansson-devel BuildRequires: libacl-devel BuildRequires: libappstream-glib BuildRequires: libgccjit-devel @@ -268,7 +264,7 @@ Development header files for Emacs. %prep -cat '%{SOURCE2}' '%{SOURCE3}' > keyring +cat '%{SOURCE100}' '%{SOURCE101}' '%{SOURCE102}' > keyring %{gpgverify} --keyring=keyring --signature='%{SOURCE1}' --data='%{SOURCE0}' rm keyring @@ -320,7 +316,6 @@ cd build-lucid --with-gpm=no \ --with-harfbuzz \ --with-jpeg \ - --with-json \ --with-modules \ --with-native-compilation=aot \ --with-png \ @@ -343,7 +338,6 @@ cd .. # Build binary without X support cd build-nw %configure --program-suffix=-nw \ - --with-json \ --with-modules \ --with-native-compilation=aot \ --with-sqlite3 \ @@ -368,7 +362,6 @@ cd build-gtk+x11 --with-gpm=no \ --with-harfbuzz \ --with-jpeg \ - --with-json \ --with-modules \ --with-native-compilation=aot \ --with-png \ @@ -394,7 +387,6 @@ cd build-pgtk --with-gpm=no \ --with-harfbuzz \ --with-jpeg \ - --with-json \ --with-modules \ --with-native-compilation=aot \ --with-pgtk \