diff --git a/gtk4.changes b/gtk4.changes index 0a8196f..7b51bbe 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 14 14:28:41 UTC 2017 - fezhang@suse.com + +- Drop the SLE12 / Leap42 build_wayland_backend conditional, build + with wayland unconditionally. + ------------------------------------------------------------------- Wed Aug 9 08:47:30 UTC 2017 - zaitor@opensuse.org diff --git a/gtk4.spec b/gtk4.spec index 5f1af11..6943484 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -17,12 +17,6 @@ # -%if 0%{?suse_version} == 1315 -%define build_wayland_backend 0 -%else -%define build_wayland_backend 1 -%endif - # When updating the binary version, do not forget to also update baselibs.conf %define gtk_binary_version 4.0.0 @@ -63,6 +57,10 @@ BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(pango) >= 1.37.3 BuildRequires: pkgconfig(pangoft2) BuildRequires: pkgconfig(rest-0.7) +BuildRequires: pkgconfig(wayland-client) >= 1.9.91 +BuildRequires: pkgconfig(wayland-cursor) +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-protocols) >= 1.7 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcursor) @@ -71,14 +69,8 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) -BuildRequires: pkgconfig(xrandr) -%if %{build_wayland_backend} -BuildRequires: pkgconfig(wayland-client) >= 1.9.91 -BuildRequires: pkgconfig(wayland-cursor) -BuildRequires: pkgconfig(wayland-egl) -BuildRequires: pkgconfig(wayland-protocols) >= 1.7 BuildRequires: pkgconfig(xkbcommon) -%endif +BuildRequires: pkgconfig(xrandr) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -343,10 +335,8 @@ This package enhances gettext with an International Tag Set for GTK+ 4 --enable-x11-backend \ --enable-introspection \ --enable-broadway-backend \ -%if %{build_wayland_backend} --enable-wayland-backend \ --enable-explicit-deps=yes \ -%endif --enable-colord \ --enable-vulkan %{__make} %{?_smp_mflags} @@ -586,9 +576,7 @@ fi %{_libdir}/pkgconfig/gail-4.0.pc %{_libdir}/pkgconfig/gtk+-4.0.pc %{_libdir}/pkgconfig/gtk+-broadway-4.0.pc -%if %{build_wayland_backend} %{_libdir}/pkgconfig/gtk+-wayland-4.0.pc -%endif %{_libdir}/pkgconfig/gtk+-unix-print-4.0.pc %{_libdir}/pkgconfig/gtk+-x11-4.0.pc %{_libdir}/libgtk-4.so