commit 3fcebadb143c34f075fa91767c912f0d965884a2
Author: Jakub Bogusz <[email protected]>
Date: Fri Aug 23 17:17:13 2024 +0200
- avoid BC re2-devel, made check fail instead
qt5-qtwebengine.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 4e540e1..eb1c55c 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -1,8 +1,8 @@
#
# Conditional build:
%bcond_without doc # documentation
-%bcond_without system_libvpx # Build with system libvpx
-%bcond_with system_re2 # Build with system re2
+%bcond_without system_libvpx # system libvpx library
+%bcond_with system_re2 # system re2 library
%define base_version 5.15
@@ -98,6 +98,7 @@ BuildRequires: qt5-qttools
%{?with_system_re2:BuildRequires: re2-devel}
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 2.016
+BuildRequires: sed >= 4.0
BuildRequires: snappy-devel
BuildRequires: tar >= 1:1.22
BuildRequires: xorg-lib-libX11-devel
@@ -117,7 +118,6 @@ 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
@@ -298,6 +298,11 @@ Przykłady do biblioteki Qt5 WebEngine.
%endif
%patch7 -p1 -d src/3rdparty
+%if %{without system_re2}
+# avoid finding system re2
+%{__sed} -i -e '/pkgConfig.*re2/ s/re2/re2-disabled/'
src/buildtools/configure.json
+%endif
+
%{qt5bindir}/syncqt.pl -version %{version}
%build
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebengine.git/commitdiff/3fcebadb143c34f075fa91767c912f0d965884a2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
