From 8f058b1c852ffb3d8fdc11419b29246f48811095 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 15 Jul 2022 15:47:10 +0800 Subject: [PATCH 1/2] copy not move SOURCE3 (cdef.h) into tree --- emacs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs.spec b/emacs.spec index 5b117a0..086bb92 100644 --- a/emacs.spec +++ b/emacs.spec @@ -194,7 +194,7 @@ Development header files for Emacs. %setup -q # workaround for ftbfs on ppc64, see https://bugzilla.redhat.com/show_bug.cgi?id=2045780#c8 -mv %{SOURCE3} lib/ +cp -p %{SOURCE3} lib/ %patch1 -p1 -b .spellchecker %patch2 -p1 -b .system-crypto-policies From 29b8e9dec8352b2d72ef513e51fa061b34a731a5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 15 Jul 2022 15:47:58 +0800 Subject: [PATCH 2/2] drop --with-xft for gtk3 toolkit build It should be deprecated now by Cairo rendering with the new native pgtk in 28 See current build.log eg https://koji.fedoraproject.org/koji/buildinfo?buildID=2001145: Does Emacs use cairo? yes : Does Emacs use -lfreetype? yes Does Emacs use HarfBuzz? yes Does Emacs use -lm17n-flt? yes Does Emacs use -lotf? yes Does Emacs use -lxft? no --- emacs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs.spec b/emacs.spec index 086bb92..6b5fb53 100644 --- a/emacs.spec +++ b/emacs.spec @@ -272,7 +272,7 @@ 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=gtk3 --with-gpm=no \ + --with-tiff --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \ --with-xwidgets --with-modules --with-harfbuzz --with-cairo --with-json \ --with-native-compilation %{setarch} %make_build bootstrap NATIVE_FULL_AOT=1