Accepting request 1101048 from home:AndreasStieger:branches:KDE:Qt:5.15
- build with bundled re2 on Tumbleweed, the upcoming re2 2023-07-01 breaks qtwebengine OBS-URL: https://build.opensuse.org/request/show/1101048 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=53
This commit is contained in:
parent
8436340ff0
commit
11ceefd5ba
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 26 19:20:55 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- build with bundled re2 on Tumbleweed, the upcoming re2 2023-07-01
|
||||
breaks qtwebengine
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 25 15:01:57 UTC 2023 - christophe@krop.fr
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libqt5-qtwebengine
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -25,6 +25,11 @@
|
||||
%else
|
||||
%bcond_without python3
|
||||
%endif
|
||||
%if 0%{?suse_version} < 1699
|
||||
%bcond_without system_re2
|
||||
%else
|
||||
%bcond_with system_re2
|
||||
%endif
|
||||
|
||||
# spellchecking dictionary directory
|
||||
%global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
|
||||
@ -171,7 +176,6 @@ BuildRequires: pkgconfig(pangocairo)
|
||||
BuildRequires: pkgconfig(pangoft2)
|
||||
BuildRequires: pkgconfig(poppler-cpp)
|
||||
BuildRequires: pkgconfig(protobuf)
|
||||
BuildRequires: pkgconfig(re2)
|
||||
BuildRequires: pkgconfig(speex)
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
BuildRequires: pkgconfig(vpx) >= 1.8.0
|
||||
@ -193,6 +197,11 @@ BuildRequires: yasm-devel
|
||||
%requires_ge libQt5Network5
|
||||
%requires_ge libQtQuick5
|
||||
%requires_ge libQt5Widgets5
|
||||
%if %{with system_re2}
|
||||
BuildRequires: pkgconfig(re2)
|
||||
# known to break with re2 2023-07
|
||||
BuildConflicts: re2-devel >= 20230701
|
||||
%endif
|
||||
|
||||
%description
|
||||
Qt WebEngine provides functionality for rendering regions of dynamic
|
||||
@ -347,6 +356,11 @@ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wno-return-type"
|
||||
gn_args+="link_pulseaudio=true" \
|
||||
gn_args+="media_use_openh264=false" \
|
||||
gn_args+="use_system_libxml=true use_system_libxslt=true" \
|
||||
%if %{with system_re2}
|
||||
gn_args+="use_system_re2=true" \
|
||||
%else
|
||||
gn_args+="use_system_re2=false" \
|
||||
%endif
|
||||
qtwebengine.pro -- \
|
||||
-webengine-alsa \
|
||||
-no-webengine-embedded-build \
|
||||
|
Loading…
Reference in New Issue
Block a user