Accepting request 1070629 from KDE:Qt:5.15

- Use gcc12 for openSUSE:Factory as workaround for boo#1207469.

We would like to reach gcc13 to Factory soon and this package is one
of the last blockers as we're still waiting for an upstream fix. (forwarded request 1070359 from marxin)

OBS-URL: https://build.opensuse.org/request/show/1070629
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=87
This commit is contained in:
Dominique Leuenberger 2023-03-11 17:23:22 +00:00 committed by Git OBS Bridge
commit 2706f5a2e8
8 changed files with 64 additions and 34 deletions

View File

@ -7,8 +7,7 @@ Those includes got introduced upstream for other reasons and fixed building
with GCC 12 as a side effect. with GCC 12 as a side effect.
--- ---
src/3rdparty/chromium/third_party/skia/include/core/SkColor.h | 2 ++ src/3rdparty/chromium/third_party/skia/include/core/SkColor.h | 2 ++
src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp | 2 ++ 1 file changed, 2 insertions(+)
2 files changed, 4 insertions(+)
diff --git a/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h b/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h diff --git a/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h b/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
index 36527e38e53..f77c24ade82 100644 index 36527e38e53..f77c24ade82 100644
@ -23,19 +22,6 @@ index 36527e38e53..f77c24ade82 100644
/** \file SkColor.h /** \file SkColor.h
Types, consts, functions, and macros for colors. Types, consts, functions, and macros for colors.
diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
index 7260365b2c6..3164650728e 100644
--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
@@ -8,6 +8,8 @@
#include "include/utils/SkParse.h"
+#include <algorithm> // std::lower_bound
+
static constexpr const char* gColorNames[] = {
"aliceblue",
"antiquewhite",
-- --
2.34.1 2.34.1

View File

@ -1,11 +1,11 @@
<services> <services>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>
<param name="version">5.15.12</param> <param name="version">5.15.13</param>
<param name="url">git://code.qt.io/qt/qtwebengine.git</param> <param name="url">git://code.qt.io/qt/qtwebengine.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="filename">qtwebengine-everywhere-src</param> <param name="filename">qtwebengine-everywhere-src</param>
<param name="revision">v5.15.12-lts</param> <param name="revision">v5.15.13-lts</param>
</service> </service>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="changesgenerate">disable</param> <param name="changesgenerate">disable</param>

View File

@ -1,4 +1,4 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">git://code.qt.io/qt/qtwebengine.git</param> <param name="url">git://code.qt.io/qt/qtwebengine.git</param>
<param name="changesrevision">4ea03a0affbfd6ff36a7defd391b7ca139d18c8e</param></service></servicedata> <param name="changesrevision">a3ca44e5b92c5a0dc7d90337c651c9bdb838ac93</param></service></servicedata>

BIN
catapult-git.tar.xz (Stored with Git LFS)

Binary file not shown.

View File

@ -1,3 +1,46 @@
-------------------------------------------------------------------
Thu Mar 09 10:11:11 UTC 2023 - christophe@krop.fr
- Update to version 5.15.13:
* Force to disable IPC logging
* Move out GetInProcessGpuShareGroup form content browser client
* Fix probabilistic signature scheme
* Bump version to 5.15.13
* Recreate response head objects on multiple redirect
* Add checksum to mailbox name in Release build too
* Drop dependency on content/public/browser in content gpu
* FIXUP: Mark Node::opcode() and Operator::opcode()
as constexpr
* [Backport] Add missing include for std::begin and std::end
in SkParseColor.cpp
* [Backport] CVE-2022-4179: Use after free in Audio
* [Backport] CVE-2022-4437: Use after free in Mojo IPC
* [Backport] CVE-2022-4438: Use after free in Blink Frames
* [Backport] CVE-2023-0129: Heap buffer overflow in
Network Service
* [Backport] CVE-2023-0472: Use after free in WebRTC
* [Backport] CVE-2023-0698: Out of bounds read in WebRTC
* [Backport] CVE-2023-0931: Use after free in Video
* [Backport] CVE-2023-0933: Integer overflow in PDF
* [Backport] Disable ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
for clang-cl
* [Backport] Fix more clang deprecated builtins
* [Backport] Map the absl::is_trivially_* functions to their
std impl
* [Backport] Mark Node::opcode() and Operator::opcode()
as constexpr
* [Backport] Security bug 1393384
* [Backport] Security bug 1394382
* [Backport] Security bug 1399424
* [Backport] Security bug 1406115
* [Backport][Windows] Remove unused sidestep intercepts
- Update 0001-skia-Some-includes-to-fix-build-with-GCC-12.patch
-------------------------------------------------------------------
Thu Mar 9 08:51:39 UTC 2023 - Martin Liška <mliska@suse.cz>
- Use gcc12 for openSUSE:Factory as workaround for boo#1207469.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 29 15:26:07 UTC 2022 - christophe@krop.fr Thu Dec 29 15:26:07 UTC 2022 - christophe@krop.fr

View File

@ -16,11 +16,6 @@
# #
%if %{?suse_version} > 1500 || 0%{?sle_version} > 150300
%bcond_without system_vpx
%else
%bcond_with system_vpx
%endif
%bcond_without system_ffmpeg %bcond_without system_ffmpeg
%bcond_without system_minizip %bcond_without system_minizip
%bcond_without pipewire %bcond_without pipewire
@ -35,18 +30,18 @@
%global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries %global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
Name: libqt5-qtwebengine Name: libqt5-qtwebengine
Version: 5.15.12 Version: 5.15.13
Release: 0 Release: 0
Summary: Qt 5 WebEngine Library Summary: Qt 5 WebEngine Library
License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
Group: Development/Libraries/X11 Group: Development/Libraries/X11
URL: https://www.qt.io URL: https://www.qt.io
%define base_name libqt5 %define base_name libqt5
%define real_version 5.15.12 %define real_version 5.15.13
%define so_version 5.15.12 %define so_version 5.15.13
%define tar_version qtwebengine-everywhere-src-%{version} %define tar_version qtwebengine-everywhere-src-%{version}
Source: %{tar_version}.tar.xz Source: %{tar_version}.tar.xz
# Use a git snapshot for catapult to build with python3 (git rev: b7e9d5899) # Use a git snapshot for catapult to build with python3 (git rev: 2da767c6)
Source1: catapult-git.tar.xz Source1: catapult-git.tar.xz
Source99: libqt5-qtwebengine-rpmlintrc Source99: libqt5-qtwebengine-rpmlintrc
# PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6 # PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6
@ -76,6 +71,9 @@ BuildRequires: fdupes
BuildRequires: flac-devel BuildRequires: flac-devel
BuildRequires: flex BuildRequires: flex
BuildRequires: git-core BuildRequires: git-core
%if 0%{?suse_version} >= 1550
BuildRequires: gcc12-c++
%endif
BuildRequires: gperf BuildRequires: gperf
BuildRequires: krb5 BuildRequires: krb5
BuildRequires: krb5-devel BuildRequires: krb5-devel
@ -177,9 +175,7 @@ BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(re2) BuildRequires: pkgconfig(re2)
BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(sqlite3)
%if %{with system_vpx}
BuildRequires: pkgconfig(vpx) >= 1.8.0 BuildRequires: pkgconfig(vpx) >= 1.8.0
%endif
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xcursor)
@ -348,6 +344,11 @@ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wno-return-type"
%qmake5 QMAKE_CFLAGS="$RPM_OPT_FLAGS" \ %qmake5 QMAKE_CFLAGS="$RPM_OPT_FLAGS" \
QMAKE_CXXFLAGS="$RPM_OPT_FLAGS" \ QMAKE_CXXFLAGS="$RPM_OPT_FLAGS" \
QMAKE_LFLAGS+="-Wl,--no-keep-memory -Wl,--hash-size=31 -Wl,--reduce-memory-overheads" \ QMAKE_LFLAGS+="-Wl,--no-keep-memory -Wl,--hash-size=31 -Wl,--reduce-memory-overheads" \
%if 0%{?suse_version} >= 1550
QMAKE_CC=gcc-12 \
QMAKE_CXX=g++-12 \
QMAKE_LINK=g++-12 \
%endif
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" \

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5813bdab2577bbbc5067d6260ca0f7ec74a7e44fdc3afd2c6d6a1f6b2d5aa493
size 320695640

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:86517e95c8b1c4faf75df94ac57e9c0fc6d045c181ffd23e340e55e8b841dc5b
size 320727336