rpm/qt6-webengine
SHA256
1
0
Fork 0
forked from pool/qt6-webengine
Code Pull Requests Activity

Qt 6.3.1

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-webengine?expand=0&rev=14
This commit is contained in:
Christophe Giboudeaux 2022-06-19 17:48:41 +00:00 committed by Git OBS Bridge
parent 2062c034e8
commit 5fd236fbc5
6 changed files with 24 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0001-Find-GIO-with-QtBase-6.2.patch
View File

@ -1,41 +0,0 @@
From 7c112f5c613cfc8a93ca3d85ccdab7a38b82a3c3 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 3 Feb 2022 15:03:22 +0100
Subject: [PATCH] Find GIO with QtBase 6.2
GLIB2 doesn't find GIO with Qt 6.2, so try adding a fallback.
Pick-to: 6.3
Task-number: QTBUG-100435
Change-Id: Ic98a7aea07b726dc4f6e76a65669ca92b1916b5c
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
---
src/core/api/configure.cmake | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake
index 231eaa8d2..a9dd9eb09 100644
--- a/src/core/api/configure.cmake
+++ b/src/core/api/configure.cmake
@@ -8,6 +8,9 @@ if(NOT QT_CONFIGURE_RUNNING)
pkg_check_modules(ALSA alsa IMPORTED_TARGET)
pkg_check_modules(PULSEAUDIO libpulse>=0.9.10 libpulse-mainloop-glib)
pkg_check_modules(XDAMAGE xdamage)
+ if(NOT GIO_FOUND)
+ pkg_check_modules(GIO gio-2.0)
+ endif()
endif()
find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET
@@ -111,7 +114,7 @@ qt_feature("webengine-webrtc-pipewire" PRIVATE
LABEL "PipeWire over GIO"
PURPOSE "Provides PipeWire support in WebRTC using GIO."
AUTODETECT false
- CONDITION QT_FEATURE_webengine_webrtc AND TARGET GLIB2::GIO
+ CONDITION QT_FEATURE_webengine_webrtc AND GIO_FOUND
)
qt_feature("webengine-full-debug-info" PRIVATE
SECTION "WebEngine"
--
2.35.1

9
qt6-webengine.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jun 17 15:15:46 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 6.3.1:
* https://www.qt.io/blog/qt-6.3.1-released
- Drop patches, now upstream:
* qtwebengine-icu70.patch
* 0001-Find-GIO-with-QtBase-6.2.patch
-------------------------------------------------------------------
Fri Apr 8 11:57:03 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

17
qt6-webengine.spec
View File

@ -16,7 +16,7 @@
#
%define real_version 6.3.0
%define real_version 6.3.1
%define short_version 6.3
%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.3.0
Version: 6.3.1
Release: 0
Summary: Web browser engine for Qt applications
License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
@ -50,8 +50,6 @@ URL: https://www.qt.io
Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
Source99: qt6-webengine-rpmlintrc
# Patches 0-100 are upstream patches #
Patch0: qtwebengine-icu70.patch
Patch1: 0001-Find-GIO-with-QtBase-6.2.patch
# Patches 100-200 are openSUSE and/or non-upstream(able) patches #
Patch100: rtc-dont-use-h264.patch
# PATCH-FIX-OPENSUSE -- disable-gpu-when-using-nouveau-boo-1005323.diff
@ -67,6 +65,7 @@ BuildRequires: Mesa-KHR-devel
BuildRequires: bison
# Not pulled automatically on Leap
BuildRequires: cups-config
BuildRequires: cups-devel
BuildRequires: flex
BuildRequires: gperf
BuildRequires: krb5-devel
@ -269,9 +268,9 @@ Summary: Development files for the Qt 6 WebEngineCore library
Requires: libQt6WebEngineCore6 = %{version}
Requires: cmake(Qt6Gui)
Requires: cmake(Qt6Network)
Requires: cmake(Qt6Positioning)
Requires: cmake(Qt6Quick)
Requires: cmake(Qt6WebChannel)
Requires: cmake(Qt6Positioning)
%description -n qt6-webenginecore-devel
Development files for the Qt 6 WebEngineCore library.
@ -358,6 +357,7 @@ export NINJAFLAGS="%{?_smp_mflags}"
-DFEATURE_webengine_developer_build:BOOL=OFF \
-DFEATURE_webengine_embedded_build:BOOL=OFF \
-DFEATURE_webengine_extensions:BOOL=ON \
-DFEATURE_webengine_printing_and_pdf:BOOL=ON \
-DFEATURE_webengine_kerberos:BOOL=ON \
-DFEATURE_webengine_native_spellchecker:BOOL=OFF \
-DFEATURE_webengine_system_libevent:BOOL=ON \
@ -425,6 +425,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
%{_qt6_libdir}/libQt6Pdf.so
%{_qt6_metatypesdir}/qt6pdf_*_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_lib_pdf.pri
%{_qt6_pkgconfigdir}/Qt6Pdf.pc
%exclude %{_qt6_includedir}/QtPdf/%{real_version}
%files -n qt6-pdf-private-devel
@ -442,6 +443,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
%{_qt6_libdir}/libQt6PdfQuick.so
%{_qt6_metatypesdir}/qt6pdfquick_*_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_lib_pdfquick.pri
%{_qt6_pkgconfigdir}/Qt6PdfQuick.pc
%exclude %{_qt6_includedir}/QtPdfQuick/%{real_version}
%files -n qt6-pdfquick-private-devel
@ -459,6 +461,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
%{_qt6_libdir}/libQt6PdfWidgets.so
%{_qt6_metatypesdir}/qt6pdfwidgets_*_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_lib_pdfwidgets.pri
%{_qt6_pkgconfigdir}/Qt6PdfWidgets.pc
%exclude %{_qt6_includedir}/QtPdfWidgets/%{real_version}
%files -n qt6-pdfwidgets-private-devel
@ -486,6 +489,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
%{_qt6_libexecdir}/qwebengine_convert_dict
%{_qt6_metatypesdir}/qt6webenginecore_*_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_lib_webenginecore.pri
%{_qt6_pkgconfigdir}/Qt6WebEngineCore.pc
%exclude %{_qt6_includedir}/QtWebEngineCore/%{real_version}
%files -n qt6-webenginecore-private-devel
@ -510,6 +514,8 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
%{_qt6_metatypesdir}/qt6webenginequickdelegatesqml_*_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_lib_webenginequick.pri
%{_qt6_mkspecsdir}/modules/qt_lib_webenginequickdelegatesqml.pri
%{_qt6_pkgconfigdir}/Qt6WebEngineQuick.pc
%{_qt6_pkgconfigdir}/Qt6WebEngineQuickDelegatesQml.pc
%exclude %{_qt6_includedir}/QtWebEngineQuick/%{real_version}
%files -n qt6-webenginequick-private-devel
@ -528,6 +534,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
%{_qt6_libdir}/libQt6WebEngineWidgets.so
%{_qt6_metatypesdir}/qt6webenginewidgets_*_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_lib_webenginewidgets.pri
%{_qt6_pkgconfigdir}/Qt6WebEngineWidgets.pc
%exclude %{_qt6_includedir}/QtWebEngineWidgets/%{real_version}
%files -n qt6-webenginewidgets-private-devel

3
qtwebengine-everywhere-src-6.3.0.tar.xz
View File

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

3
qtwebengine-everywhere-src-6.3.1.tar.xz Normal file
View File

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

33
qtwebengine-icu70.patch
View File

@ -1,33 +0,0 @@
From 75f0f4eb1e4f2823c39fe27137f78ac2c10bc293 Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Thu, 31 Mar 2022 19:45:39 +0200
Subject: [PATCH] [FIXUP] Fix compilation with system ICU
As of chromium 92.0.4480.0 after a set of fixes ending with a
https://chromium-review.googlesource.com/c/chromium/src/+/2830820
the need to override UCHAR_TYPE was dropped with the result that
codebase is ready for default 'char16_t'. Override was already dropped
for 98-based, which already builds fine for system ICU 70.1
Task-number: QTBUG-100495
Change-Id: I0e6d422f77b77015840647b52247f51736dd8a41
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
diff --git a/src/3rdparty/chromium/third_party/icu/BUILD.gn b/src/3rdparty/chromium/third_party/icu/BUILD.gn
index d5b1361..269de02 100644
--- a/src/3rdparty/chromium/third_party/icu/BUILD.gn
+++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn
@@ -410,12 +410,6 @@
"USING_SYSTEM_ICU=1",
"ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
]
-
- if (is_win) {
- defines += [ "UCHAR_TYPE=wchar_t" ]
- } else {
- defines += [ "UCHAR_TYPE=uint16_t" ]
- }
}
if (use_system_icu) {