pool/libqt5-qtwebengine
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1101255 from home:AndreasStieger:branches:network:chromium

Browse Source 
simplified way to specify the re2, to continue to build on Tumbleweed when re2 updates. See SR#1101246

OBS-URL: https://build.opensuse.org/request/show/1101255
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=54
This commit is contained in:
Christophe Marin 2023-07-28 20:41:43 +00:00 committed by Git OBS Bridge
parent 11ceefd5ba
commit a61af63291
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libqt5-qtwebengine.changes
View File

@ -1,7 +1,7 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 26 19:20:55 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de> Fri Jul 28 19:03:30 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
- build with bundled re2 on Tumbleweed, the upcoming re2 2023-07-01 - build with older re2 on Tumbleweed, the upcoming re2 2023-07-01
breaks qtwebengine breaks qtwebengine
------------------------------------------------------------------- -------------------------------------------------------------------

17
libqt5-qtwebengine.spec
View File

@ -25,11 +25,6 @@
%else %else
%bcond_without python3 %bcond_without python3
%endif %endif
%if 0%{?suse_version} < 1699
%bcond_without system_re2
%else
%bcond_with system_re2
%endif
# spellchecking dictionary directory # spellchecking dictionary directory
%global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries %global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
@ -176,6 +171,8 @@ BuildRequires: pkgconfig(pangocairo)
BuildRequires: pkgconfig(pangoft2) BuildRequires: pkgconfig(pangoft2)
BuildRequires: pkgconfig(poppler-cpp) BuildRequires: pkgconfig(poppler-cpp)
BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(protobuf)
# re2 >= 2023-07-01 breaks the build, use libre2-10-devel if needed
BuildRequires: pkgconfig(re2) <= 10.0.0
BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(vpx) >= 1.8.0 BuildRequires: pkgconfig(vpx) >= 1.8.0
@ -197,11 +194,6 @@ BuildRequires: yasm-devel
%requires_ge libQt5Network5 %requires_ge libQt5Network5
%requires_ge libQtQuick5 %requires_ge libQtQuick5
%requires_ge libQt5Widgets5 %requires_ge libQt5Widgets5
%if %{with system_re2}
BuildRequires: pkgconfig(re2)
# known to break with re2 2023-07
BuildConflicts: re2-devel >= 20230701
%endif
%description %description
Qt WebEngine provides functionality for rendering regions of dynamic Qt WebEngine provides functionality for rendering regions of dynamic
@ -356,11 +348,6 @@ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wno-return-type"
gn_args+="link_pulseaudio=true" \ gn_args+="link_pulseaudio=true" \
gn_args+="media_use_openh264=false" \ gn_args+="media_use_openh264=false" \
gn_args+="use_system_libxml=true use_system_libxslt=true" \ 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 -- \ qtwebengine.pro -- \
-webengine-alsa \ -webengine-alsa \
-no-webengine-embedded-build \ -no-webengine-embedded-build \