From c7bc479b642f0b8f81d115a273c3432cfe6e9fe0 Mon Sep 17 00:00:00 2001 From: xiaoji <345865759@163.com> Date: Thu, 26 Mar 2026 14:53:26 +0800 Subject: [PATCH] drop xwidgets/webkit support, it was broken for a long time --- emacs.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/emacs.spec b/emacs.spec index 1301c68..e32d9e6 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,7 +4,7 @@ Summary: An extensible, customizable, free/libre text editor — and more. Name: emacs Epoch: 1 Version: 29.1 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv3+ and CC0 URL: http://www.gnu.org/software/emacs/ Source0: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz @@ -48,7 +48,7 @@ BuildRequires: glibc-devel, gnutls-devel, libselinux-devel, systemd-devel, gnupg %if %{with gui_and_doc} # gui -BuildRequires: Xaw3d-devel, libXpm-devel, libpng-devel, zlib-devel, libjpeg-turbo-devel, libjpeg-turbo, libtiff-devel, giflib-devel, librsvg2-devel, libwebp-devel, libX11-devel, atk-devel, cairo-devel, freetype-devel, fontconfig-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel, xorg-x11-proto-devel, gpm-devel, desktop-file-utils, liblockfile-devel, libxml2-devel, cairo, libappstream-glib, gtk3-devel, webkit2gtk3-devel, dbus-devel +BuildRequires: Xaw3d-devel, libXpm-devel, libpng-devel, zlib-devel, libjpeg-turbo-devel, libjpeg-turbo, libtiff-devel, giflib-devel, librsvg2-devel, libwebp-devel, libX11-devel, atk-devel, cairo-devel, freetype-devel, fontconfig-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel, xorg-x11-proto-devel, gpm-devel, desktop-file-utils, liblockfile-devel, libxml2-devel, cairo, libappstream-glib, gtk3-devel, dbus-devel # sound BuildRequires: alsa-lib-devel # document tools @@ -191,7 +191,7 @@ mkdir build-gtk && cd build-gtk ln -s ../configure . %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg\ --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \ - --with-xwidgets --with-modules --with-harfbuzz --with-cairo --with-json #mailutils-devel + --with-modules --with-harfbuzz --with-cairo --with-json #mailutils-devel %make_build rm src/emacs-%{version}.* cd .. @@ -431,6 +431,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %{_includedir}/emacs-module.h %changelog +* Thu Mar 26 2026 Zhao Zhen - 1:29.1-14 +- [Type] sync +- [DESC] drop webkit2gtk3-devel BuildRequires and --with-xwidgets +- xwidgets/webkit is broken since webkitgtk >= 2.41 and webkit2gtk-4.0 +- (libsoup2) has been removed in webkitgtk 2.52.0 + * Mon Apr 14 2025 Cunlong Li - 1:29.1-13 - [Type] security - [DESC] fix CVE-2024-53920 -- Gitee