Compare commits
12 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
caca17c2eb | ||
|
|
57ec29b466 | ||
|
|
7bb9e151e8 | ||
|
|
1877afcac9 | ||
|
|
8ea9f93613 | ||
|
|
fb8331f31c | ||
|
|
e0945d1248 | ||
|
|
eb7d785748 | ||
|
|
09edb60c03 | ||
|
|
b16738093b | ||
|
|
18b74c329f | ||
|
|
5efba81bd0 |
13 changed files with 61 additions and 341 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -42,3 +42,7 @@
|
|||
/emacs-29.4.tar.xz.sig
|
||||
/php-mode.el
|
||||
/results_emacs/
|
||||
/emacs-30.1.tar.xz
|
||||
/emacs-30.1.tar.xz.sig
|
||||
/emacs-30.2.tar.xz
|
||||
/emacs-30.2.tar.xz.sig
|
||||
|
|
|
|||
16
0001-Base-puresize.patch
Normal file
16
0001-Base-puresize.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
diff -ruN emacs-30.1/src/puresize.h emacs-30.1-mod4/src/puresize.h
|
||||
--- emacs-30.1/src/puresize.h 2025-02-18 21:31:36.000000000 +0300
|
||||
+++ emacs-30.1-mod4/src/puresize.h 2025-05-27 14:17:15.067370990 +0300
|
||||
@@ -47,8 +47,12 @@
|
||||
#endif
|
||||
|
||||
#ifndef BASE_PURESIZE
|
||||
+#if defined __i386__
|
||||
+#define BASE_PURESIZE (4500000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
|
||||
+#else
|
||||
#define BASE_PURESIZE (3400000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
/* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */
|
||||
#ifndef PURESIZE_RATIO
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From 75ca15f2a3146b17fde5e2a50ad9102c6108ba7f Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Kangas <stefankangas@gmail.com>
|
||||
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
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From c86645dde30fbd54ae0f187e4428a09ad75e0ba8 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Oliver <git@mavit.org.uk>
|
||||
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
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From 90734f5a3ba9998886e0b03382878a2fb514d015 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Oliver <git@mavit.org.uk>
|
||||
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
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 8ae158173d1d748d55e2605c04d33a95739e055c Mon Sep 17 00:00:00 2001
|
||||
From: Peter Oliver <git@mavit.org.uk>
|
||||
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
|
||||
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
From bf512d1bad98bcd1dc87da93fd2e7f415be14501 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Oliver <git@mavit.org.uk>
|
||||
Date: Mon, 15 Jul 2024 16:19:10 +0100
|
||||
Subject: [PATCH 3/4] Mark multiple mml-sec tests as unstable when built in an
|
||||
RPM
|
||||
|
||||
* test/lisp/gnus/mml-sec-tests.el: Mark unstable tests which have been
|
||||
seen to intermittently fail at
|
||||
https://koji.fedoraproject.org/koji/packageinfo?packageID=560
|
||||
---
|
||||
test/lisp/gnus/mml-sec-tests.el | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el
|
||||
index 7abd1bd65a3..2bd52bf3ee0 100644
|
||||
--- a/test/lisp/gnus/mml-sec-tests.el
|
||||
+++ b/test/lisp/gnus/mml-sec-tests.el
|
||||
@@ -210,6 +210,7 @@ mml-secure-test-key-fixture
|
||||
|
||||
(ert-deftest mml-secure-key-checks ()
|
||||
"Test mml-secure-check-user-id and mml-secure-check-sub-key on sample keys."
|
||||
+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable))
|
||||
(skip-unless (test-conf))
|
||||
(mml-secure-test-fixture
|
||||
(lambda ()
|
||||
@@ -278,6 +279,7 @@ mml-secure-key-checks
|
||||
|
||||
(ert-deftest mml-secure-find-usable-keys-1 ()
|
||||
"Make sure that expired and disabled keys and revoked UIDs are not used."
|
||||
+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable))
|
||||
(skip-unless (test-conf))
|
||||
(mml-secure-test-fixture
|
||||
(lambda ()
|
||||
@@ -317,6 +319,7 @@ mml-secure-find-usable-keys-1
|
||||
|
||||
(ert-deftest mml-secure-find-usable-keys-2 ()
|
||||
"Test different ways to search for keys."
|
||||
+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable))
|
||||
(skip-unless (test-conf))
|
||||
(mml-secure-test-fixture
|
||||
(lambda ()
|
||||
@@ -369,6 +372,7 @@ mml-secure-find-usable-keys-2
|
||||
|
||||
(ert-deftest mml-secure-select-preferred-keys-1 ()
|
||||
"If only one key exists for an e-mail address, it is the preferred one."
|
||||
+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable))
|
||||
(skip-unless (test-conf))
|
||||
(mml-secure-test-fixture
|
||||
(lambda ()
|
||||
@@ -380,6 +384,7 @@ mml-secure-select-preferred-keys-1
|
||||
|
||||
(ert-deftest mml-secure-select-preferred-keys-2 ()
|
||||
"If multiple keys exists for an e-mail address, customization is necessary."
|
||||
+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable))
|
||||
(skip-unless (test-conf))
|
||||
(mml-secure-test-fixture
|
||||
(lambda ()
|
||||
@@ -407,6 +412,7 @@ mml-secure-select-preferred-keys-2
|
||||
|
||||
(ert-deftest mml-secure-select-preferred-keys-3 ()
|
||||
"Expired customized keys are removed if multiple keys are available."
|
||||
+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable))
|
||||
(skip-unless (test-conf))
|
||||
(mml-secure-test-fixture
|
||||
(lambda ()
|
||||
@@ -581,6 +587,7 @@ mml-secure-test-en-decrypt-with-passphrase
|
||||
(ert-deftest mml-secure-en-decrypt-1 ()
|
||||
"Encrypt message; then decrypt and test for expected result.
|
||||
In this test, the single matching key is chosen automatically."
|
||||
+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable))
|
||||
(skip-unless (test-conf))
|
||||
(dolist (method (enc-standards) nil)
|
||||
;; no-exp@example.org with single encryption key
|
||||
@@ -625,6 +632,7 @@ mml-secure-en-decrypt-3
|
||||
(ert-deftest mml-secure-en-decrypt-4 ()
|
||||
"Encrypt message; then decrypt and test for expected result.
|
||||
In this test, encrypt-to-self variables are set to lists."
|
||||
+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable))
|
||||
(skip-unless (test-conf))
|
||||
;; Send from sub@example.org, which has two keys; encrypt to both.
|
||||
(let ((mml-secure-openpgp-encrypt-to-self
|
||||
--
|
||||
2.47.0
|
||||
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From e0f0549ac6766ab565dbd581098b96792a807727 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Oliver <git@mavit.org.uk>
|
||||
Date: Wed, 17 Jul 2024 00:06:02 +0100
|
||||
Subject: [PATCH 4/4] Try harder to stabalise dired-test-bug27243-02
|
||||
|
||||
* test/lisp/dired-tests.el (dired-test-bug27243-02): Don't rely on the
|
||||
expected point, since columns will move if the size of the parent directory
|
||||
changes order of magnitude.
|
||||
---
|
||||
test/lisp/dired-tests.el | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
|
||||
index ea47043dfc5..6078e99e13c 100644
|
||||
--- a/test/lisp/dired-tests.el
|
||||
+++ b/test/lisp/dired-tests.el
|
||||
@@ -190,7 +190,6 @@ 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)
|
||||
- (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
|
||||
@@ -216,7 +215,9 @@ dired-test-bug27243-02
|
||||
;; Sanity check: point should now be back on the subdirectory.
|
||||
(should (eq (point) pt1))
|
||||
(push (dired test-dir) buffers)
|
||||
- (should (eq (point) pt1)))
|
||||
+ (should (equal (dired-file-name-at-point)
|
||||
+ (concat (file-name-as-directory test-dir)
|
||||
+ (file-name-as-directory "test-subdir")))))
|
||||
(dolist (buf buffers)
|
||||
(when (buffer-live-p buf) (kill-buffer buf)))))))
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
|
@ -1,26 +1,13 @@
|
|||
From eaaf4883aee50974eeb03e529a29585f8ddc1d9d Mon Sep 17 00:00:00 2001
|
||||
From: Bhavin Gandhi <bhavin192@geeksocket.in>
|
||||
Date: Wed, 31 May 2023 22:44:54 +0530
|
||||
Subject: [PATCH] Add package names to PGTK on X error message
|
||||
|
||||
---
|
||||
src/pgtkterm.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
|
||||
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.");
|
||||
diff -ruN emacs-30.1/src/pgtkterm.c emacs-30.1-mod3/src/pgtkterm.c
|
||||
--- emacs-30.1/src/pgtkterm.c 2025-02-18 21:31:36.000000000 +0300
|
||||
+++ emacs-30.1-mod3/src/pgtkterm.c 2025-05-25 19:12:51.952225248 +0300
|
||||
@@ -7000,7 +7000,8 @@
|
||||
" 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"
|
||||
+ " Install 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);
|
||||
--
|
||||
2.40.1
|
||||
|
||||
|
|
|
|||
|
|
@ -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 @@
|
||||
diff -ruN emacs-30.1/src/gnutls.c emacs-30.1-mod2/src/gnutls.c
|
||||
--- emacs-30.1/src/gnutls.c 2025-02-18 21:31:36.000000000 +0300
|
||||
+++ emacs-30.1-mod2/src/gnutls.c 2025-05-25 18:56:46.143142320 +0300
|
||||
@@ -1974,7 +1974,7 @@
|
||||
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. */
|
||||
|
|
|
|||
72
emacs.spec
72
emacs.spec
|
|
@ -8,7 +8,7 @@
|
|||
Summary: GNU Emacs text editor
|
||||
Name: emacs
|
||||
Epoch: 1
|
||||
Version: 29.4
|
||||
Version: 30.2
|
||||
Release: %autorelease
|
||||
License: GPL-3.0-or-later AND CC0-1.0
|
||||
URL: https://www.gnu.org/software/emacs/
|
||||
|
|
@ -40,25 +40,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
|
||||
# Increase BASE_PURESIZE, can likely be removed in next release
|
||||
# as no longer on development branch
|
||||
# https://lists.gnu.org/archive/html/emacs-devel/2025-02/txtMuC0fL80Sf.txt
|
||||
# https://lists.gnu.org/archive/html/emacs-devel/2025-02/msg01027.html
|
||||
Patch: 0001-Base-puresize.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
|
||||
|
|
@ -96,6 +86,14 @@ BuildRequires: libxml2-devel
|
|||
BuildRequires: m17n-lib-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: rust-tree-sitter-bash-devel
|
||||
BuildRequires: rust-tree-sitter-cli-devel
|
||||
BuildRequires: rust-tree-sitter-css-devel
|
||||
BuildRequires: rust-tree-sitter-elixir-devel
|
||||
BuildRequires: rust-tree-sitter-html-devel
|
||||
BuildRequires: rust-tree-sitter-javascript-devel
|
||||
BuildRequires: rust-tree-sitter-json-devel
|
||||
BuildRequires: rust-tree-sitter-python-devel
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: texinfo
|
||||
|
|
@ -127,12 +125,17 @@ BuildRequires: pkgconfig(systemd)
|
|||
BuildRequires: util-linux
|
||||
%endif
|
||||
|
||||
%if "%{_lib}" == "lib64"
|
||||
%global marker ()(64bit)
|
||||
%endif
|
||||
|
||||
# Emacs doesn't run without a font, rhbz#732422
|
||||
Requires: google-noto-sans-mono-vf-fonts
|
||||
|
||||
Requires(preun): /usr/sbin/alternatives
|
||||
Requires(posttrans): /usr/sbin/alternatives
|
||||
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
||||
Requires: libpixbufloader-xpm.so%{?marker}
|
||||
Provides: emacs(bin) = %{epoch}:%{version}-%{release}
|
||||
Supplements: ((libwayland-server and emacs-common) unless emacs-nw)
|
||||
|
||||
|
|
@ -158,10 +161,11 @@ GTK toolkit.
|
|||
%if %{with gtkx11}
|
||||
%package gtk+x11
|
||||
Summary: GNU Emacs text editor with GTK toolkit X support
|
||||
Requires: libgccjit
|
||||
Requires: google-noto-sans-mono-vf-fonts
|
||||
Requires(preun): /usr/sbin/alternatives
|
||||
Requires(posttrans): /usr/sbin/alternatives
|
||||
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
||||
Requires: libpixbufloader-xpm.so%{?marker}
|
||||
Provides: emacs(bin) = %{epoch}:%{version}-%{release}
|
||||
Supplements: ((xorg-x11-server-Xorg and emacs-common) unless emacs-nw)
|
||||
|
||||
|
|
@ -171,7 +175,6 @@ This package provides an emacs-gtk+x11 binary with support for the X
|
|||
Window System, using the GTK toolkit.
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with lucid}
|
||||
%package lucid
|
||||
Summary: GNU Emacs text editor with Lucid toolkit X support
|
||||
|
|
@ -207,9 +210,7 @@ support, for running on a terminal only.
|
|||
|
||||
%package -n emacsclient
|
||||
Summary: Remotely control GNU Emacs
|
||||
|
||||
# This is a moving target whilst Fedora 40 is still receivng updates:
|
||||
Conflicts: emacs-common < %{epoch}:%{version}-%{release}
|
||||
Conflicts: emacs-common < 1:29.4-12
|
||||
|
||||
%description -n emacsclient
|
||||
%desc
|
||||
|
|
@ -260,7 +261,7 @@ emacs-lucid, or emacs-nw.
|
|||
|
||||
%package terminal
|
||||
Summary: A desktop menu item for GNU Emacs terminal.
|
||||
Requires: emacs = %{epoch}:%{version}-%{release}
|
||||
Requires: (emacs or emacs-gtk+x11 or emacs-lucid)
|
||||
BuildArch: noarch
|
||||
|
||||
%description terminal
|
||||
|
|
@ -618,32 +619,6 @@ find %{buildroot}%{_libdir}/ -name '*eln' -type f | xargs touch
|
|||
|
||||
|
||||
%check
|
||||
# A number of tests that don't work on GNU EMBA are also unstable when
|
||||
# run in Koji.
|
||||
export EMACS_EMBA_CI=1
|
||||
|
||||
cd build-pgtk
|
||||
%make_build check
|
||||
cd ..
|
||||
|
||||
%if %{with gtkx11}
|
||||
cd build-gtk+x11
|
||||
%make_build check
|
||||
cd ..
|
||||
%endif
|
||||
|
||||
%if %{with lucid}
|
||||
cd build-lucid
|
||||
%make_build check
|
||||
cd ..
|
||||
%endif
|
||||
|
||||
%if %{with nw}
|
||||
cd build-nw
|
||||
%make_build check
|
||||
cd ..
|
||||
%endif
|
||||
|
||||
appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml
|
||||
desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
|
||||
|
||||
|
|
@ -761,6 +736,7 @@ fi
|
|||
%{_datadir}/icons/hicolor/scalable/apps/emacs.svg
|
||||
%{_datadir}/icons/hicolor/scalable/apps/emacs.ico
|
||||
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
|
||||
%{_infodir}/elisp_type_hierarchy.*
|
||||
%{_mandir}/man1/ebrowse.1*
|
||||
%{_mandir}/man1/emacs.1*
|
||||
%{_mandir}/man1/etags.emacs.1*
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (emacs-29.4.tar.xz) = 66b38081cb01d2c46ff7beefb45986cc225b4c922c30712ad0d456c6cae5507176ed99418c8f26948c5375c8afde4e4b2507d23ed997dbb5392d12150a121d80
|
||||
SHA512 (emacs-29.4.tar.xz.sig) = 6c20269c260fb7f6d8b9b4582be25179a5adaaa1b9d94e68d55890f7b0b211dfd396c7005694b0154471ab3769f12e5067b8f4ec21720755d9087d89a8c722f6
|
||||
SHA512 (emacs-30.2.tar.xz) = 313432d11e95c74f8cd35c5b1da442e6223f5d40f9173c55883c0339ecbfb97a0bedf79177ef8902afd3e33c078a233777bed01f5caffa1e7524f17d58bfc9a2
|
||||
SHA512 (emacs-30.2.tar.xz.sig) = ab5b5d0624b37ac662cf9914e8807fc37ee273c107f1a19ca75a527b6b9a85ce35f9436d03d8a988876cce7e7bebcc6c4a1251b0ceb08785b56bf42743f246e1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue