Accepting request 1165812 from KDE:Qt6

Qt 6.7.0. qtwebengine is still building (forwarded request 1164304 from krop)

OBS-URL: https://build.opensuse.org/request/show/1165812
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-webengine?expand=0&rev=30
This commit is contained in:
Ana Guerrero 2024-04-08 15:38:05 +00:00 committed by Git OBS Bridge
commit 5fa1814e3e
5 changed files with 26 additions and 11 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Apr 2 13:40:04 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 6.7.0:
* https://www.qt.io/blog/qt-6.7-released
- Update rtc-dont-use-h264.patch
-------------------------------------------------------------------
Tue Mar 26 14:27:18 UTC 2024 - Christophe Marin <christophe@krop.fr>

View File

@ -16,8 +16,8 @@
#
%define real_version 6.6.3
%define short_version 6.6
%define real_version 6.7.0
%define short_version 6.7
%define tar_name qtwebengine-everywhere-src
%define tar_suffix %{nil}
#
@ -37,7 +37,7 @@
%bcond_without system_tiff
%endif
Name: qt6-webengine%{?pkg_suffix}
Version: 6.6.3
Version: 6.7.0
Release: 0
Summary: Web browser engine for Qt applications
License: GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-only
@ -50,7 +50,7 @@ Patch100: rtc-dont-use-h264.patch
#
# Chromium/blink don't support PowerPC and zSystems and build fails on
# 32 bits archs (https://bugreports.qt.io/browse/QTBUG-102143)
ExclusiveArch: aarch64 x86_64 riscv64
ExclusiveArch: aarch64 x86_64 %x86_64 riscv64
BuildRequires: Mesa-KHR-devel
BuildRequires: bison
# Not pulled automatically on Leap
@ -297,6 +297,7 @@ Requires: libQt6WebEngineQuick6 = %{version}
Requires: cmake(Qt6Gui) = %{real_version}
Requires: cmake(Qt6Qml) = %{real_version}
Requires: cmake(Qt6Quick) = %{real_version}
Requires: cmake(Qt6WebChannelQuick) = %{real_version}
Requires: cmake(Qt6WebEngineCore) = %{real_version}
%description -n qt6-webenginequick-devel
@ -406,6 +407,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
%{_qt6_datadir}/resources/
%{_qt6_translationsdir}/qtwebengine_locales/
%{_qt6_libexecdir}/QtWebEngineProcess
%{_qt6_libexecdir}/webenginedriver
%{_qt6_pluginsdir}/designer/libqwebengineview.so
%files imports

BIN
qtwebengine-everywhere-src-6.6.3.tar.xz (Stored with Git LFS)

Binary file not shown.

View File

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

View File

@ -1,17 +1,23 @@
From: Fabian Vogt <fabian@ritter-vogt.de>
Subject: Don't require open264 when proprietary_codecs are supported
diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/chromium/third_party/webrtc/webrtc.gni
index ca8acdbf259..36897a72aa8 100644
Amended on 2024-01-30: also disable h265
diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
index 5a1c43c8888..d867f7e5330 100644
--- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
+++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
@@ -151,8 +151,7 @@ declare_args() {
@@ -186,11 +186,10 @@ declare_args() {
#
# Enabling H264 when building with MSVC is currently not supported, see
# bugs.webrtc.org/9213#c13 for more info.
- rtc_use_h264 =
- proprietary_codecs && !is_android && !is_ios && !(is_win && !is_clang)
+ rtc_use_h264 = false
# Enable to use H265
- rtc_use_h265 = proprietary_codecs
+ rtc_use_h265 = false
# Enable this flag to make webrtc::Mutex be implemented by absl::Mutex.
rtc_use_absl_mutex = false