Accepting request 526163 from home:zhangxiaofei:branches:GNOME:Factory

- Drop the SLE12 / Leap42 build_wayland_backend conditional, build
  with wayland unconditionally.

OBS-URL: https://build.opensuse.org/request/show/526163
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2017-09-15 09:30:36 +00:00 committed by Git OBS Bridge
parent 0b01333b7f
commit 8aacbac8c6
2 changed files with 11 additions and 17 deletions

View File

@ -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

View File

@ -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