diff --git a/emacs-terminal.desktop b/emacs-terminal.desktop index 3c12470b9f1eacfd21ff2cde18392fb5aabbb908..07b9aed9c5e95645398f95ae39746ae0a0b35083 100644 --- a/emacs-terminal.desktop +++ b/emacs-terminal.desktop @@ -6,6 +6,5 @@ Exec=emacs-terminal Icon=utilities-terminal Type=Application Terminal=false -Categories=Application;Utility;X-Red-Hat-Base;GTK;TerminalEmulator; -Encoding=UTF-8 +Categories=Utility;GTK;TerminalEmulator; StartupWMClass=Emacs diff --git a/emacs.spec b/emacs.spec index f88c3572b220fbd5e27b3c9c5eae846f0829ec4c..b36bc5adbe062ebfceace2c82296cacf29ee27a9 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global _hardened_build 1 # This file is encoded in UTF-8. -*- coding: utf-8 -*- @@ -62,7 +62,7 @@ BuildRequires: jansson-devel BuildRequires: systemd-devel BuildRequires: libgccjit-devel BuildRequires: gtk3-devel -BuildRequires: webkit2gtk3-devel +BuildRequires: pkgconfig(webkit2gtk-4.1) >= 2.12 BuildRequires: gnupg2 BuildRequires: Xaw3d-devel BuildRequires: make @@ -214,8 +214,6 @@ export CFLAGS="-DMAIL_USE_LOCKF %{build_cflags}" mkdir build-lucid && cd build-lucid ln -s ../configure . -LDFLAGS=-Wl,-z,relro; export LDFLAGS; - %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \ --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \ --with-modules --with-harfbuzz --with-cairo --with-json \ @@ -413,7 +411,6 @@ find %{buildroot}%{_libdir}/ -name '*eln' -type f | xargs touch %check appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml -desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %preun %{_sbindir}/alternatives --remove emacs %{_bindir}/emacs-%{version} || : @@ -511,6 +508,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %{_includedir}/emacs-module.h %changelog +* Sun Nov 12 2023 Funda Wang - 29.1-2 +- Build with webkit2gtk-4.1 + * Thu Aug 24 2023 happy_orange - 1:29.1-1 - update to 29.1 to fix the CVE-2023-27985 and CVE-2022-45939