[packages/libinput] - allow building with gtk+3 even if gtk4 is installed
qboosh
qboosh at pld-linux.org
Wed Sep 29 21:39:20 CEST 2021
commit 30108c5d887e057680ca78b2ecafc2a6a354b033
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Sep 29 21:44:03 2021 +0200
- allow building with gtk+3 even if gtk4 is installed
libinput.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/libinput.spec b/libinput.spec
index 18e2367..d834f14 100644
--- a/libinput.spec
+++ b/libinput.spec
@@ -29,7 +29,9 @@ BuildRequires: meson >= 0.49.0
BuildRequires: mtdev-devel >= 1.1.0
BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig
+BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 1.752
+BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel
BuildRequires: valgrind
@@ -53,9 +55,6 @@ BuildRequires: python3-recommonmark
BuildRequires: python3-sphinx_rtd_theme
BuildRequires: sphinx-pdg-3
%endif
-%if %{with gui} && %{without gtk4}
-BuildConflicts: gtk4-devel
-%endif
Requires: libevdev >= 1.3
Requires: libwacom >= 0.20
Requires: mtdev >= 1.1.0
@@ -145,6 +144,10 @@ Dopełnianie parametrów w zsh dla polecenia libinput.
tools/libinput-measure-{fuzz,touchpad-pressure,touch-size,touchpad-tap}.py \
tools/libinput-{replay,measure-touchpad-size}.py
+%if %{without gtk4}
+%{__sed} -i -e "/dependency('gtk4'/ s/'gtk4'/'gtk4-disabled'/" meson.build
+%endif
+
%build
%meson build \
-Ddebug-gui=%{__true_false gui} \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libinput.git/commitdiff/30108c5d887e057680ca78b2ecafc2a6a354b033
More information about the pld-cvs-commit
mailing list