From 9ca27fec4e6e7c09d505f3d42964466ee146ce678707b1f5db380e9afe7c65dc Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 20 Sep 2016 08:29:04 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=206
---
 emacs.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/emacs.spec b/emacs.spec
index 9bd1def..bc67f37 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -307,7 +307,7 @@ VERSION=%{version}
     SYS="--build=%{_target_cpu}-suse-%{_build_os}
 "
 %endif
- CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE"
+ CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATION_WARNINGS -DGLIB_DISABLE_DEPRECATION_WARNINGS"
 LDFLAGS=
   cflags -pipe                   CFLAGS
   cflags -Wno-pointer-sign       CFLAGS
@@ -346,18 +346,20 @@ DESKTOP="--with-x \
 	 --with-png \
 	 --with-rsvg \
 	 --with-dbus \
+	 --with-xft \
 	 --without-gpm \
 "
     GTK="${DESKTOP} \
 %if 0%{?suse_version} > 1130
 	 --with-x-toolkit=gtk3 \
-	 --with-xwidgets \
 %else
 	 --with-x-toolkit=gtk2 \
+%endif
+%if 0%{?suse_version} > 1320
+	 --with-xwidgets \
 %endif
 	 --x-includes=%{_x11inc} \
 	 --x-libraries=%{_x11lib} \
-	 --with-xft \
 	 --with-libotf \
 	 --with-m17n-flt \
 	 --with-cairo \
@@ -366,7 +368,6 @@ DESKTOP="--with-x \
 	 --with-x-toolkit=lucid \
 	 --x-includes=%{_x11inc} \
 	 --x-libraries=%{_x11lib}:%{_x11data} \
-	 --with-xft \
 	 --without-libotf \
 	 --without-m17n-flt \
 "