rpms/gtk3
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove wayland conditionals

Browse Source 
RHEL 7.5 and later now have wayland.
This commit is contained in:
Kalev Lember 2018-05-03 14:02:13 +02:00
parent 36e8943241
commit f613256065
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk3.spec
View File

@ -1,5 +1,4 @@
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora}
%global with_wayland 1
%global with_broadway 1 %global with_broadway 1
%endif %endif
@ -55,14 +54,12 @@ BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(colord)
BuildRequires: pkgconfig(avahi-gobject) BuildRequires: pkgconfig(avahi-gobject)
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
%if 0%{?with_wayland}
BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(wayland-client) >= %{wayland_version} BuildRequires: pkgconfig(wayland-client) >= %{wayland_version}
BuildRequires: pkgconfig(wayland-cursor) >= %{wayland_version} BuildRequires: pkgconfig(wayland-cursor) >= %{wayland_version}
BuildRequires: pkgconfig(wayland-egl) >= %{wayland_version} BuildRequires: pkgconfig(wayland-egl) >= %{wayland_version}
BuildRequires: pkgconfig(wayland-protocols) >= %{wayland_protocols_version} BuildRequires: pkgconfig(wayland-protocols) >= %{wayland_protocols_version}
BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xkbcommon)
%endif
# standard icons # standard icons
Requires: adwaita-icon-theme Requires: adwaita-icon-theme
@ -78,10 +75,8 @@ Requires: glib2%{?_isa} >= %{glib2_version}
Requires: libepoxy%{?_isa} >= %{epoxy_version} Requires: libepoxy%{?_isa} >= %{epoxy_version}
Requires: libXrandr%{?_isa} >= %{xrandr_version} Requires: libXrandr%{?_isa} >= %{xrandr_version}
Requires: pango%{?_isa} >= %{pango_version} Requires: pango%{?_isa} >= %{pango_version}
%if 0%{?with_wayland}
Requires: libwayland-client%{?_isa} >= %{wayland_version} Requires: libwayland-client%{?_isa} >= %{wayland_version}
Requires: libwayland-cursor%{?_isa} >= %{wayland_version} Requires: libwayland-cursor%{?_isa} >= %{wayland_version}
%endif
# required to support all the different image formats # required to support all the different image formats
Requires: gdk-pixbuf2-modules%{?_isa} Requires: gdk-pixbuf2-modules%{?_isa}
@ -179,9 +174,7 @@ export CFLAGS='-fno-strict-aliasing %optflags'
--enable-xcomposite \ --enable-xcomposite \
--enable-xdamage \ --enable-xdamage \
--enable-x11-backend \ --enable-x11-backend \
%if 0%{?with_wayland}
--enable-wayland-backend \ --enable-wayland-backend \
%endif
%if 0%{?with_broadway} %if 0%{?with_broadway}
--enable-broadway-backend \ --enable-broadway-backend \
%endif %endif