rpms/qt6-qtwebengine
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 6.7.0 [release 6.7.0-1mamba;Tue Apr 16 2024]

Browse Source
This commit is contained in:
Silvan Calarco 2024-04-25 14:41:38 +02:00
parent 5f44adde68
commit 78e418e716
5 changed files with 43 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qt6-qtwebengine-6.6.1-icu-74.patch
View File

@ -1,13 +0,0 @@
--- a/third_party/blink/renderer/platform/text/text_break_iterator.cc
+++ b/third_party/blink/renderer/platform/text/text_break_iterator.cc
@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar
};
// clang-format on
-#if U_ICU_VERSION_MAJOR_NUM >= 58
+#if U_ICU_VERSION_MAJOR_NUM >= 74
+#define BA_LB_COUNT (U_LB_COUNT - 8)
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
#define BA_LB_COUNT (U_LB_COUNT - 3)
#else
#define BA_LB_COUNT U_LB_COUNT

26
qt6-qtwebengine-6.6.1-libxml-2.12.patch
View File

@ -1,26 +0,0 @@
diff --git a/third_party/blink/renderer/core/xml/xslt_processor.h b/third_party/blink/renderer/core/xml/xslt_processor.h
index d53835e9675793..2eaea31ed29b90 100644
--- a/third_party/blink/renderer/core/xml/xslt_processor.h
+++ b/third_party/blink/renderer/core/xml/xslt_processor.h
@@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable {
void reset();
- static void ParseErrorFunc(void* user_data, xmlError*);
+ static void ParseErrorFunc(void* user_data, const xmlError*);
static void GenericErrorFunc(void* user_data, const char* msg, ...);
// Only for libXSLT callbacks
diff --git a/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc b/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
index 133e0b3355d2f0..f424077089da87 100644
--- a/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
+++ b/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
@@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) {
// It would be nice to do something with this error message.
}
-void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
FrameConsole* console = static_cast<FrameConsole*>(user_data);
if (!console)
return;

18
qt6-qtwebengine-6.7.0-ninja-1.12.0-2.patch Normal file
View File

@ -0,0 +1,18 @@
--- a/src/3rdparty/chromium/content/browser/BUILD.gn
+++ b/src/3rdparty/chromium/content/browser/BUILD.gn
@@ -198,2 +198,3 @@
"//components/services/storage/public/mojom",
+ "//components/spellcheck:buildflags",
"//components/sqlite_proto",
--- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
+++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
@@ -22,2 +22,3 @@
"//content/public/browser",
+ "//components/web_cache/public/mojom",
"//extensions/common",
--- a/src/3rdparty/chromium/ui/gl/gl_display.h
+++ b/src/3rdparty/chromium/ui/gl/gl_display.h
@@ -13,2 +13,3 @@
#include "ui/gl/gl_export.h"
+#include "ui/gl/gpu_preference.h"

10
qt6-qtwebengine-6.7.0-ninja-1.12.0.patch Normal file
View File

@ -0,0 +1,10 @@
--- qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/content/browser/BUILD.gn.orig 2024-04-21 14:43:28.953627475 +0200
+++ qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/content/browser/BUILD.gn 2024-04-21 14:44:11.839731449 +0200
@@ -45,6 +45,7 @@
deps = [
"//base",
+ "//components/spellcheck:buildflags",
"//content/browser/devtools:devtools_background_services_proto",
"//content/browser/devtools:protocol_sources",
"//content/common:buildflags",

28
qt6-qtwebengine.spec
View File

@ -1,6 +1,6 @@
%define majver %(echo %version | cut -d. -f1-2)
Name: qt6-qtwebengine
Version: 6.6.3
Version: 6.7.0
Release: 1mamba
Summary: Qt6 WebEngine component
Group: System/Libraries
@ -9,8 +9,8 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://www.qt.io/
Source: https://download.qt.io/official_releases/qt/%{majver}/%{version}/submodules/qtwebengine-everywhere-src-%{version}.tar.xz
Patch3: qt6-qtwebengine-6.6.1-libxml-2.12.patch
Patch4: qt6-qtwebengine-6.6.1-icu-74.patch
Patch0: qt6-qtwebengine-6.7.0-ninja-1.12.0.patch
Patch1: qt6-qtwebengine-6.7.0-ninja-1.12.0-2.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -25,6 +25,7 @@ BuildRequires: libXrender-devel
BuildRequires: libXtst-devel
BuildRequires: libabseil-cpp-devel
BuildRequires: libalsa-devel
BuildRequires: libatomic-devel
BuildRequires: libavcodec-ffmpeg-devel
BuildRequires: libavformat-ffmpeg-devel
BuildRequires: libavutil-ffmpeg-devel
@ -67,6 +68,7 @@ BuildRequires: qt6-qtpositioning-devel
BuildRequires: qt6-qttools-devel
BuildRequires: qt6-qtwebchannel-devel
## AUTOBUILDREQ-END
BuildRequires: libpipewire-devel
BuildRequires: qt6-qtdeclarative-devel = %{version}
BuildRequires: qt6-qttools-devel = %{version}
BuildRequires: python-html5lib-py3
@ -88,21 +90,18 @@ This package contains libraries and header files for developing applications tha
%global __spec_rmbuild_cmd /bin/true
%prep
%setup -q -n qtwebengine-everywhere-src-%{version}
#-D -T
#:<< _EOF
cd src/3rdparty/chromium
#%patch 3 -p1 -b .libxml-2.12
#%patch 4 -p1 -b .icu-74
cd ../../..
%setup -q -n qtwebengine-everywhere-src-%{version} -D -T
:<< _EOF
%patch 0 -p1
%patch 1 -p1
%build
#:<< _EOF
# Prevent build server slowness/crash due to memory
%ifarch arm
export NINJAFLAGS="-j1"
%ifarch aarch64
export NINJAFLAGS="-j4"
%else
export NINJAFLAGS="-j2"
export NINJAFLAGS="-j4"
%endif
%ifarch %{ix86} aarch64
@ -186,6 +185,9 @@ DESTDIR="%{buildroot}" cmake --install build
%{_libdir}/pkgconfig/Qt6*.pc
%changelog
* Tue Apr 16 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.7.0-1mamba
- update to 6.7.0
* Sun Mar 31 2024 Automatic Build System <autodist@openmamba.org> 6.6.3-1mamba
- automatic version update by autodist