public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/emacs] rawhide: Update to pretest version 31.0.90
@ 2026-08-17 23:51 Peter Oliver
0 siblings, 0 replies; only message in thread
From: Peter Oliver @ 2026-08-17 23:51 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/emacs
Branch : rawhide
Commit : 9a21f1852145446cbc2e62321b6079bd1ecdaeeb
Author : Peter Oliver <git@mavit.org.uk>
Date : 2026-08-12T16:36:54+01:00
Stats : +14/-85 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/emacs/c/9a21f1852145446cbc2e62321b6079bd1ecdaeeb?branch=rawhide
Log:
Update to pretest version 31.0.90
- New configure option '--with-systemduserunitdir'.
- Emacs's old 'ctags' program is no longer built or installed.
---
diff --git a/.gitignore b/.gitignore
index 3aa373c..86befd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@
/emacs-30.1.tar.xz.sig
/emacs-30.2.tar.xz
/emacs-30.2.tar.xz.sig
+/emacs-31.0.90.tar.xz
+/emacs-31.0.90.tar.xz.sig
diff --git a/0001-Pong-and-Tetris-are-excluded.patch b/0001-Pong-and-Tetris-are-excluded.patch
index 989764a..fde3369 100644
--- a/0001-Pong-and-Tetris-are-excluded.patch
+++ b/0001-Pong-and-Tetris-are-excluded.patch
@@ -48,22 +48,22 @@ 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]
+ (define-key menu [zone]
'(menu-item "Zone Out" zone
:help "Play tricks with Emacs display when Emacs is idle"))
-- (bindings--define-key menu [tetris]
+- (define-key menu [tetris]
- '(menu-item "Tetris" tetris
- :help "Falling blocks game"))
- (bindings--define-key menu [solitaire]
+ (define-key menu [solitaire]
'(menu-item "Solitaire" solitaire
:help "Get rid of all the stones"))
- (bindings--define-key menu [snake]
+ (define-key menu [snake]
'(menu-item "Snake" snake
:help "Move snake around avoiding collisions"))
-- (bindings--define-key menu [pong]
+- (define-key menu [pong]
- '(menu-item "Pong" pong
- :help "Bounce the ball to your opponent"))
- (bindings--define-key menu [mult]
+ (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
diff --git a/0001-src-image.c-svg_load_image-Fix-off-by-one-mistake-bu.patch b/0001-src-image.c-svg_load_image-Fix-off-by-one-mistake-bu.patch
deleted file mode 100644
index b3e2e2b..0000000
--- a/0001-src-image.c-svg_load_image-Fix-off-by-one-mistake-bu.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8f535370b9efbc91673b20c6987a5cae4f6dc562 Mon Sep 17 00:00:00 2001
-From: Eli Zaretskii <eliz@gnu.org>
-Date: Sat, 18 Apr 2026 10:35:05 +0300
-Subject: [PATCH] * src/image.c (svg_load_image): Fix off-by-one mistake
- (bug#80851).
-
----
- src/image.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/image.c b/src/image.c
-index b5b7de3351f..d98c63f06c6 100644
---- a/src/image.c
-+++ b/src/image.c
-@@ -12052,7 +12052,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
- {
- css = xmalloc (SBYTES (lcss) + 1);
- strncpy (css, SSDATA (lcss), SBYTES (lcss));
-- *(css + SBYTES (lcss) + 1) = 0;
-+ *(css + SBYTES (lcss)) = 0;
- }
- #endif
-
---
-2.53.0
-
diff --git a/emacs-libdir-vs-systemd.patch b/emacs-libdir-vs-systemd.patch
deleted file mode 100644
index 32f6a83..0000000
--- a/emacs-libdir-vs-systemd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a56539c1d7ef7aa56e575685bdfe1406aebb518d Mon Sep 17 00:00:00 2001
-From: Peter Oliver <git@mavit.org.uk>
-Date: Wed, 5 Feb 2020 12:42:04 +0000
-Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20assemble=20systemdunitdir=20fro?=
- =?UTF-8?q?m=20`libdir`?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On 64 bit Fedora, `libdir` is `/usr/lib64`, whereas systemd services
-live under `/usr/lib/systemd`.
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 2c82c49fba..b2468eb824 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -208,7 +208,7 @@ appdatadir=
- # Other options include ~/.config/systemd/user/,
- # $XDG_RUNTIME_DIR/systemd/user/
- # It seems the user may end up having to make a manual link...
--systemdunitdir=$(libdir)/systemd/user
-+systemdunitdir=$(shell pkg-config --variable=systemduserunitdir systemd)
-
- # Where the etc/images/icons/hicolor directory is to be installed.
- icondir=$(datarootdir)/icons
---
-2.24.1
-
diff --git a/emacs.spec b/emacs.spec
index f37b5a3..f834762 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -8,7 +8,7 @@
Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
-Version: 30.2
+Version: 31.0.90
Release: %autorelease
License: GPL-3.0-or-later AND CC0-1.0
URL: https://www.gnu.org/software/emacs/
@@ -56,10 +56,6 @@ Patch: emacs-spellchecker.patch
Patch: emacs-system-crypto-policies.patch
-# causes a dependency on pkgconfig(systemd)
-# => remove it if we stop using this patch
-Patch: emacs-libdir-vs-systemd.patch
-
# Hint what to do to avoid using the pure GTK build on X11, where it is
# unsupported:
Patch: emacs-pgtk-on-x-error-message.patch
@@ -74,15 +70,6 @@ Patch: 0002-Fall-back-to-the-terminal-from-pure-GTK-when-no-disp.patch
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=49505#67
Patch: 0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch
-# CVE-2026-6861
-# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=80851
-# https://bugzilla.redhat.com/show_bug.cgi?id=2460586
-Patch: 0001-src-image.c-svg_load_image-Fix-off-by-one-mistake-bu.patch
-
-# Nullify 'read-symbol-shorthands' around risky 'intern' calls.
-# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=80574#227
-Patch: 0001-Mitigate-arbitrary-code-execution-vulnerability.patch
-
BuildRequires: alsa-lib-devel
BuildRequires: atk-devel
BuildRequires: autoconf
@@ -118,6 +105,7 @@ BuildRequires: make
BuildRequires: ncurses-devel
BuildRequires: sqlite-devel
BuildRequires: systemd-devel
+BuildRequires: systemd-rpm-macros
BuildRequires: texinfo
BuildRequires: zlib-devel
@@ -146,9 +134,6 @@ BuildRequires: xorg-x11-proto-devel
BuildRequires: Xaw3d-devel
%endif
-# for Patch3
-BuildRequires: pkgconfig(systemd)
-
%ifarch %{ix86}
BuildRequires: util-linux
%endif
@@ -397,6 +382,7 @@ cd build-lucid
--with-png \
--with-rsvg \
--with-sqlite3 \
+ --with-systemduserunitdir=%{_userunitdir} \
--with-tiff \
--with-tree-sitter \
--with-webp \
@@ -419,6 +405,7 @@ cd build-nw
--with-modules \
--with-native-compilation=aot \
--with-sqlite3 \
+ --with-systemduserunitdir=%{_userunitdir} \
--with-tree-sitter \
%if %{without gpm}
--with-gpm=no \
@@ -447,6 +434,7 @@ cd build-gtk+x11
--with-png \
--with-rsvg \
--with-sqlite3 \
+ --with-systemduserunitdir=%{_userunitdir} \
--with-tiff \
--with-tree-sitter \
--with-webp \
@@ -475,6 +463,7 @@ cd build-pgtk
--with-png \
--with-rsvg \
--with-sqlite3 \
+ --with-systemduserunitdir=%{_userunitdir} \
--with-tiff \
--with-tree-sitter \
--with-webp \
@@ -593,9 +582,6 @@ install -p -m 0644 %SOURCE6 %{buildroot}%{site_lisp}
install -p -m 0644 00-dynamic-module-dir.el %{buildroot}%{site_start_d}/
install -p -m 0644 10-source-directory.el %{buildroot}%{site_start_d}/
-mv %{buildroot}%{_mandir}/man1/{ctags.1.gz,gctags.1.gz}
-mv %{buildroot}%{_bindir}/{ctags,gctags}
-
# Default initialization file
mkdir -p %{buildroot}%{_sysconfdir}/skel
install -p -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/skel/.emacs
@@ -830,7 +816,6 @@ fi
%doc build-pgtk/doc/NEWS build-pgtk/BUGS build-pgtk/README
%{_bindir}/ebrowse
%{_bindir}/etags
-%{_bindir}/gctags
%{_datadir}/applications/emacs.desktop
%{_datadir}/applications/emacs-mail.desktop
%{_metainfodir}/%{name}.metainfo.xml
@@ -842,7 +827,6 @@ fi
%{_mandir}/man1/ebrowse.1*
%{_mandir}/man1/emacs.1*
%{_mandir}/man1/etags.1*
-%{_mandir}/man1/gctags.1*
%dir %{_datadir}/emacs/%{version}
%{_datadir}/emacs/%{version}/etc
%{_datadir}/emacs/%{version}/site-lisp
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-17 23:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-17 23:51 [rpms/emacs] rawhide: Update to pretest version 31.0.90 Peter Oliver
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox