Accepting request 621595 from home:AndreasSchwab:f

- xwidget.patch: Make xwidget-webkit-execute-script safe against GC
- Re-enable Xwidgets on 32bit architectures

OBS-URL: https://build.opensuse.org/request/show/621595
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=258
This commit is contained in:
2018-07-09 06:05:13 +00:00
committed by Git OBS Bridge
parent a106192f0f
commit 4c3bb02022
3 changed files with 173 additions and 6 deletions

View File

@@ -145,6 +145,7 @@ Patch23: emacs-25.1-custom-fonts.patch
# symlink
Patch24: emacs-25.2-ImageMagick7.patch
Patch25: emacs-26.1-xft4x11.patch
Patch26: xwidget.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)}
@@ -252,6 +253,7 @@ and most assembler-like syntaxes.
%patch23 -p0 -b .custfnt
%patch24 -p1 -b .imag
%patch25 -p0 -b .xft
%patch26 -p1
%patch -p0 -b .0
%build
@@ -393,13 +395,8 @@ DESKTOP="--with-x \
%if %{with cairo}
--with-cairo \
%endif
--with-xwidgets \
"
if (($(getconf LONG_BIT) >= 62))
then
# Does not compile on 32bit architecture due failing
# `verify (USE_LSB_TAG)' in src/xwidget.c
GTK="${GTK} --with-xwidgets"
fi
X11="${DESKTOP} \
--with-x-toolkit=lucid \
--with-toolkit-scroll-bars \