Accepting request 965415 from KDE:Qt6

Qt 6.2.4 (forwarded request 965385 from cgiboudeaux)

OBS-URL: https://build.opensuse.org/request/show/965415
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-webengine?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2022-03-29 16:14:48 +00:00 committed by Git OBS Bridge
commit 4278480ac9
5 changed files with 14 additions and 62 deletions

View File

@ -1,53 +0,0 @@
Define FSEAL for Leap 15.2
Origin: chromium package
--
--- a/src/3rdparty/chromium/mojo/core/channel_linux.cc.xx 2021-04-26 10:31:10.188705842 +0200
+++ b/src/3rdparty/chromium/mojo/core/channel_linux.cc 2021-04-26 11:23:26.997161282 +0200
@@ -5,6 +5,21 @@
#include "mojo/core/channel_linux.h"
#include <fcntl.h>
+#ifndef F_SEAL_SEAL
+# define F_SEAL_SEAL 0x0001
+#endif
+#ifndef F_SEAL_SHRINK
+# define F_SEAL_SHRINK 0x0002
+#endif
+#ifndef F_SEAL_GROW
+# define F_SEAL_GROW 0x0004
+#endif
+#ifndef F_ADD_SEALS
+# define F_ADD_SEALS 1033
+#endif
+#ifndef F_GET_SEALS
+# define F_GET_SEALS 1034
+#endif
#include <linux/futex.h>
#include <linux/memfd.h>
#include <sys/eventfd.h>
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.xx 2021-04-26 16:39:18.387482941 +0200
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2021-04-26 16:40:10.866754337 +0200
@@ -6,6 +6,21 @@
#include <errno.h>
#include <fcntl.h>
+#ifndef F_SEAL_SEAL
+# define F_SEAL_SEAL 0x0001
+#endif
+#ifndef F_SEAL_SHRINK
+# define F_SEAL_SHRINK 0x0002
+#endif
+#ifndef F_SEAL_GROW
+# define F_SEAL_GROW 0x0004
+#endif
+#ifndef F_ADD_SEALS
+# define F_ADD_SEALS 1033
+#endif
+#ifndef F_GET_SEALS
+# define F_GET_SEALS 1034
+#endif
#include <linux/net.h>
#include <sched.h>
#include <signal.h>

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Mar 21 08:46:39 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 6.2.4
* https://www.qt.io/blog/qt-6.2.4-released
- Drop chromium-90-fseal.patch. Not needed anymore.
-------------------------------------------------------------------
Mon Jan 31 08:55:03 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -1,7 +1,7 @@
#
# spec file for package qt6-webengine
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,7 +16,7 @@
#
%define real_version 6.2.3
%define real_version 6.2.4
%define short_version 6.2
%define tar_name qtwebengine-everywhere-src
%define tar_suffix %{nil}
@ -42,7 +42,7 @@
%bcond_without system_minizip
#
Name: qt6-webengine%{?pkg_suffix}
Version: 6.2.3
Version: 6.2.4
Release: 0
Summary: Web browser engine for Qt applications
License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
@ -55,12 +55,10 @@ Patch100: rtc-dont-use-h264.patch
Patch101: sandbox-statx-futex_time64.patch
# PATCH-FIX-UPSTREAM
Patch102: 0001-Fix-build-with-glibc-2.34.patch
# PATCH-FIX-OPENSUSE -- Needed for leap 15.2
Patch103: chromium-90-fseal.patch
# PATCH-FIX-OPENSUSE -- disable-gpu-when-using-nouveau-boo-1005323.diff
# PATCH-NEEDS-REBASE
%if 0
Patch104: disable-gpu-when-using-nouveau-boo-1005323.diff
Patch103: disable-gpu-when-using-nouveau-boo-1005323.diff
%endif
#
# Chromium/blink don't support all archs

View File

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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e3e96b7a0335b1f683fecf8863ff2930b1bed4df00ce2ff064fa26d0a49e2b1
size 369689936