[packages/recoll] webengine/webkit bconds

atler atler at pld-linux.org
Thu Jan 21 11:56:15 CET 2021


commit 633fb8b0d5972af72d6909c9bc9a8cc65a462416
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Jan 21 11:48:48 2021 +0100

    webengine/webkit bconds

 recoll.spec | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/recoll.spec b/recoll.spec
index c1c98cd..5154eed 100644
--- a/recoll.spec
+++ b/recoll.spec
@@ -1,7 +1,22 @@
 #
 # Conditional build:
-%bcond_without	qt	# without Qt GUI
-%bcond_without	x11	# without X11 session monitoring
+%bcond_without	qt		# without Qt GUI
+%bcond_without	webengine	# without Qt WebEngine support
+%bcond_with	webkit		# with Qt WebKit instead Qt WebEngine
+%bcond_without	x11		# without X11 session monitoring
+
+%ifarch x32
+%undefine	with_webengine
+%endif
+
+%if %{with webkit}
+%undefine	with_webengine
+%endif
+
+%if %{without qt}
+%undefine	with_webengine
+%undefine	with_webkit
+%endif
 
 Summary:	Desktop full-text search tool
 Name:		recoll
@@ -27,7 +42,8 @@ BuildRequires:	zlib-devel
 BuildRequires:	Qt5Core-devel
 BuildRequires:	Qt5Gui-devel
 BuildRequires:	Qt5PrintSupport-devel
-BuildRequires:	Qt5WebEngine-devel
+%{?with_webengine:BuildRequires:	Qt5WebEngine-devel}
+%{?with_webkit:BuildRequires:	Qt5WebKit-devel}
 BuildRequires:	Qt5Widgets-devel
 BuildRequires:	Qt5Xml-devel
 BuildRequires:	qt5-qmake
@@ -64,7 +80,8 @@ grep -rl '#!.*env python' -l filters | xargs %{__sed} -i -e '1s,#!.*env python3$
 	--disable-python-module \
 	--enable-recollq \
 	--with-fam=no \
-	%{?with_qt:--enable-webengine} \
+	%{?with_webengine:--enable-webengine} \
+	%{!?with_webkit:--disable-webkit} \
 	%{!?with_qt:--disable-qtgui} \
 	%{!?with_x11:--disable-x11mon}
 %{__make} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/recoll.git/commitdiff/633fb8b0d5972af72d6909c9bc9a8cc65a462416



More information about the pld-cvs-commit mailing list