automatic version update by autodist [release 6.6.1-1mamba;Sat Dec 09 2023]
This commit is contained in:
parent
3d565494f0
commit
4f20813d6e
13
qt6-qtwebengine-6.6.1-icu-74.patch
Normal file
13
qt6-qtwebengine-6.6.1-icu-74.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- 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
Normal file
26
qt6-qtwebengine-6.6.1-libxml-2.12.patch
Normal file
@ -0,0 +1,26 @@
|
||||
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;
|
@ -1,6 +1,6 @@
|
||||
%define majver %(echo %version | cut -d. -f1-2)
|
||||
Name: qt6-qtwebengine
|
||||
Version: 6.6.0
|
||||
Version: 6.6.1
|
||||
Release: 1mamba
|
||||
Summary: Qt6 WebEngine component
|
||||
Group: System/Libraries
|
||||
@ -12,6 +12,8 @@ Source: https://download.qt.io/official_releases/qt/%{majver}/%{version}/
|
||||
Patch0: qt6-qtwebengine-6.2.3-ffmpeg-5.0.patch
|
||||
Patch1: qt6-qtwebengine-6.3.0-icu-71.1.patch
|
||||
Patch2: qt6-qtwebengine-6.5.3-fix-build.patch
|
||||
Patch3: qt6-qtwebengine-6.6.1-libxml-2.12.patch
|
||||
Patch4: qt6-qtwebengine-6.6.1-icu-74.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@ -49,6 +51,7 @@ BuildRequires: libopenjpeg-devel
|
||||
BuildRequires: libopus-devel
|
||||
BuildRequires: libpci-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libre2-devel
|
||||
BuildRequires: libsnappy-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: libtiff-devel
|
||||
@ -56,7 +59,9 @@ BuildRequires: libwebp-devel
|
||||
BuildRequires: libxcb-devel
|
||||
BuildRequires: libxkbcommon-devel
|
||||
BuildRequires: libxkbfile-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libxshmfence-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: libz-devel
|
||||
BuildRequires: qt6-qtbase-devel
|
||||
BuildRequires: qt6-qtdeclarative-devel
|
||||
@ -86,11 +91,14 @@ This package contains libraries and header files for developing applications tha
|
||||
|
||||
%prep
|
||||
%setup -q -n qtwebengine-everywhere-src-%{version} -D -T
|
||||
#:<< _EOF
|
||||
:<< _EOF
|
||||
#cd src/3rdparty
|
||||
#%patch0 -p1 -b .ffmpeg-5.0
|
||||
#%patch1 -p1 -b .icu-71.1
|
||||
#cd ../..
|
||||
cd src/3rdparty/chromium
|
||||
%patch 3 -p1 -b .libxml-2.12
|
||||
%patch 4 -p1 -b .icu-74
|
||||
cd ../../..
|
||||
#%patch 2 -p1 -b .fix-build
|
||||
|
||||
%build
|
||||
@ -116,8 +124,7 @@ export CXXFLAGS+="%{optflags} -fPIC -fno-delete-null-pointer-checks -fno-lifetim
|
||||
-DQT_FEATURE_webengine_proprietary_codecs=ON \
|
||||
-DQT_FEATURE_webengine_kerberos=ON \
|
||||
-DQT_FEATURE_webengine_webrtc_pipewire=ON \
|
||||
-DQT_FEATURE_webengine_full_debug_info=ON \
|
||||
-DQT_FEATURE_webengine_system_re2=OFF
|
||||
-DQT_FEATURE_webengine_full_debug_info=ON
|
||||
|
||||
# 6.5.3: not using system_re2 due to compilation errors
|
||||
|
||||
@ -184,6 +191,9 @@ DESTDIR="%{buildroot}" cmake --install build
|
||||
%{_libdir}/pkgconfig/Qt6*.pc
|
||||
|
||||
%changelog
|
||||
* Sat Dec 09 2023 Automatic Build System <autodist@mambasoft.it> 6.6.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Tue Oct 17 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 6.6.0-1mamba
|
||||
- update to 6.6.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user