Dr. Werner Fink 2016-09-21 06:46:26 +00:00 committed by Git OBS Bridge
parent dd060aaa31
commit ec97e04ae5
2 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 21 06:31:44 UTC 2016 - werner@suse.de
- Diable experimental cairo support as it cause trouble with spacemacs
as well as with the w3 mode
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 19 15:01:07 UTC 2016 - werner@suse.de Mon Sep 19 15:01:07 UTC 2016 - werner@suse.de

View File

@ -17,6 +17,8 @@
%bcond_with autoconf %bcond_with autoconf
# Experimental, not for production (see https://www.gnu.org/software/emacs/news/NEWS.25.1)
%bcond_with cairo
Name: emacs Name: emacs
BuildRequires: ImageMagick BuildRequires: ImageMagick
@ -26,7 +28,7 @@ BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
%endif %endif
BuildRequires: alsa-devel BuildRequires: alsa-devel
%if 0%{?suse_version} > 1130 %if %{with cairo} && 0%{?suse_version} > 1130
BuildRequires: cairo-devel BuildRequires: cairo-devel
%endif %endif
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel
@ -354,17 +356,15 @@ DESKTOP="--with-x \
GTK="${DESKTOP} \ GTK="${DESKTOP} \
%if 0%{?suse_version} > 1130 %if 0%{?suse_version} > 1130
--with-x-toolkit=gtk3 \ --with-x-toolkit=gtk3 \
--with-xwidgets \
%else %else
--with-x-toolkit=gtk2 \ --with-x-toolkit=gtk2 \
%endif
%if 0%{?suse_version} > 1320
--with-xwidgets \
%endif %endif
--x-includes=%{_x11inc} \ --x-includes=%{_x11inc} \
--x-libraries=%{_x11lib} \ --x-libraries=%{_x11lib} \
--with-libotf \ --with-libotf \
--with-m17n-flt \ --with-m17n-flt \
%if 0%{?suse_version} > 1130 %if %{with cairo} && 0%{?suse_version} > 1130
--with-cairo \ --with-cairo \
%endif %endif
" "