rpms
/
qt5-qtwebengine
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebase patches (TODO: no-sse2 patch)

Browse Source 
* Sun Jul 17 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.7.0-1
- Drop no-format patch, fixed upstream (they stopped passing -Wno-format)
- Rebase linux-pri patch (use_system_protobuf is now a qmake flag)
- Rebase system-nspr-prtime and system-icu-utf patches
epel9
Kevin Kofler 9 years ago
parent 778be18d72
commit c44c0d51a8
6 changed files with 126 additions and 176 deletions
Show Stats Download Patch File Download Diff File

16
qt5-qtwebengine.spec
Unescape View File

@ -45,10 +45,8 @@ Source0: qtwebengine-opensource-src-%{version}-clean.tar.xz
Source1: clean_qtwebengine.sh Source1: clean_qtwebengine.sh
Source2: clean_ffmpeg.sh Source2: clean_ffmpeg.sh
Source3: get_free_ffmpeg_source_files.py Source3: get_free_ffmpeg_source_files.py
# do not compile with -Wno-format, which also bypasses -Werror-format-security
Patch0: qtwebengine-opensource-src-5.6.0-beta-no-format.patch
# some tweaks to linux.pri (system libs, link libpci, run unbundling script) # some tweaks to linux.pri (system libs, link libpci, run unbundling script)
Patch1: qtwebengine-opensource-src-5.6.1-linux-pri.patch Patch1: qtwebengine-opensource-src-5.7.0-linux-pri.patch
# quick hack to avoid checking for the nonexistent icudtl.dat and silence the # quick hack to avoid checking for the nonexistent icudtl.dat and silence the
# resulting warnings - not upstreamable as is because it removes the fallback # resulting warnings - not upstreamable as is because it removes the fallback
# mechanism for the ICU data directory (which is not used in our builds because # mechanism for the ICU data directory (which is not used in our builds because
@ -63,12 +61,12 @@ Patch4: qtwebengine-opensource-src-5.6.0-beta-no-neon.patch
# use the system NSPR prtime (based on Debian patch) # use the system NSPR prtime (based on Debian patch)
# We already depend on NSPR, so it is useless to copy these functions here. # We already depend on NSPR, so it is useless to copy these functions here.
# Debian uses this just fine, and I don't see relevant modifications either. # Debian uses this just fine, and I don't see relevant modifications either.
Patch5: qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime.patch Patch5: qtwebengine-opensource-src-5.7.0-system-nspr-prtime.patch
# use the system ICU UTF functions # use the system ICU UTF functions
# We already depend on ICU, so it is useless to copy these functions here. # We already depend on ICU, so it is useless to copy these functions here.
# I checked the history of that directory, and other than the renames I am # I checked the history of that directory, and other than the renames I am
# undoing, there were no modifications at all. Must be applied after Patch5. # undoing, there were no modifications at all. Must be applied after Patch5.
Patch6: qtwebengine-opensource-src-5.6.0-beta-system-icu-utf.patch Patch6: qtwebengine-opensource-src-5.7.0-system-icu-utf.patch
# do not require SSE2 on i686 # do not require SSE2 on i686
# cumulative revert of upstream reviews 187423002, 308003004, 511773002 (parts # cumulative revert of upstream reviews 187423002, 308003004, 511773002 (parts
# relevant to QtWebEngine only), 516543004, 1152053004 and 1161853008, along # relevant to QtWebEngine only), 516543004, 1152053004 and 1161853008, along
@ -294,7 +292,6 @@ BuildArch: noarch
%prep %prep
%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
%patch0 -p1 -b .no-format
%patch1 -p1 -b .linux-pri %patch1 -p1 -b .linux-pri
%patch2 -p1 -b .no-icudtl-dat %patch2 -p1 -b .no-icudtl-dat
%patch3 -p1 -b .fix-extractcflag %patch3 -p1 -b .fix-extractcflag
@ -332,7 +329,7 @@ export CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ -g / -g1 /g'`
mkdir %{_target_platform} mkdir %{_target_platform}
pushd %{_target_platform} pushd %{_target_platform}
%{qmake_qt5} CONFIG+="webcore_debug v8base_debug force_debug_info" WEBENGINE_CONFIG+="use_system_icu" .. %{qmake_qt5} CONFIG+="webcore_debug v8base_debug force_debug_info" WEBENGINE_CONFIG+="use_system_icu use_system_protobuf" ..
# workaround, disable parallel compilation as it fails to compile in brew # workaround, disable parallel compilation as it fails to compile in brew
make %{?_smp_mflags} make %{?_smp_mflags}
@ -447,10 +444,13 @@ popd
%changelog %changelog
* Sat Jul 16 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.7.0-1 * Sun Jul 17 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.7.0-1
- Update to 5.7.0 - Update to 5.7.0
- Update version numbers of bundled stuff - Update version numbers of bundled stuff
- Update system libvpx/libwebp version requirements (now F24+ only) - Update system libvpx/libwebp version requirements (now F24+ only)
- Drop no-format patch, fixed upstream (they stopped passing -Wno-format)
- Rebase linux-pri patch (use_system_protobuf is now a qmake flag)
- Rebase system-nspr-prtime and system-icu-utf patches
* Tue Jun 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-3 * Tue Jun 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-3
- rebuild (glibc) - rebuild (glibc)

