update to 5.15.7 [release 5.15.7-1mamba;Fri Dec 24 2021]
This commit is contained in:
parent
0380b72582
commit
9f19b52f04
16
qt5-qtwebengine-5.15.7-SIOCGSTAMP.patch
Normal file
16
qt5-qtwebengine-5.15.7-SIOCGSTAMP.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
|
||||
index c38d7fdfa..0a8b0fd8b 100644
|
||||
--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
|
||||
+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
|
||||
@@ -72,6 +72,11 @@ typedef void* SockOptArg;
|
||||
|
||||
#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
|
||||
|
||||
+// Seems that kernel 5.2.0 renames this define to SIOCGSTAMP_OLD
|
||||
+#ifndef SIOCGSTAMP
|
||||
+#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
|
||||
+#endif
|
||||
+
|
||||
int64_t GetSocketRecvTimestamp(int socket) {
|
||||
struct timeval tv_ioctl;
|
||||
int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl);
|
||||
12
qt5-qtwebengine-5.15.7-aarch64-new-stat.patch
Normal file
12
qt5-qtwebengine-5.15.7-aarch64-new-stat.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up qtwebengine-everywhere-src-5.11.3/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h.aarch64-new-stat qtwebengine-everywhere-src-5.11.3/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
|
||||
--- qtwebengine-everywhere-src-5.11.3/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h.aarch64-new-stat 2018-11-19 12:55:45.000000000 -0600
|
||||
+++ qtwebengine-everywhere-src-5.11.3/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h 2018-12-08 21:16:39.931896244 -0600
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
|
||||
#define SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
|
||||
|
||||
+#define __ARCH_WANT_NEW_STAT
|
||||
+
|
||||
#include <asm-generic/unistd.h>
|
||||
|
||||
#if !defined(__NR_io_setup)
|
||||
72
qt5-qtwebengine-5.15.7-chromium-glibc-2.34-breakpad.patch
Normal file
72
qt5-qtwebengine-5.15.7-chromium-glibc-2.34-breakpad.patch
Normal file
@ -0,0 +1,72 @@
|
||||
From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Wed, 4 Aug 2021 19:11:06 +0200
|
||||
Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34
|
||||
|
||||
* fixes:
|
||||
[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o
|
||||
FAILED: obj/third_party/breakpad/client/exception_handler.o
|
||||
/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o
|
||||
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()':
|
||||
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)'
|
||||
141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||
| ~~~~~~~~^~~~~~~~~~~~~~~~~
|
||||
In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
|
||||
from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
|
||||
from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
|
||||
from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
|
||||
../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)'
|
||||
254 | max(const _Tp& __a, const _Tp& __b)
|
||||
| ^~~
|
||||
../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed:
|
||||
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
|
||||
141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||
| ~~~~~~~~^~~~~~~~~~~~~~~~~
|
||||
In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
|
||||
from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
|
||||
from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
|
||||
from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
|
||||
../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)'
|
||||
300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
|
||||
| ^~~
|
||||
../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed:
|
||||
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
|
||||
141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||
| ~~~~~~~~^~~~~~~~~~~~~~~~~
|
||||
In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
|
||||
from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
|
||||
../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)'
|
||||
3461 | max(initializer_list<_Tp> __l)
|
||||
| ^~~
|
||||
../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed:
|
||||
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int'
|
||||
141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||
| ~~~~~~~~^~~~~~~~~~~~~~~~~
|
||||
In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
|
||||
from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
|
||||
../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)'
|
||||
3467 | max(initializer_list<_Tp> __l, _Compare __comp)
|
||||
| ^~~
|
||||
../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed:
|
||||
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int'
|
||||
141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||
| ~~~~~~~~^~~~~~~~~~~~~~~~~
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
.../breakpad/src/client/linux/handler/exception_handler.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
index ca353c40997..2e43ba6fc04 100644
|
||||
--- a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
|
||||
// SIGSTKSZ may be too small to prevent the signal handlers from overrunning
|
||||
// the alternative stack. Ensure that the size of the alternative stack is
|
||||
// large enough.
|
||||
- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||
+ static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ);
|
||||
|
||||
// Only set an alternative stack if there isn't already one, or if the current
|
||||
// one is too small.
|
||||
13
qt5-qtwebengine-5.15.7-chromium-glibc-2.34.patch
Normal file
13
qt5-qtwebengine-5.15.7-chromium-glibc-2.34.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc b/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
|
||||
index 5d13bdbbbd1..150a43f2660 100644
|
||||
--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
|
||||
+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
|
||||
@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
|
||||
#else
|
||||
const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
|
||||
#endif
|
||||
- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
|
||||
+ size_t stack_size = (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
|
||||
#if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
|
||||
defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
|
||||
// Account for sanitizer instrumentation requiring additional stack space.
|
||||
1771
qt5-qtwebengine-5.15.7-chromium-python3.patch
Normal file
1771
qt5-qtwebengine-5.15.7-chromium-python3.patch
Normal file
File diff suppressed because it is too large
Load Diff
33
qt5-qtwebengine-5.15.7-no-icudtl-dat.patch
Normal file
33
qt5-qtwebengine-5.15.7-no-icudtl-dat.patch
Normal file
@ -0,0 +1,33 @@
|
||||
diff -up qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp.no-icudtl-dat qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp
|
||||
--- qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp.no-icudtl-dat 2021-06-24 07:26:58.976486102 -0500
|
||||
+++ qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp 2021-06-24 07:32:19.272863523 -0500
|
||||
@@ -273,7 +273,6 @@ QString dictionariesPath()
|
||||
|
||||
QString resourcesDataPath()
|
||||
{
|
||||
- static bool initialized = false;
|
||||
static QString potentialResourcesPath =
|
||||
#if defined(OS_MAC) && defined(QT_MAC_FRAMEWORK_BUILD)
|
||||
getResourcesPath(frameworkBundle());
|
||||
@@ -282,21 +281,6 @@ QString resourcesDataPath()
|
||||
#else
|
||||
QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources");
|
||||
#endif
|
||||
- if (!initialized) {
|
||||
- initialized = true;
|
||||
- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
|
||||
- qWarning("Qt WebEngine resources not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath));
|
||||
- potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath);
|
||||
- }
|
||||
- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
|
||||
- qWarning("Qt WebEngine resources not found at %s. Trying application directory...", qPrintable(potentialResourcesPath));
|
||||
- potentialResourcesPath = QCoreApplication::applicationDirPath();
|
||||
- }
|
||||
- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
|
||||
- qWarning("Qt WebEngine resources not found at %s. Trying fallback directory... The application MAY NOT work.", qPrintable(potentialResourcesPath));
|
||||
- potentialResourcesPath = fallbackDir();
|
||||
- }
|
||||
- }
|
||||
|
||||
return potentialResourcesPath;
|
||||
}
|
||||
150
qt5-qtwebengine-5.15.7-python3.patch
Normal file
150
qt5-qtwebengine-5.15.7-python3.patch
Normal file
@ -0,0 +1,150 @@
|
||||
diff --git a/configure.pri b/configure.pri
|
||||
index e072961f..5efe30bc 100644
|
||||
--- a/configure.pri
|
||||
+++ b/configure.pri
|
||||
@@ -12,10 +12,6 @@ defineTest(isPythonVersionSupported) {
|
||||
python_version ~= s/[()]//g
|
||||
python_version = $$split(python_version, ',')
|
||||
python_major_version = $$first(python_version)
|
||||
- greaterThan(python_major_version, 2) {
|
||||
- qtLog("Python version 3 is not supported by Chromium.")
|
||||
- return(false)
|
||||
- }
|
||||
python_minor_version = $$member(python_version, 1)
|
||||
python_patch_version = $$member(python_version, 2)
|
||||
greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): greaterThan(python_patch_version, 4): return(true)
|
||||
@@ -52,10 +48,10 @@ defineTest(qtConfReport_jumboBuild) {
|
||||
qtConfReportPadded($${1}, $$mergeLimit)
|
||||
}
|
||||
|
||||
-defineTest(qtConfTest_detectPython2) {
|
||||
- python = $$qtConfFindInPath("python2$$EXE_SUFFIX")
|
||||
+defineTest(qtConfTest_detectPython) {
|
||||
+ python = $$qtConfFindInPath("python$$EXE_SUFFIX")
|
||||
isEmpty(python) {
|
||||
- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.")
|
||||
+ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.")
|
||||
python = $$qtConfFindInPath("python$$EXE_SUFFIX")
|
||||
}
|
||||
isEmpty(python) {
|
||||
@@ -63,11 +59,11 @@ defineTest(qtConfTest_detectPython2) {
|
||||
return(false)
|
||||
}
|
||||
!isPythonVersionSupported($$python) {
|
||||
- qtLog("A suitable Python 2 executable could not be located.")
|
||||
+ qtLog("A suitable Python executable could not be located.")
|
||||
return(false)
|
||||
}
|
||||
|
||||
- # Make tests.python2.location available in configure.json.
|
||||
+ # Make tests.python.location available in configure.json.
|
||||
$${1}.location = $$clean_path($$python)
|
||||
export($${1}.location)
|
||||
$${1}.cache += location
|
||||
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
|
||||
index 2750d707..9fda13d0 100644
|
||||
--- a/mkspecs/features/functions.prf
|
||||
+++ b/mkspecs/features/functions.prf
|
||||
@@ -39,11 +39,11 @@ defineReplace(which) {
|
||||
|
||||
# Returns the unquoted path to the python executable.
|
||||
defineReplace(pythonPath) {
|
||||
- isEmpty(QMAKE_PYTHON2) {
|
||||
+ isEmpty(QMAKE_PYTHON) {
|
||||
# Fallback for building QtWebEngine with Qt < 5.8
|
||||
- QMAKE_PYTHON2 = python
|
||||
+ QMAKE_PYTHON = python
|
||||
}
|
||||
- return($$QMAKE_PYTHON2)
|
||||
+ return($$QMAKE_PYTHON)
|
||||
}
|
||||
|
||||
# Returns the python executable for use with shell / make targets.
|
||||
diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
|
||||
index e7f869a1..1bf2c5d7 100644
|
||||
--- a/src/buildtools/config/support.pri
|
||||
+++ b/src/buildtools/config/support.pri
|
||||
@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) {
|
||||
!qtwebengine_checkForGperf(QtWebEngine):return(false)
|
||||
!qtwebengine_checkForBison(QtWebEngine):return(false)
|
||||
!qtwebengine_checkForFlex(QtWebEngine):return(false)
|
||||
- !qtwebengine_checkForPython2(QtWebEngine):return(false)
|
||||
+ !qtwebengine_checkForPython(QtWebEngine):return(false)
|
||||
!qtwebengine_checkForNodejs(QtWebEngine):return(false)
|
||||
!qtwebengine_checkForSanitizer(QtWebEngine):return(false)
|
||||
linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false)
|
||||
@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) {
|
||||
!qtwebengine_checkForGperf(QtPdf):return(false)
|
||||
!qtwebengine_checkForBison(QtPdf):return(false)
|
||||
!qtwebengine_checkForFlex(QtPdf):return(false)
|
||||
- !qtwebengine_checkForPython2(QtPdf):return(false)
|
||||
+ !qtwebengine_checkForPython(QtPdf):return(false)
|
||||
!qtwebengine_checkForSanitizer(QtPdf):return(false)
|
||||
linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false)
|
||||
linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false)
|
||||
@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) {
|
||||
return(true)
|
||||
}
|
||||
|
||||
-defineTest(qtwebengine_checkForPython2) {
|
||||
+defineTest(qtwebengine_checkForPython) {
|
||||
module = $$1
|
||||
- !qtConfig(webengine-python2) {
|
||||
- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.")
|
||||
+ !qtConfig(webengine-python) {
|
||||
+ qtwebengine_skipBuild("Python is required to build $${module}.")
|
||||
return(false)
|
||||
}
|
||||
return(true)
|
||||
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
|
||||
index 88d1790c..032aa665 100644
|
||||
--- a/src/buildtools/configure.json
|
||||
+++ b/src/buildtools/configure.json
|
||||
@@ -295,9 +295,9 @@
|
||||
"label": "system ninja",
|
||||
"type": "detectNinja"
|
||||
},
|
||||
- "webengine-python2": {
|
||||
- "label": "python2",
|
||||
- "type": "detectPython2",
|
||||
+ "webengine-python": {
|
||||
+ "label": "python",
|
||||
+ "type": "detectPython",
|
||||
"log": "location"
|
||||
},
|
||||
"webengine-winversion": {
|
||||
@@ -374,7 +374,7 @@
|
||||
&& features.webengine-gperf
|
||||
&& features.webengine-bison
|
||||
&& features.webengine-flex
|
||||
- && features.webengine-python2
|
||||
+ && features.webengine-python
|
||||
&& features.webengine-nodejs
|
||||
&& (!config.sanitizer || features.webengine-sanitizer)
|
||||
&& (!config.linux || features.pkg-config)
|
||||
@@ -400,7 +400,7 @@
|
||||
&& features.webengine-gperf
|
||||
&& features.webengine-bison
|
||||
&& features.webengine-flex
|
||||
- && features.webengine-python2
|
||||
+ && features.webengine-python
|
||||
&& (!config.sanitizer || features.webengine-sanitizer)
|
||||
&& (!config.linux || features.pkg-config)
|
||||
&& (!config.linux || features.webengine-host-pkg-config)
|
||||
@@ -423,12 +423,12 @@
|
||||
"autoDetect": "features.private_tests",
|
||||
"output": [ "privateFeature" ]
|
||||
},
|
||||
- "webengine-python2": {
|
||||
- "label": "python2",
|
||||
- "condition": "tests.webengine-python2",
|
||||
+ "webengine-python": {
|
||||
+ "label": "python",
|
||||
+ "condition": "tests.webengine-python",
|
||||
"output": [
|
||||
"privateFeature",
|
||||
- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" }
|
||||
+ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" }
|
||||
]
|
||||
},
|
||||
"webengine-gperf": {
|
||||
316
qt5-qtwebengine.spec
Normal file
316
qt5-qtwebengine.spec
Normal file
@ -0,0 +1,316 @@
|
||||
%define majver %(echo %version | cut -d. -f1-2)
|
||||
Name: qt5-qtwebengine
|
||||
Version: 5.15.7
|
||||
Release: 1mamba
|
||||
Summary: Qt5 WebEngine component
|
||||
Group: System/Libraries
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: https://www.qt.io/
|
||||
Source: https://github.com/qt/qtwebengine.git/v%{version}-lts/qtwebengine-%{version}.tar.bz2
|
||||
Patch8: qtwebengine-5.15.2-chromium-icu-68.patch
|
||||
Patch9: qtwebengine-5.15.2-chromium-icu-68.2-2.patch
|
||||
Patch10: qt5-qtwebengine-5.15.7-chromium-python3.patch
|
||||
Patch11: qt5-qtwebengine-5.15.7-python3.patch
|
||||
Patch12: qt5-qtwebengine-5.15.7-chromium-glibc-2.34.patch
|
||||
Patch13: qt5-qtwebengine-5.15.7-chromium-glibc-2.34-breakpad.patch
|
||||
Patch14: qt5-qtwebengine-5.15.7-aarch64-new-stat.patch
|
||||
Patch15: qt5-qtwebengine-5.15.7-no-icudtl-dat.patch
|
||||
Patch16: qt5-qtwebengine-5.15.7-SIOCGSTAMP.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libQt5Positioning-devel
|
||||
BuildRequires: libQt5WebChannel-devel
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXcomposite-devel
|
||||
BuildRequires: libXdamage-devel
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: libXfixes-devel
|
||||
BuildRequires: libXrandr-devel
|
||||
BuildRequires: libXrender-devel
|
||||
BuildRequires: libXtst-devel
|
||||
BuildRequires: libalsa-devel
|
||||
BuildRequires: libavcodec-ffmpeg-devel
|
||||
BuildRequires: libavformat-ffmpeg-devel
|
||||
BuildRequires: libavutil-ffmpeg-devel
|
||||
BuildRequires: libdbus-devel
|
||||
BuildRequires: libevent-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libfontconfig-devel
|
||||
BuildRequires: libfreetype-devel
|
||||
BuildRequires: libgcc
|
||||
BuildRequires: libglib-devel
|
||||
BuildRequires: libglvnd-devel
|
||||
BuildRequires: libharfbuzz-devel
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: liblcms2-devel
|
||||
BuildRequires: libminizip1-devel
|
||||
BuildRequires: libnspr-devel
|
||||
BuildRequires: libnss-devel
|
||||
BuildRequires: libopus-devel
|
||||
BuildRequires: libpci-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libre2-devel
|
||||
BuildRequires: libsnappy-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: libvpx-devel
|
||||
BuildRequires: libwebp-devel
|
||||
BuildRequires: libxcb-devel
|
||||
BuildRequires: libxkbcommon-devel
|
||||
BuildRequires: libz-devel
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: qt5-qtdeclarative-devel
|
||||
BuildRequires: qt5-qttools-devel
|
||||
## AUTOBUILDREQ-END
|
||||
#BuildRequires: libpipewire02-devel
|
||||
#BuildConflicts: libQt5WebEngine-devel
|
||||
Requires(post): %{__install_info}
|
||||
Requires(preun): %{__install_info}
|
||||
Provides: qtwebengine
|
||||
Obsoletes: qtwebengine <= 5.15.2
|
||||
|
||||
%description
|
||||
Qt5 WebEngine component.
|
||||
|
||||
%package -n libQt5WebEngine
|
||||
Group: System/Libraries
|
||||
Summary: Shared libraries for %{name}
|
||||
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||
|
||||
%description -n libQt5WebEngine
|
||||
This package contains shared libraries for %{name}.
|
||||
|
||||
%package -n libQt5WebEngine-devel
|
||||
Group: Development/Libraries
|
||||
Summary: Development files for %{name}
|
||||
Requires: libQt5WebEngine = %{?epoch:%epoch:}%{version}-%{release}
|
||||
Requires: pkg-config
|
||||
|
||||
%description -n libQt5WebEngine-devel
|
||||
This package contains libraries and header files for developing applications that use %{name}.
|
||||
|
||||
%debug_package
|
||||
|
||||
%prep
|
||||
%setup -q -n qtwebengine-%{version}
|
||||
#-D -T
|
||||
#:<< _EOF
|
||||
cd src/3rdparty
|
||||
#%patch10 -p1 -b .chromium-python3
|
||||
%patch13 -p1 -b .chromium-glibc-2.34-breakpad
|
||||
cd ../..
|
||||
%patch9 -p1
|
||||
#%patch11 -p1 -b .python3
|
||||
%patch12 -p1 -b .chromium-glibc-2.34
|
||||
%patch14 -p1 -b .aarch64-new-stat
|
||||
%patch15 -p1 -b .no-icudtl-dat
|
||||
%patch16 -p1 -b .SIOCGSTAMP
|
||||
|
||||
## Update catapult for python3 compatibility
|
||||
#mv catapult-%{version} catapult
|
||||
#rm -rf src/3rdparty/chromium/third_party/catapult
|
||||
#mv catapult src/3rdparty/chromium/third_party
|
||||
|
||||
|
||||
# fix/workaround
|
||||
# fatal error: QtWebEngineCore/qtwebenginecoreglobal.h: No such file or directory
|
||||
if [ ! -f "./include/QtWebEngineCore/qtwebenginecoreglobal.h" ]; then
|
||||
%_qt5_bindir/syncqt.pl -version %{version}
|
||||
fi
|
||||
|
||||
## Workaround for:
|
||||
## qtwebengine-5.15.7/src/core/net/qrc_url_scheme_handler.h:43:10: fatal error: QtWebEngineCore/private/qtwebenginecoreglobal_p.h: No such file or directory
|
||||
#cp ./src/core/api/qtwebenginecoreglobal_p.h include/QtWebEngineCore/%{version}/QtWebEngineCore/private/
|
||||
#cp ./src/webengine/api/qtwebengineglobal_p.h include/QtWebEngine/5.15.7/QtWebEngine/private/
|
||||
|
||||
%build
|
||||
#:<< _EOF
|
||||
# Prevent build server slowness/crash due to memory
|
||||
%ifarch arm
|
||||
export NINJAFLAGS="-j1"
|
||||
%else
|
||||
export NINJAFLAGS="-j2"
|
||||
%endif
|
||||
|
||||
%ifarch %{ix86} aarch64
|
||||
export CXXFLAGS+="%{optflags} -Os -s -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--no-keep-memory -fPIC -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wl,--no-fatal-warnings"
|
||||
%else
|
||||
export CXXFLAGS+="%{optflags} -fPIC -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wl,--no-fatal-warnings"
|
||||
%endif
|
||||
|
||||
qmake-qt5 -- \
|
||||
-proprietary-codecs \
|
||||
-system-ffmpeg \
|
||||
-webengine-icu \
|
||||
-webengine-kerberos \
|
||||
-webengine-webrtc-pipewire \
|
||||
-webp \
|
||||
-spellchecker
|
||||
|
||||
PATH=%{_bindir}:$PATH %make
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
PATH=%{_bindir}:$PATH %makeinstall INSTALL_ROOT=%{buildroot} STRIP=/bin/true
|
||||
|
||||
#%find_lang %{name}5_qt --with-qt --all-name || touch %{name}5_qt.lang
|
||||
|
||||
rm -f %{buildroot}%{_libdir}/Qt5WebEngineCore.la
|
||||
|
||||
# Fix cmake dependency versions
|
||||
sed -e "s|%{version}\ |5.15.2 |" -i %{buildroot}%{_libdir}/cmake/*/*Config.cmake
|
||||
|
||||
%clean
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
|
||||
%post -n libQt5WebEngine -p /sbin/ldconfig
|
||||
%postun -n libQt5WebEngine -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
#-f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/qt5/resources/qtwebengine_devtools_resources.pak
|
||||
%{_datadir}/qt5/resources/qtwebengine_resources.pak
|
||||
%{_datadir}/qt5/resources/qtwebengine_resources_100p.pak
|
||||
%{_datadir}/qt5/resources/qtwebengine_resources_200p.pak
|
||||
#%{_datadir}/qt5/resources/icudtl.dat
|
||||
%dir %{_datadir}/qt5/translations/qtwebengine_locales
|
||||
%{_datadir}/qt5/translations/qtwebengine_locales/*.pak
|
||||
%doc LICENSE.GPL3 LICENSE.GPL3-EXCEPT
|
||||
|
||||
%files -n libQt5WebEngine
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libQt5WebEngine.so.*
|
||||
%{_libdir}/libQt5WebEngineCore.so.*
|
||||
%{_libdir}/libQt5WebEngineWidgets.so.*
|
||||
%{_libdir}/libQt5Pdf.so.*
|
||||
%{_libdir}/libQt5PdfWidgets.so.*
|
||||
%{_libdir}/qt5/bin/qwebengine_convert_dict
|
||||
%{_libdir}/qt5/libexec/QtWebEngineProcess
|
||||
%{_libdir}/qt5/plugins/designer/libqwebengineview.so
|
||||
%{_libdir}/qt5/plugins/imageformats/libqpdf.so
|
||||
%dir %{_libdir}/qt5/qml/QtWebEngine
|
||||
%{_libdir}/qt5/qml/QtWebEngine/*
|
||||
%dir %{_libdir}/qt5/qml/QtQuick
|
||||
%{_libdir}/qt5/qml/QtQuick/*
|
||||
%doc LICENSE.LGPL3 LICENSE.Chromium LICENSE.FDL
|
||||
|
||||
%files -n libQt5WebEngine-devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/qt5/QtWebEngine
|
||||
%{_includedir}/qt5/QtWebEngine/*
|
||||
%dir %{_includedir}/qt5/QtWebEngineCore
|
||||
%{_includedir}/qt5/QtWebEngineCore/*
|
||||
%dir %{_includedir}/qt5/QtWebEngineWidgets
|
||||
%{_includedir}/qt5/QtWebEngineWidgets/*
|
||||
%dir %{_includedir}/qt5/QtPdf
|
||||
%{_includedir}/qt5/QtPdf/*
|
||||
%dir %{_includedir}/qt5/QtPdfWidgets
|
||||
%{_includedir}/qt5/QtPdfWidgets/*
|
||||
%dir %{_libdir}/cmake/Qt5WebEngine
|
||||
%{_libdir}/cmake/Qt5WebEngine/*.cmake
|
||||
%dir %{_libdir}/cmake/Qt5WebEngineCore
|
||||
%{_libdir}/cmake/Qt5WebEngineCore/*.cmake
|
||||
%dir %{_libdir}/cmake/Qt5WebEngineWidgets
|
||||
%dir %{_libdir}/cmake/Qt5Gui
|
||||
%{_libdir}/cmake/Qt5Gui/Qt5Gui_QPdfPlugin.cmake
|
||||
%dir %{_libdir}/cmake/Qt5Pdf
|
||||
%{_libdir}/cmake/Qt5Pdf/Qt5PdfConfig*.cmake
|
||||
%{_libdir}/cmake/Qt5PdfWidgets/Qt5PdfWidgetsConfig*.cmake
|
||||
%{_libdir}/libQt5WebEngine.la
|
||||
%{_libdir}/libQt5WebEngine.prl
|
||||
%{_libdir}/libQt5WebEngine.so
|
||||
%{_libdir}/libQt5WebEngineCore.la
|
||||
%{_libdir}/libQt5WebEngineCore.prl
|
||||
%{_libdir}/libQt5WebEngineCore.so
|
||||
%{_libdir}/libQt5WebEngineWidgets.la
|
||||
%{_libdir}/libQt5WebEngineWidgets.prl
|
||||
%{_libdir}/libQt5WebEngineWidgets.so
|
||||
%{_libdir}/libQt5Pdf.la
|
||||
%{_libdir}/libQt5Pdf.prl
|
||||
%{_libdir}/libQt5Pdf.so
|
||||
%{_libdir}/libQt5PdfWidgets.la
|
||||
%{_libdir}/libQt5PdfWidgets.prl
|
||||
%{_libdir}/libQt5PdfWidgets.so
|
||||
%{_libdir}/qt5/mkspecs/modules/qt_lib_webengine*.pri
|
||||
%{_libdir}/qt5/mkspecs/modules/qt_lib_pdf*.pri
|
||||
%{_libdir}/pkgconfig/Qt5WebEngine.pc
|
||||
%{_libdir}/pkgconfig/Qt5WebEngineCore.pc
|
||||
%{_libdir}/pkgconfig/Qt5WebEngineWidgets.pc
|
||||
%{_libdir}/pkgconfig/Qt5Pdf.pc
|
||||
%{_libdir}/pkgconfig/Qt5PdfWidgets.pc
|
||||
%{_libdir}/cmake/Qt5WebEngineWidgets/*.cmake
|
||||
%{_libdir}/cmake/Qt5Designer/Qt5Designer_QWebEngineViewPlugin.cmake
|
||||
|
||||
%changelog
|
||||
* Fri Dec 24 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.7-1mamba
|
||||
- update to 5.15.7
|
||||
|
||||
* Sat Jan 02 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.2-1mamba
|
||||
- update to 5.15.2
|
||||
|
||||
* Mon Oct 19 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.1-1mamba
|
||||
- update to 5.15.1
|
||||
|
||||
* Mon Aug 31 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.0-2mamba
|
||||
- rebuilt with system ffmpeg and icu
|
||||
|
||||
* Fri Aug 28 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.0-1mamba
|
||||
- update to 5.15.0
|
||||
|
||||
* Tue Apr 07 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 5.14.2-1mamba
|
||||
- update to 5.14.2
|
||||
|
||||
* Wed Oct 23 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 5.13.1-1mamba
|
||||
- update to 5.13.1
|
||||
|
||||
* Sun Jun 23 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 5.13.0-1mamba
|
||||
- update to 5.13.0
|
||||
|
||||
* Tue May 07 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 5.12.3-1mamba
|
||||
- update to 5.12.3
|
||||
|
||||
* Tue Mar 19 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 5.12.2-1mamba
|
||||
- update to 5.12.2
|
||||
|
||||
* Sun Feb 10 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 5.12.1-1mamba
|
||||
- update to 5.12.1
|
||||
|
||||
* Sun Dec 30 2018 Automatic Build System <autodist@mambasoft.it> 5.12.0-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Nov 03 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 5.11.2-1mamba
|
||||
- update to 5.11.2
|
||||
|
||||
* Sat Jul 21 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 5.11.1-1mamba
|
||||
- update to 5.11.1
|
||||
|
||||
* Wed Jun 06 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 5.11.0-1mamba
|
||||
- update to 5.11.0
|
||||
|
||||
* Sat Feb 24 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 5.10.1-1mamba
|
||||
- update to 5.10.1
|
||||
|
||||
* Sat Jan 27 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 5.10.0-1mamba
|
||||
- update to 5.10.0
|
||||
|
||||
* Thu Oct 19 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 5.9.2-1mamba
|
||||
- update to 5.9.2
|
||||
|
||||
* Fri Dec 16 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 5.7.1-1mamba
|
||||
- update to 5.7.1
|
||||
|
||||
* Thu Dec 15 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 5.7.0-4mamba
|
||||
- rebuilt with gcc
|
||||
|
||||
* Thu Dec 15 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 5.7.0-3mamba
|
||||
- rebuilt with -fno-delete-null-pointer-checks CXXFLAGS and use_system_ffmpeg
|
||||
|
||||
* Thu Dec 15 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 5.7.0-2mamba
|
||||
- bump release to allow update with qt5 release update
|
||||
|
||||
* Sat Jul 16 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 5.7.0-1mamba
|
||||
- package created using the webbuild interface
|
||||
11
qtwebengine-5.15.2-chromium-icu-68.2-2.patch
Normal file
11
qtwebengine-5.15.2-chromium-icu-68.2-2.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/libxml/src/encoding.c.orig 2021-01-03 10:11:46.380887963 +0100
|
||||
+++ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/libxml/src/encoding.c 2021-01-03 10:12:18.541212665 +0100
|
||||
@@ -1958,7 +1958,7 @@
|
||||
#ifdef LIBXML_ICU_ENABLED
|
||||
else if (handler->uconv_out != NULL) {
|
||||
ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
|
||||
- TRUE);
|
||||
+ true);
|
||||
}
|
||||
#endif /* LIBXML_ICU_ENABLED */
|
||||
else {
|
||||
302
qtwebengine-5.15.2-chromium-icu-68.patch
Normal file
302
qtwebengine-5.15.2-chromium-icu-68.patch
Normal file
@ -0,0 +1,302 @@
|
||||
From 9236b21c883360482bd2c06929bfdecbc47f186c Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Date: Mon, 16 Nov 2020 13:16:13 +0100
|
||||
Subject: Fix build with system ICU 68
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes: QTBUG-88116
|
||||
Change-Id: I935babf51c2670fad7cc7950a2fe07eb2829c4cb
|
||||
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
|
||||
---
|
||||
chromium/base/i18n/string_compare.cc | 4 ++--
|
||||
chromium/base/i18n/time_formatting.cc | 2 +-
|
||||
.../components/autofill/core/common/autofill_regexes.cc | 8 ++++----
|
||||
.../spellcheck/renderer/spellcheck_worditerator.cc | 2 +-
|
||||
.../url_formatter/spoof_checks/idn_spoof_checker.cc | 4 ++--
|
||||
.../url_formatter/spoof_checks/skeleton_generator.cc | 2 +-
|
||||
chromium/services/service_manager/zygote/zygote_linux.cc | 2 +-
|
||||
.../blink/renderer/platform/text/locale_icu.cc | 4 ++--
|
||||
.../renderer/platform/text/text_break_iterator_icu.cc | 16 ++++++++--------
|
||||
.../blink/renderer/platform/text/unicode_utilities.cc | 2 +-
|
||||
.../blink/renderer/platform/wtf/text/text_codec_icu.cc | 2 +-
|
||||
chromium/ui/base/l10n/formatter.cc | 6 +++---
|
||||
12 files changed, 27 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/chromium/base/i18n/string_compare.cc b/chromium/base/i18n/string_compare.cc
|
||||
index 6cd59b98f49..a5fa502b53f 100644
|
||||
--- a/chromium/base/i18n/string_compare.cc
|
||||
+++ b/chromium/base/i18n/string_compare.cc
|
||||
@@ -18,8 +18,8 @@ UCollationResult CompareString16WithCollator(const icu::Collator& collator,
|
||||
StringPiece16 rhs) {
|
||||
UErrorCode error = U_ZERO_ERROR;
|
||||
UCollationResult result = collator.compare(
|
||||
- icu::UnicodeString(FALSE, lhs.data(), static_cast<int>(lhs.length())),
|
||||
- icu::UnicodeString(FALSE, rhs.data(), static_cast<int>(rhs.length())),
|
||||
+ icu::UnicodeString(false, lhs.data(), static_cast<int>(lhs.length())),
|
||||
+ icu::UnicodeString(false, rhs.data(), static_cast<int>(rhs.length())),
|
||||
error);
|
||||
DCHECK(U_SUCCESS(error));
|
||||
return result;
|
||||
diff --git a/chromium/base/i18n/time_formatting.cc b/chromium/base/i18n/time_formatting.cc
|
||||
index 1a6c1389ba0..106dd0e5b47 100644
|
||||
--- a/chromium/base/i18n/time_formatting.cc
|
||||
+++ b/chromium/base/i18n/time_formatting.cc
|
||||
@@ -236,7 +236,7 @@ bool TimeDurationFormatWithSeconds(const TimeDelta time,
|
||||
icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE);
|
||||
measure_format.formatMeasures(measures, 3, formatted, ignore, status);
|
||||
*out = i18n::UnicodeStringToString16(formatted);
|
||||
- return U_SUCCESS(status) == TRUE;
|
||||
+ return U_SUCCESS(status) == true;
|
||||
}
|
||||
|
||||
string16 DateIntervalFormat(const Time& begin_time,
|
||||
diff --git a/chromium/components/autofill/core/common/autofill_regexes.cc b/chromium/components/autofill/core/common/autofill_regexes.cc
|
||||
index b141cb2d0f6..a8a688d50c7 100644
|
||||
--- a/chromium/components/autofill/core/common/autofill_regexes.cc
|
||||
+++ b/chromium/components/autofill/core/common/autofill_regexes.cc
|
||||
@@ -43,7 +43,7 @@ class AutofillRegexes {
|
||||
icu::RegexMatcher* AutofillRegexes::GetMatcher(const base::string16& pattern) {
|
||||
auto it = matchers_.find(pattern);
|
||||
if (it == matchers_.end()) {
|
||||
- const icu::UnicodeString icu_pattern(FALSE, pattern.data(),
|
||||
+ const icu::UnicodeString icu_pattern(false, pattern.data(),
|
||||
pattern.length());
|
||||
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
@@ -70,20 +70,20 @@ bool MatchesPattern(const base::string16& input,
|
||||
base::AutoLock lock(*g_lock);
|
||||
|
||||
icu::RegexMatcher* matcher = g_autofill_regexes->GetMatcher(pattern);
|
||||
- icu::UnicodeString icu_input(FALSE, input.data(), input.length());
|
||||
+ icu::UnicodeString icu_input(false, input.data(), input.length());
|
||||
matcher->reset(icu_input);
|
||||
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
UBool matched = matcher->find(0, status);
|
||||
DCHECK(U_SUCCESS(status));
|
||||
|
||||
- if (matched == TRUE && match) {
|
||||
+ if (matched == true && match) {
|
||||
icu::UnicodeString match_unicode = matcher->group(0, status);
|
||||
DCHECK(U_SUCCESS(status));
|
||||
*match = base::i18n::UnicodeStringToString16(match_unicode);
|
||||
}
|
||||
|
||||
- return matched == TRUE;
|
||||
+ return matched == true;
|
||||
}
|
||||
|
||||
} // namespace autofill
|
||||
diff --git a/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc b/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
|
||||
index 8fe8a6df381..e3a65580c08 100644
|
||||
--- a/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
|
||||
+++ b/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
|
||||
@@ -424,7 +424,7 @@ bool SpellcheckWordIterator::Normalize(size_t input_start,
|
||||
// spellchecker and we need manual normalization as well. The normalized
|
||||
// text does not have to be NUL-terminated since its characters are copied to
|
||||
// string16, which adds a NUL character when we need.
|
||||
- icu::UnicodeString input(FALSE, &text_[input_start],
|
||||
+ icu::UnicodeString input(false, &text_[input_start],
|
||||
base::checked_cast<int32_t>(input_length));
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
icu::UnicodeString output;
|
||||
diff --git a/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc b/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
|
||||
index 1964793fd3e..c4e01026c38 100644
|
||||
--- a/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
|
||||
+++ b/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
|
||||
@@ -347,7 +347,7 @@ bool IDNSpoofChecker::SafeToDisplayAsUnicode(
|
||||
if (U_FAILURE(status) || (result & USPOOF_ALL_CHECKS))
|
||||
return false;
|
||||
|
||||
- icu::UnicodeString label_string(FALSE /* isTerminated */, label.data(),
|
||||
+ icu::UnicodeString label_string(false /* isTerminated */, label.data(),
|
||||
base::checked_cast<int32_t>(label.size()));
|
||||
|
||||
// A punycode label with 'xn--' prefix is not subject to the URL
|
||||
@@ -677,7 +677,7 @@ bool IDNSpoofChecker::IsWholeScriptConfusableAllowedForTLD(
|
||||
base::StringPiece tld,
|
||||
base::StringPiece16 tld_unicode) {
|
||||
icu::UnicodeString tld_string(
|
||||
- FALSE /* isTerminated */, tld_unicode.data(),
|
||||
+ false /* isTerminated */, tld_unicode.data(),
|
||||
base::checked_cast<int32_t>(tld_unicode.size()));
|
||||
// Allow if the TLD contains any letter from the script, in which case it's
|
||||
// likely to be a TLD in that script.
|
||||
diff --git a/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc b/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc
|
||||
index 41485914007..b8c1c2f547a 100644
|
||||
--- a/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc
|
||||
+++ b/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc
|
||||
@@ -117,7 +117,7 @@ SkeletonGenerator::~SkeletonGenerator() = default;
|
||||
Skeletons SkeletonGenerator::GetSkeletons(base::StringPiece16 hostname) {
|
||||
Skeletons skeletons;
|
||||
size_t hostname_length = hostname.length() - (hostname.back() == '.' ? 1 : 0);
|
||||
- icu::UnicodeString host(FALSE, hostname.data(), hostname_length);
|
||||
+ icu::UnicodeString host(false, hostname.data(), hostname_length);
|
||||
// If input has any characters outside Latin-Greek-Cyrillic and [0-9._-],
|
||||
// there is no point in getting rid of diacritics because combining marks
|
||||
// attached to non-LGC characters are already blocked.
|
||||
diff --git a/chromium/services/service_manager/zygote/zygote_linux.cc b/chromium/services/service_manager/zygote/zygote_linux.cc
|
||||
index aa601ab28d7..920438e5b50 100644
|
||||
--- a/chromium/services/service_manager/zygote/zygote_linux.cc
|
||||
+++ b/chromium/services/service_manager/zygote/zygote_linux.cc
|
||||
@@ -564,7 +564,7 @@ base::ProcessId Zygote::ReadArgsAndFork(base::PickleIterator iter,
|
||||
if (!iter.ReadString16(&timezone_id))
|
||||
return -1;
|
||||
icu::TimeZone::adoptDefault(icu::TimeZone::createTimeZone(
|
||||
- icu::UnicodeString(FALSE, timezone_id.data(), timezone_id.length())));
|
||||
+ icu::UnicodeString(false, timezone_id.data(), timezone_id.length())));
|
||||
|
||||
if (!iter.ReadInt(&numfds))
|
||||
return -1;
|
||||
diff --git a/chromium/third_party/blink/renderer/platform/text/locale_icu.cc b/chromium/third_party/blink/renderer/platform/text/locale_icu.cc
|
||||
index abff1b1d809..57f1286d4e4 100644
|
||||
--- a/chromium/third_party/blink/renderer/platform/text/locale_icu.cc
|
||||
+++ b/chromium/third_party/blink/renderer/platform/text/locale_icu.cc
|
||||
@@ -169,12 +169,12 @@ static String GetDateFormatPattern(const UDateFormat* date_format) {
|
||||
return g_empty_string;
|
||||
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
- int32_t length = udat_toPattern(date_format, TRUE, nullptr, 0, &status);
|
||||
+ int32_t length = udat_toPattern(date_format, true, nullptr, 0, &status);
|
||||
if (status != U_BUFFER_OVERFLOW_ERROR || !length)
|
||||
return g_empty_string;
|
||||
StringBuffer<UChar> buffer(length);
|
||||
status = U_ZERO_ERROR;
|
||||
- udat_toPattern(date_format, TRUE, buffer.Characters(), length, &status);
|
||||
+ udat_toPattern(date_format, true, buffer.Characters(), length, &status);
|
||||
if (U_FAILURE(status))
|
||||
return g_empty_string;
|
||||
return String::Adopt(buffer);
|
||||
diff --git a/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc b/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
|
||||
index a257cd75ccf..898d0c47bb1 100644
|
||||
--- a/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
|
||||
+++ b/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
|
||||
@@ -311,13 +311,13 @@ static inline bool TextInChunkOrOutOfRange(UText* text,
|
||||
text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
|
||||
? static_cast<int32_t>(offset)
|
||||
: 0;
|
||||
- is_accessible = TRUE;
|
||||
+ is_accessible = true;
|
||||
return true;
|
||||
}
|
||||
if (native_index >= native_length &&
|
||||
text->chunkNativeLimit == native_length) {
|
||||
text->chunkOffset = text->chunkLength;
|
||||
- is_accessible = FALSE;
|
||||
+ is_accessible = false;
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
@@ -330,12 +330,12 @@ static inline bool TextInChunkOrOutOfRange(UText* text,
|
||||
text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
|
||||
? static_cast<int32_t>(offset)
|
||||
: 0;
|
||||
- is_accessible = TRUE;
|
||||
+ is_accessible = true;
|
||||
return true;
|
||||
}
|
||||
if (native_index <= 0 && !text->chunkNativeStart) {
|
||||
text->chunkOffset = 0;
|
||||
- is_accessible = FALSE;
|
||||
+ is_accessible = false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -346,7 +346,7 @@ static UBool TextLatin1Access(UText* text,
|
||||
int64_t native_index,
|
||||
UBool forward) {
|
||||
if (!text->context)
|
||||
- return FALSE;
|
||||
+ return false;
|
||||
int64_t native_length = TextNativeLength(text);
|
||||
UBool is_accessible;
|
||||
if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
|
||||
@@ -370,7 +370,7 @@ static UBool TextLatin1Access(UText* text,
|
||||
DCHECK_EQ(new_context, kPriorContext);
|
||||
TextLatin1SwitchToPriorContext(text, native_index, native_length, forward);
|
||||
}
|
||||
- return TRUE;
|
||||
+ return true;
|
||||
}
|
||||
|
||||
static const struct UTextFuncs kTextLatin1Funcs = {
|
||||
@@ -510,7 +510,7 @@ static void TextUTF16SwitchToPriorContext(UText* text,
|
||||
|
||||
static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) {
|
||||
if (!text->context)
|
||||
- return FALSE;
|
||||
+ return false;
|
||||
int64_t native_length = TextNativeLength(text);
|
||||
UBool is_accessible;
|
||||
if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
|
||||
@@ -532,7 +532,7 @@ static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) {
|
||||
DCHECK_EQ(new_context, kPriorContext);
|
||||
TextUTF16SwitchToPriorContext(text, native_index, native_length, forward);
|
||||
}
|
||||
- return TRUE;
|
||||
+ return true;
|
||||
}
|
||||
|
||||
static const struct UTextFuncs kTextUTF16Funcs = {
|
||||
diff --git a/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc b/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc
|
||||
index 2cefd5390b6..b8c4515dc13 100644
|
||||
--- a/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc
|
||||
+++ b/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc
|
||||
@@ -300,7 +300,7 @@ void NormalizeCharactersIntoNFCForm(const UChar* characters,
|
||||
DCHECK(U_SUCCESS(status));
|
||||
int32_t input_length = static_cast<int32_t>(length);
|
||||
// copy-on-write.
|
||||
- icu::UnicodeString normalized(FALSE, characters, input_length);
|
||||
+ icu::UnicodeString normalized(false, characters, input_length);
|
||||
// In the vast majority of cases, input is already NFC. Run a quick check
|
||||
// to avoid normalizing the entire input unnecessarily.
|
||||
int32_t normalized_prefix_length =
|
||||
diff --git a/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
|
||||
index 810d1cd9181..9074b640fff 100644
|
||||
--- a/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
|
||||
+++ b/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
|
||||
@@ -326,7 +326,7 @@ void TextCodecICU::CreateICUConverter() const {
|
||||
DLOG_IF(ERROR, err == U_AMBIGUOUS_ALIAS_WARNING)
|
||||
<< "ICU ambiguous alias warning for encoding: " << encoding_.GetName();
|
||||
if (converter_icu_)
|
||||
- ucnv_setFallback(converter_icu_, TRUE);
|
||||
+ ucnv_setFallback(converter_icu_, true);
|
||||
}
|
||||
|
||||
int TextCodecICU::DecodeToBuffer(UChar* target,
|
||||
diff --git a/chromium/ui/base/l10n/formatter.cc b/chromium/ui/base/l10n/formatter.cc
|
||||
index 486a3a029cb..d7a41724628 100644
|
||||
--- a/chromium/ui/base/l10n/formatter.cc
|
||||
+++ b/chromium/ui/base/l10n/formatter.cc
|
||||
@@ -232,7 +232,7 @@ void Formatter::Format(Unit unit,
|
||||
int value,
|
||||
icu::UnicodeString* formatted_string) const {
|
||||
DCHECK(simple_format_[unit]);
|
||||
- DCHECK(formatted_string->isEmpty() == TRUE);
|
||||
+ DCHECK(formatted_string->isEmpty() == true);
|
||||
UErrorCode error = U_ZERO_ERROR;
|
||||
FormatNumberInPlural(*simple_format_[unit],
|
||||
value, formatted_string, &error);
|
||||
@@ -248,7 +248,7 @@ void Formatter::Format(TwoUnits units,
|
||||
<< "Detailed() not implemented for your (format, length) combination!";
|
||||
DCHECK(detailed_format_[units][1])
|
||||
<< "Detailed() not implemented for your (format, length) combination!";
|
||||
- DCHECK(formatted_string->isEmpty() == TRUE);
|
||||
+ DCHECK(formatted_string->isEmpty() == true);
|
||||
UErrorCode error = U_ZERO_ERROR;
|
||||
FormatNumberInPlural(*detailed_format_[units][0], value_1,
|
||||
formatted_string, &error);
|
||||
@@ -281,7 +281,7 @@ std::unique_ptr<icu::MessageFormat> Formatter::InitFormat(
|
||||
base::string16 pattern = l10n_util::GetStringUTF16(pluralities.id);
|
||||
UErrorCode error = U_ZERO_ERROR;
|
||||
std::unique_ptr<icu::MessageFormat> format(new icu::MessageFormat(
|
||||
- icu::UnicodeString(FALSE, pattern.data(), pattern.length()), error));
|
||||
+ icu::UnicodeString(false, pattern.data(), pattern.length()), error));
|
||||
DCHECK(U_SUCCESS(error));
|
||||
if (format.get())
|
||||
return format;
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user