[packages/qt5-qtwebengine] add system_re2 bcond (disabled by default)

atler atler at pld-linux.org
Sun May 26 18:57:13 CEST 2024


commit 75d057cfb00d5c6fabbf6bcc6afa845e2c0050c1
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun May 26 18:42:19 2024 +0200

    add system_re2 bcond (disabled by default)
    
    adapting to re2 >= 20230601 alone is relatively trivial however
    re2 >= 20230601 requires c++17 to which adapting old chromium is not
    trivial.

 qt5-qtwebengine.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 34b867c..8fbb040 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_without	doc		# documentation
 %bcond_without	system_libvpx	# Build with system libvpx
+%bcond_with	system_re2	# Build with system re2
 
 %define		base_version	5.15
 
@@ -93,7 +94,7 @@ BuildRequires:	qt5-build >= 5.15
 BuildRequires:	qt5-qmake >= 5.15
 BuildRequires:	qt5-qtdoc
 BuildRequires:	qt5-qttools
-BuildRequires:	re2-devel
+%{?with_system_re2:BuildRequires:	re2-devel}
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 2.016
 BuildRequires:	snappy-devel
@@ -115,6 +116,7 @@ BuildRequires:	xorg-proto-glproto-devel
 BuildRequires:	xz
 BuildRequires:	zlib-devel
 BuildConflicts:	Qt5WebEngine-devel
+%{!?with_system_re2:BuildConflicts:	re2-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebengine.git/commitdiff/7fc303baf7b49efc901a7d1e61a260c164f7282a



More information about the pld-cvs-commit mailing list