30
qtwebengine-opensource-src-5.6.0-beta-no-format.patch
Unescape View File

@ -1,30 +0,0 @@
diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/build/common.gypi qtwebengine-opensource-src-5.6.0-beta-no-format/src/3rdparty/chromium/build/common.gypi
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/build/common.gypi 2015-12-10 18:17:21.000000000 +0100
+++ qtwebengine-opensource-src-5.6.0-beta-no-format/src/3rdparty/chromium/build/common.gypi 2016-01-05 05:58:55.336938182 +0100
@@ -3142,11 +3142,6 @@
# Don't warn about hash_map in third-party code.
'-Wno-deprecated',
],
- 'cflags': [
- # Don't warn about printf format problems.
- # This is off by default in gcc but on in Ubuntu's gcc(!).
- '-Wno-format',
- ],
'cflags_cc!': [
# Necessary because llvm.org/PR10448 is WONTFIX (crbug.com/90453).
'-Wsign-compare',
diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/build/config/compiler/BUILD.gn qtwebengine-opensource-src-5.6.0-beta-no-format/src/3rdparty/chromium/build/config/compiler/BUILD.gn
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/build/config/compiler/BUILD.gn 2015-12-10 18:17:21.000000000 +0100
+++ qtwebengine-opensource-src-5.6.0-beta-no-format/src/3rdparty/chromium/build/config/compiler/BUILD.gn 2016-01-05 05:58:55.362938322 +0100
@@ -1013,11 +1013,6 @@
}
if (is_linux || is_android) {
- cflags += [
- # Don't warn about printf format problems. This is off by default in gcc
- # but on in Ubuntu's gcc(!).
- "-Wno-format",
- ]
cflags_cc += [
# Don't warn about hash_map in third-party code.
"-Wno-deprecated",

49
qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime.patch
Unescape View File

@ -1,49 +0,0 @@
diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/base.gypi qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/base.gypi 2015-12-10 18:17:21.000000000 +0100
+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi 2016-01-12 03:01:20.875004550 +0100
@@ -623,8 +623,6 @@
'third_party/dmg_fp/g_fmt.cc',
'third_party/icu/icu_utf.cc',
'third_party/icu/icu_utf.h',
- 'third_party/nspr/prtime.cc',
- 'third_party/nspr/prtime.h',
'third_party/superfasthash/superfasthash.c',
'third_party/xdg_mime/xdgmime.h',
'thread_task_runner_handle.cc',
diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/BUILD.gn 2015-12-10 18:17:21.000000000 +0100
+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn 2016-01-12 03:03:08.040591492 +0100
@@ -506,8 +506,6 @@
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
- "third_party/nspr/prtime.cc",
- "third_party/nspr/prtime.h",
"third_party/superfasthash/superfasthash.c",
"thread_task_runner_handle.cc",
"thread_task_runner_handle.h",
diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/pr_time_unittest.cc qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2015-12-10 18:17:21.000000000 +0100
+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2016-01-12 03:01:20.876004555 +0100
@@ -6,7 +6,7 @@
#include <time.h>
#include "base/compiler_specific.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr4/prtime.h>
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/time.cc qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/time.cc 2015-12-10 18:17:21.000000000 +0100
+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc 2016-01-12 03:01:20.877004561 +0100
@@ -13,7 +13,8 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
-#include "base/third_party/nspr/prtime.h"
+
+#include <nspr4/prtime.h>
namespace base {

12
qtwebengine-opensource-src-5.6.1-linux-pri.patch → qtwebengine-opensource-src-5.7.0-linux-pri.patch
Unescape View File

@ -1,15 +1,15 @@
diff -ur qtwebengine-opensource-src-5.6.1/src/core/config/linux.pri qtwebengine-opensource-src-5.6.1-linux-pri/src/core/config/linux.pri diff -ur qtwebengine-opensource-src-5.7.0/src/core/config/linux.pri qtwebengine-opensource-src-5.7.0-linux-pri/src/core/config/linux.pri
--- qtwebengine-opensource-src-5.6.1/src/core/config/linux.pri 2016-05-26 20:01:25.000000000 +0200 --- qtwebengine-opensource-src-5.7.0/src/core/config/linux.pri 2016-06-07 06:20:06.000000000 +0200
+++ qtwebengine-opensource-src-5.6.1-linux-pri/src/core/config/linux.pri 2016-06-11 01:17:26.494650774 +0200 +++ qtwebengine-opensource-src-5.7.0-linux-pri/src/core/config/linux.pri 2016-07-17 16:21:35.259570229 +0200
@@ -46,3 +46,25 @@ @@ -46,3 +46,25 @@
use?(system_icu): GYP_CONFIG += use_system_icu=1 icu_use_data_file_flag=0 use?(system_icu): GYP_CONFIG += use_system_icu=1 icu_use_data_file_flag=0
use?(system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1 use?(system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1
use?(system_protobuf): GYP_CONFIG += use_system_protobuf=1
+
+# some more system packages, that are not checked for for some reason +# some more system packages, that are not checked for for some reason
+GYP_CONFIG += \ +GYP_CONFIG += \
+ use_system_expat=1 \ + use_system_expat=1 \
+ use_system_re2=1 \ + use_system_re2=1
+ use_system_protobuf=1
+ +
+# yasm is only used on x86, and passing use_system_yasm makes the build fail on +# yasm is only used on x86, and passing use_system_yasm makes the build fail on
+# other architectures (e.g., ARM), so make it conditional on the architecture +# other architectures (e.g., ARM), so make it conditional on the architecture

147
qtwebengine-opensource-src-5.6.0-beta-system-icu-utf.patch → qtwebengine-opensource-src-5.7.0-system-icu-utf.patch
Unescape View File

@ -1,7 +1,7 @@
diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/base.gypi diff -ur qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/base.gypi
--- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi 2016-01-12 03:01:20.875004550 +0100 --- qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi 2016-07-17 16:52:03.641799106 +0200
+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/base.gypi 2016-01-12 03:04:12.789946122 +0100 +++ qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/base.gypi 2016-07-17 17:20:50.666600419 +0200
@@ -621,8 +621,6 @@ @@ -632,8 +632,6 @@
'third_party/dmg_fp/dmg_fp.h', 'third_party/dmg_fp/dmg_fp.h',
'third_party/dmg_fp/dtoa_wrapper.cc', 'third_party/dmg_fp/dtoa_wrapper.cc',
'third_party/dmg_fp/g_fmt.cc', 'third_party/dmg_fp/g_fmt.cc',
@ -10,10 +10,10 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
'third_party/superfasthash/superfasthash.c', 'third_party/superfasthash/superfasthash.c',
'third_party/xdg_mime/xdgmime.h', 'third_party/xdg_mime/xdgmime.h',
'thread_task_runner_handle.cc', 'thread_task_runner_handle.cc',
diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/BUILD.gn diff -ur qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/BUILD.gn
--- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn 2016-01-12 03:03:08.040591492 +0100 --- qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn 2016-07-17 16:52:03.642799111 +0200
+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/BUILD.gn 2016-01-12 03:04:27.209025094 +0100 +++ qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/BUILD.gn 2016-07-17 17:20:50.667600425 +0200
@@ -504,8 +504,6 @@ @@ -741,8 +741,6 @@
"third_party/dmg_fp/dmg_fp.h", "third_party/dmg_fp/dmg_fp.h",
"third_party/dmg_fp/dtoa_wrapper.cc", "third_party/dmg_fp/dtoa_wrapper.cc",
"third_party/dmg_fp/g_fmt.cc", "third_party/dmg_fp/g_fmt.cc",
@ -22,10 +22,10 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
"third_party/superfasthash/superfasthash.c", "third_party/superfasthash/superfasthash.c",
"thread_task_runner_handle.cc", "thread_task_runner_handle.cc",
"thread_task_runner_handle.h", "thread_task_runner_handle.h",
diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/files/file_path.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/files/file_path.cc diff -ur qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/files/file_path.cc qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/files/file_path.cc
--- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/files/file_path.cc 2015-12-10 18:17:21.000000000 +0100 --- qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/files/file_path.cc 2016-05-26 15:53:47.000000000 +0200
+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/files/file_path.cc 2016-01-12 03:09:08.430565334 +0100 +++ qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/files/file_path.cc 2016-07-17 17:20:50.668600430 +0200
@@ -20,7 +20,7 @@ @@ -18,7 +18,7 @@
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_cftyperef.h"
@ -34,7 +34,7 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
#endif #endif
#if defined(OS_WIN) #if defined(OS_WIN)
@@ -1140,9 +1140,9 @@ @@ -1138,9 +1138,9 @@
int* index) { int* index) {
int codepoint = 0; int codepoint = 0;
while (*index < length && codepoint == 0) { while (*index < length && codepoint == 0) {
@ -46,10 +46,10 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
DCHECK_GT(codepoint, 0); DCHECK_GT(codepoint, 0);
if (codepoint > 0) { if (codepoint > 0) {
// Check if there is a subtable for this upper byte. // Check if there is a subtable for this upper byte.
diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/json_parser.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/json_parser.cc diff -ur qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/json/json_parser.cc qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/json/json_parser.cc
--- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/json_parser.cc 2015-12-10 18:17:21.000000000 +0100 --- qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/json/json_parser.cc 2016-05-26 15:53:47.000000000 +0200
+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/json_parser.cc 2016-01-12 03:12:23.701634827 +0100 +++ qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/json/json_parser.cc 2016-07-17 17:25:23.443128277 +0200
@@ -14,7 +14,7 @@ @@ -15,7 +15,7 @@
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversion_utils.h" #include "base/strings/utf_string_conversion_utils.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
@ -58,8 +58,8 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
#include "base/values.h" #include "base/values.h"
namespace base { namespace base {
@@ -616,8 +616,8 @@ @@ -625,8 +625,8 @@
int32 next_char = 0; int32_t next_char = 0;
while (CanConsume(1)) { while (CanConsume(1)) {
- pos_ = start_pos_ + index_; // CBU8_NEXT is postcrement. - pos_ = start_pos_ + index_; // CBU8_NEXT is postcrement.
@ -69,7 +69,7 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
if (next_char < 0 || !IsValidCharacter(next_char)) { if (next_char < 0 || !IsValidCharacter(next_char)) {
ReportError(JSONReader::JSON_UNSUPPORTED_ENCODING, 1); ReportError(JSONReader::JSON_UNSUPPORTED_ENCODING, 1);
return false; return false;
@@ -710,7 +710,7 @@ @@ -719,7 +719,7 @@
return false; return false;
} }
} else if (next_char == '"') { } else if (next_char == '"') {
@ -78,7 +78,7 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
out->Swap(&string); out->Swap(&string);
return true; return true;
} else { } else {
@@ -750,10 +750,10 @@ @@ -759,10 +759,10 @@
// If this is a high surrogate, consume the next code unit to get the // If this is a high surrogate, consume the next code unit to get the
// low surrogate. // low surrogate.
@ -91,7 +91,7 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
return false; return false;
// Make sure that the token has more characters to consume the // Make sure that the token has more characters to consume the
@@ -770,24 +770,24 @@ @@ -779,24 +779,24 @@
NextNChars(3); NextNChars(3);
@ -100,10 +100,9 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
return false; return false;
} }
- uint32 code_point = CBU16_GET_SUPPLEMENTARY(code_unit16_high, uint32_t code_point =
- code_unit16_low); - CBU16_GET_SUPPLEMENTARY(code_unit16_high, code_unit16_low);
+ uint32 code_point = U16_GET_SUPPLEMENTARY(code_unit16_high, + U16_GET_SUPPLEMENTARY(code_unit16_high, code_unit16_low);
+ code_unit16_low);
if (!IsValidCharacter(code_point)) if (!IsValidCharacter(code_point))
return false; return false;
@ -122,7 +121,7 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
} }
dest_string->append(code_unit8); dest_string->append(code_unit8);
@@ -804,9 +804,9 @@ @@ -813,9 +813,9 @@
} else { } else {
char utf8_units[4] = { 0 }; char utf8_units[4] = { 0 };
int offset = 0; int offset = 0;
@ -134,10 +133,10 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
// zero terminated at this point. |offset| contains the correct length. // zero terminated at this point. |offset| contains the correct length.
dest->AppendString(std::string(utf8_units, offset)); dest->AppendString(std::string(utf8_units, offset));
} }
diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/string_escape.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/string_escape.cc diff -ur qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/json/string_escape.cc qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/json/string_escape.cc
--- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/string_escape.cc 2015-12-10 18:17:21.000000000 +0100 --- qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/json/string_escape.cc 2016-05-26 15:53:47.000000000 +0200
+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/string_escape.cc 2016-01-12 03:12:46.093757468 +0100 +++ qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/json/string_escape.cc 2016-07-17 17:20:50.668600430 +0200
@@ -10,7 +10,7 @@ @@ -14,7 +14,7 @@
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversion_utils.h" #include "base/strings/utf_string_conversion_utils.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
@ -146,9 +145,9 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
namespace base { namespace base {
diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/pattern.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/pattern.cc diff -ur qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/strings/pattern.cc qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/strings/pattern.cc
--- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/pattern.cc 2015-12-10 18:17:21.000000000 +0100 --- qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/strings/pattern.cc 2016-05-26 15:53:47.000000000 +0200
+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/pattern.cc 2016-01-12 03:14:17.884254687 +0100 +++ qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/strings/pattern.cc 2016-07-17 17:20:50.669600436 +0200
@@ -4,13 +4,13 @@ @@ -4,13 +4,13 @@
#include "base/strings/pattern.h" #include "base/strings/pattern.h"
@ -204,10 +203,10 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
*p += offset; *p += offset;
return c; return c;
} }
diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_split.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_split.cc diff -ur qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_split.cc qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/strings/string_split.cc
--- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_split.cc 2015-12-10 18:17:21.000000000 +0100 --- qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_split.cc 2016-05-26 15:53:47.000000000 +0200
+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_split.cc 2016-01-12 03:14:39.106365912 +0100 +++ qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/strings/string_split.cc 2016-07-17 17:20:50.669600436 +0200
@@ -6,7 +6,7 @@ @@ -8,7 +8,7 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
@ -216,28 +215,10 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
namespace base { namespace base {
@@ -201,7 +201,7 @@ diff -ur qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_util.cc qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/strings/string_util.cc
void SplitString(const string16& str, --- qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_util.cc 2016-05-26 15:53:47.000000000 +0200
char16 c, +++ qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/strings/string_util.cc 2016-07-17 17:29:39.032552674 +0200
std::vector<string16>* result) { @@ -26,7 +26,7 @@
- DCHECK(CBU16_IS_SINGLE(c));
+ DCHECK(U16_IS_SINGLE(c));
*result = SplitStringT<string16, string16, char16>(
str, c, TRIM_WHITESPACE, SPLIT_WANT_ALL);
@@ -274,7 +274,7 @@
void SplitStringDontTrim(StringPiece16 str,
char16 c,
std::vector<string16>* result) {
- DCHECK(CBU16_IS_SINGLE(c));
+ DCHECK(U16_IS_SINGLE(c));
*result = SplitStringT<string16, string16, char16>(
str, c, KEEP_WHITESPACE, SPLIT_WANT_ALL);
}
diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_util.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_util.cc
--- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_util.cc 2015-12-10 18:17:21.000000000 +0100
+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_util.cc 2016-01-12 03:15:00.981480560 +0100
@@ -24,7 +24,7 @@
#include "base/strings/string_split.h" #include "base/strings/string_split.h"
#include "base/strings/utf_string_conversion_utils.h" #include "base/strings/utf_string_conversion_utils.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
@ -245,15 +226,15 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
+#include <unicode/utf.h> +#include <unicode/utf.h>
#include "build/build_config.h" #include "build/build_config.h"
// Remove when this entire file is in the base namespace. namespace base {
@@ -274,19 +274,19 @@ @@ -358,19 +358,19 @@
return;
} }
DCHECK_LE(byte_size, static_cast<uint32>(kint32max)); DCHECK_LE(byte_size,
- // Note: This cast is necessary because CBU8_NEXT uses int32s. static_cast<uint32_t>(std::numeric_limits<int32_t>::max()));
+ // Note: This cast is necessary because U8_NEXT uses int32s. - // Note: This cast is necessary because CBU8_NEXT uses int32_ts.
int32 truncation_length = static_cast<int32>(byte_size); + // Note: This cast is necessary because U8_NEXT uses int32_ts.
int32 char_index = truncation_length - 1; int32_t truncation_length = static_cast<int32_t>(byte_size);
int32_t char_index = truncation_length - 1;
const char* data = input.data(); const char* data = input.data();
- // Using CBU8, we will move backwards from the truncation point - // Using CBU8, we will move backwards from the truncation point
@ -262,7 +243,7 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
// character. Once a full UTF8 character is found, we will // character. Once a full UTF8 character is found, we will
// truncate the string to the end of that character. // truncate the string to the end of that character.
while (char_index >= 0) { while (char_index >= 0) {
int32 prev = char_index; int32_t prev = char_index;
- base_icu::UChar32 code_point = 0; - base_icu::UChar32 code_point = 0;
- CBU8_NEXT(data, char_index, truncation_length, code_point); - CBU8_NEXT(data, char_index, truncation_length, code_point);
+ UChar32 code_point = 0; + UChar32 code_point = 0;
@ -270,18 +251,18 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
if (!IsValidCharacter(code_point) || if (!IsValidCharacter(code_point) ||
!IsValidCodepoint(code_point)) { !IsValidCodepoint(code_point)) {
char_index = prev - 1; char_index = prev - 1;
@@ -447,7 +447,7 @@ @@ -523,7 +523,7 @@
while (char_index < src_len) { while (char_index < src_len) {
int32 code_point; int32_t code_point;
- CBU8_NEXT(src, char_index, src_len, code_point); - CBU8_NEXT(src, char_index, src_len, code_point);
+ U8_NEXT(src, char_index, src_len, code_point); + U8_NEXT(src, char_index, src_len, code_point);
if (!IsValidCharacter(code_point)) if (!IsValidCharacter(code_point))
return false; return false;
} }
diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc diff -ur qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc
--- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc 2015-12-10 18:17:21.000000000 +0100 --- qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc 2016-05-26 15:53:47.000000000 +0200
+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc 2016-01-12 03:15:27.384618939 +0100 +++ qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc 2016-07-17 17:31:29.363164013 +0200
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
#include "base/strings/utf_string_conversion_utils.h" #include "base/strings/utf_string_conversion_utils.h"
@ -294,16 +275,16 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
// use a signed type for code_point. But this function returns false // use a signed type for code_point. But this function returns false
// on error anyway, so code_point_out is unsigned. // on error anyway, so code_point_out is unsigned.
int32 code_point; int32_t code_point;
- CBU8_NEXT(src, *char_index, src_len, code_point); - CBU8_NEXT(src, *char_index, src_len, code_point);
+ U8_NEXT(src, *char_index, src_len, code_point); + U8_NEXT(src, *char_index, src_len, code_point);
*code_point_out = static_cast<uint32>(code_point); *code_point_out = static_cast<uint32_t>(code_point);
// The ICU macro above moves to the next char, we want to point to the last // The ICU macro above moves to the next char, we want to point to the last
@@ -33,16 +33,16 @@ @@ -33,16 +33,16 @@
int32 src_len, int32_t src_len,
int32* char_index, int32_t* char_index,
uint32* code_point) { uint32_t* code_point) {
- if (CBU16_IS_SURROGATE(src[*char_index])) { - if (CBU16_IS_SURROGATE(src[*char_index])) {
- if (!CBU16_IS_SURROGATE_LEAD(src[*char_index]) || - if (!CBU16_IS_SURROGATE_LEAD(src[*char_index]) ||
+ if (U16_IS_SURROGATE(src[*char_index])) { + if (U16_IS_SURROGATE(src[*char_index])) {
@ -342,7 +323,7 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
return char_offset - original_char_offset; return char_offset - original_char_offset;
} }
size_t WriteUnicodeCharacter(uint32 code_point, string16* output) { size_t WriteUnicodeCharacter(uint32_t code_point, string16* output) {
- if (CBU16_LENGTH(code_point) == 1) { - if (CBU16_LENGTH(code_point) == 1) {
+ if (U16_LENGTH(code_point) == 1) { + if (U16_LENGTH(code_point) == 1) {
// Thie code point is in the Basic Multilingual Plane (BMP). // Thie code point is in the Basic Multilingual Plane (BMP).
@ -360,9 +341,9 @@ diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/c
} }
// Generalized Unicode converter ----------------------------------------------- // Generalized Unicode converter -----------------------------------------------
diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc diff -ur qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc
--- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc 2015-12-10 18:17:21.000000000 +0100 --- qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc 2016-05-26 15:53:47.000000000 +0200
+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc 2016-01-12 03:15:51.205743785 +0100 +++ qtwebengine-opensource-src-5.7.0-system-icu-utf/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc 2016-07-17 17:20:50.687600537 +0200
@@ -5,13 +5,13 @@ @@ -5,13 +5,13 @@
#include "ui/gfx/utf16_indexing.h" #include "ui/gfx/utf16_indexing.h"

48
qtwebengine-opensource-src-5.7.0-system-nspr-prtime.patch
Unescape View File

@ -0,0 +1,48 @@
diff -ur qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/base.gypi qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi
--- qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/base.gypi 2016-05-26 15:53:47.000000000 +0200
+++ qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi 2016-07-17 16:52:03.641799106 +0200
@@ -634,8 +634,6 @@
'third_party/dmg_fp/g_fmt.cc',
'third_party/icu/icu_utf.cc',
'third_party/icu/icu_utf.h',
- 'third_party/nspr/prtime.cc',
- 'third_party/nspr/prtime.h',
'third_party/superfasthash/superfasthash.c',
'third_party/xdg_mime/xdgmime.h',
'thread_task_runner_handle.cc',
diff -ur qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn
--- qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/BUILD.gn 2016-05-26 15:53:47.000000000 +0200
+++ qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn 2016-07-17 16:52:03.642799111 +0200
@@ -743,8 +743,6 @@
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
- "third_party/nspr/prtime.cc",
- "third_party/nspr/prtime.h",
"third_party/superfasthash/superfasthash.c",
"thread_task_runner_handle.cc",
"thread_task_runner_handle.h",
diff -ur qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/time/pr_time_unittest.cc qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc
--- qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2016-05-26 15:53:47.000000000 +0200
+++ qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2016-07-17 16:55:11.749868819 +0200
@@ -7,7 +7,7 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr4/prtime.h>
#include "base/time/time.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
diff -ur qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/time/time.cc qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc
--- qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/time/time.cc 2016-05-26 15:53:47.000000000 +0200
+++ qtwebengine-opensource-src-5.7.0-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc 2016-07-17 16:55:54.895115802 +0200
@@ -14,7 +14,7 @@
#include "base/logging.h"
#include "base/macros.h"
#include "base/strings/stringprintf.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr4/prtime.h>
#include "build/build_config.h"
namespace base {
Write Preview
Loading…
Cancel
Save