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

Revert "- Fix icu and nspr patches. One to go"

Browse Source 
This reverts commit ee046f9af5.

I already told you last time (5.8) that this way of maintaining patches
(importing them all into git and reexporting them from there each time)
is not how I work (I want only those patches rebased and renamed that
actually need rebasing) and that you are only causing me more work.

Please keep your hands off my package from now on.
epel9
Kevin Kofler 8 years ago
parent ee046f9af5
commit e83ec109c8
7 changed files with 28 additions and 88 deletions
Show Stats Download Patch File Download Diff File

26
0002-qtwebengine-opensource-src-5.9.0-system-nspr-prtime.patch
Unescape View File

@ -1,14 +1,13 @@
From 1592ad223b8fe064a72e21e54d36de4bc9949756 Mon Sep 17 00:00:00 2001
From 60434d58353db516e795e12817e1953700f9e5e4 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio@kde.org>
Date: Wed, 31 May 2017 10:46:36 +0200
Subject: [PATCH] qtwebengine-opensource-src-5.9.0-system-nspr-prtime
---
src/3rdparty/chromium/base/BUILD.gn | 2 --
src/3rdparty/chromium/base/time/pr_time_unittest.cc | 2 +-
src/3rdparty/chromium/base/time/time.cc | 2 +-
src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py | 4 ++++
4 files changed, 6 insertions(+), 4 deletions(-)
src/3rdparty/chromium/base/BUILD.gn | 2 --
src/3rdparty/chromium/base/time/pr_time_unittest.cc | 2 +-
src/3rdparty/chromium/base/time/time.cc | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/3rdparty/chromium/base/BUILD.gn b/src/3rdparty/chromium/base/BUILD.gn
index f2672cba7..66f2be1ff 100644
@ -50,21 +49,6 @@ index 4e942015f..29fde71dd 100644
#include "build/build_config.h"
namespace base {
diff --git a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
index 43d252b43..fc7efd80a 100755
--- a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
+++ b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
@@ -576,6 +576,10 @@ def write_gn_ninja(path, root_gen_dir, options):
if is_linux:
libs.extend(['-lrt'])
+ libs.extend(['-lplds4'])
+ libs.extend(['-lplc4'])
+ libs.extend(['-lnspr4'])
+
ldflags.extend(['-pthread'])
static_libraries['xdg_user_dirs'] = {
--
2.13.0

80
0003-qtwebengine-opensource-src-5.9.0-system-icu-utf.patch
Unescape View File

@ -1,27 +1,26 @@
From dff1d03d1c4936183c46ff13f2bbd65901cf4ebb Mon Sep 17 00:00:00 2001
From 63abd7883643841941505c82d42589d8d6814478 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio@kde.org>
Date: Wed, 31 May 2017 11:16:12 +0200
Subject: [PATCH] qtwebengine-opensource-src-5.9.0-system-icu-utf
---
src/3rdparty/chromium/base/BUILD.gn | 4 +--
src/3rdparty/chromium/base/BUILD.gn | 2 --
src/3rdparty/chromium/base/files/file_path.cc | 6 ++---
src/3rdparty/chromium/base/json/json_parser.cc | 28 ++++++++++----------
src/3rdparty/chromium/base/json/string_escape.cc | 2 +-
src/3rdparty/chromium/base/strings/pattern.cc | 21 ++++++++-------
src/3rdparty/chromium/base/strings/pattern.cc | 9 +++----
src/3rdparty/chromium/base/strings/string_split.cc | 2 +-
src/3rdparty/chromium/base/strings/string_util.cc | 12 ++++-----
src/3rdparty/chromium/base/strings/string_util.cc | 10 ++++----
.../base/strings/utf_string_conversion_utils.cc | 28 ++++++++++----------
.../chromium/base/third_party/icu/icu_utf.cc | 30 +++++++++++-----------
.../browser/devtools/devtools_io_context.cc | 4 +--
.../chromium/net/cert/internal/parse_name.cc | 6 ++---
.../chromium/tools/gn/bootstrap/bootstrap.py | 3 +++
.../chromium/ui/base/ime/input_method_chromeos.cc | 2 +-
src/3rdparty/chromium/ui/gfx/utf16_indexing.cc | 4 +--
14 files changed, 77 insertions(+), 75 deletions(-)
13 files changed, 65 insertions(+), 68 deletions(-)
diff --git a/src/3rdparty/chromium/base/BUILD.gn b/src/3rdparty/chromium/base/BUILD.gn
index 66f2be1ff..a7d384ca4 100644
index 66f2be1ff..51faf08ad 100644
--- a/src/3rdparty/chromium/base/BUILD.gn
+++ b/src/3rdparty/chromium/base/BUILD.gn
@@ -831,8 +831,6 @@ component("base") {
@ -33,15 +32,6 @@ index 66f2be1ff..a7d384ca4 100644
"third_party/superfasthash/superfasthash.c",
"threading/non_thread_safe.h",
"threading/non_thread_safe_impl.cc",
@@ -1357,6 +1355,8 @@ component("base") {
linux_configs += [ "//build/config/linux:glib" ]
}
+ libs += [ "icu18n" ]
+
defines += [ "USE_SYMBOLIZE" ]
configs += linux_configs
diff --git a/src/3rdparty/chromium/base/files/file_path.cc b/src/3rdparty/chromium/base/files/file_path.cc
index cff862ae1..b17b46e5f 100644
--- a/src/3rdparty/chromium/base/files/file_path.cc
@ -175,10 +165,10 @@ index f67fa93bf..907b80a73 100644
namespace base {
diff --git a/src/3rdparty/chromium/base/strings/pattern.cc b/src/3rdparty/chromium/base/strings/pattern.cc
index af30aab86..c4ce6fc86 100644
index af30aab86..7df8f7255 100644
--- a/src/3rdparty/chromium/base/strings/pattern.cc
+++ b/src/3rdparty/chromium/base/strings/pattern.cc
@@ -3,14 +3,13 @@
@@ -3,8 +3,7 @@
// found in the LICENSE file.
#include "base/strings/pattern.h"
@ -188,46 +178,27 @@ index af30aab86..c4ce6fc86 100644
namespace base {
namespace {
-static bool IsWildcard(base_icu::UChar32 character) {
+static bool IsWildcard(UChar32 character) {
return character == '*' || character == '?';
}
@@ -37,9 +36,9 @@ static void EatSameChars(const CHAR** pattern, const CHAR* pattern_end,
// Check if the chars match, if so, increment the ptrs.
const CHAR* pattern_next = *pattern;
@@ -39,7 +38,7 @@ static void EatSameChars(const CHAR** pattern, const CHAR* pattern_end,
const CHAR* string_next = *string;
- base_icu::UChar32 pattern_char = next(&pattern_next, pattern_end);
+ UChar32 pattern_char = next(&pattern_next, pattern_end);
base_icu::UChar32 pattern_char = next(&pattern_next, pattern_end);
if (pattern_char == next(&string_next, string_end) &&
- pattern_char != CBU_SENTINEL) {
+ pattern_char != U_SENTINEL) {
*pattern = pattern_next;
*string = string_next;
} else {
@@ -133,20 +132,20 @@ static bool MatchPatternT(const CHAR* eval, const CHAR* eval_end,
}
struct NextCharUTF8 {
- base_icu::UChar32 operator()(const char** p, const char* end) {
- base_icu::UChar32 c;
+ UChar32 operator()(const char** p, const char* end) {
+ UChar32 c;
@@ -136,7 +135,7 @@ struct NextCharUTF8 {
base_icu::UChar32 operator()(const char** p, const char* end) {
base_icu::UChar32 c;
int offset = 0;
- CBU8_NEXT(*p, offset, end - *p, c);
+ U8_NEXT(*p, offset, end - *p, c);
*p += offset;
return c;
}
};
struct NextCharUTF16 {
- base_icu::UChar32 operator()(const char16** p, const char16* end) {
- base_icu::UChar32 c;
+ UChar32 operator()(const char16** p, const char16* end) {
+ UChar32 c;
@@ -146,7 +145,7 @@ struct NextCharUTF16 {
base_icu::UChar32 operator()(const char16** p, const char16* end) {
base_icu::UChar32 c;
int offset = 0;
- CBU16_NEXT(*p, offset, end - *p, c);
+ U16_NEXT(*p, offset, end - *p, c);
@ -248,7 +219,7 @@ index a8180b24d..ac771a0f0 100644
namespace base {
diff --git a/src/3rdparty/chromium/base/strings/string_util.cc b/src/3rdparty/chromium/base/strings/string_util.cc
index cb668ed7f..c57ccf391 100644
index cb668ed7f..542f12819 100644
--- a/src/3rdparty/chromium/base/strings/string_util.cc
+++ b/src/3rdparty/chromium/base/strings/string_util.cc
@@ -25,7 +25,7 @@
@ -277,9 +248,8 @@ index cb668ed7f..c57ccf391 100644
// truncate the string to the end of that character.
while (char_index >= 0) {
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);
+ UChar32 code_point = 0;
+ U8_NEXT(data, char_index, truncation_length, code_point);
if (!IsValidCharacter(code_point) ||
!IsValidCodepoint(code_point)) {
@ -544,20 +514,6 @@ index bb9b64051..5eaeb52d0 100644
return false;
base::WriteUnicodeCharacter(codepoint, out);
diff --git a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
index fc7efd80a..6dcec7f0e 100755
--- a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
+++ b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
@@ -579,6 +579,9 @@ def write_gn_ninja(path, root_gen_dir, options):
libs.extend(['-lplds4'])
libs.extend(['-lplc4'])
libs.extend(['-lnspr4'])
+ libs.extend(['-licui18n'])
+ libs.extend(['-licuuc'])
+ libs.extend(['-licudata'])
ldflags.extend(['-pthread'])
diff --git a/src/3rdparty/chromium/ui/base/ime/input_method_chromeos.cc b/src/3rdparty/chromium/ui/base/ime/input_method_chromeos.cc
index a8ac9028f..8fa5d2a64 100644
--- a/src/3rdparty/chromium/ui/base/ime/input_method_chromeos.cc

2
0004-qtwebengine-opensource-src-5.9.0-no-sse2.patch
Unescape View File

@ -1,4 +1,4 @@
From 6b733561c390650c11f8e570f59374dde04bed5e Mon Sep 17 00:00:00 2001
From 844246bd10971ec348f044bc7a13acb17b9ce033 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio@kde.org>
Date: Wed, 31 May 2017 14:38:20 +0200
Subject: [PATCH] qtwebengine-opensource-src-5.9.0-no-sse2

2
0005-qtwebengine-opensource-src-5.9.-openmax-dl-neon.patch
Unescape View File

@ -1,4 +1,4 @@
From 707210834b559d54fc7d9dd39a087041d668c9b8 Mon Sep 17 00:00:00 2001
From 8bad8aac82444a9e1feda3f1a8b214b81be8a8fc Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio@kde.org>
Date: Wed, 31 May 2017 15:02:52 +0200
Subject: [PATCH] qtwebengine-opensource-src-5.9.-openmax-dl-neon

2
0006-qtwebengine-opensource-src-5.9.0-linux-pri.patch
Unescape View File

@ -1,4 +1,4 @@
From c509c48670c74b4b29be32f9d6d8ca7687ffd340 Mon Sep 17 00:00:00 2001
From a7885b823a2d3fc853f532fb5ae3a43a3e9967c0 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio@kde.org>
Date: Wed, 31 May 2017 15:13:15 +0200
Subject: [PATCH] qtwebengine-opensource-src-5.9.0-linux-pri

2
0007-qtwebengine-opensource-src-5.9.0-no-icudtl-dat.patch
Unescape View File

@ -1,4 +1,4 @@
From 3edff809547a66830834ed687f138c37f912ee70 Mon Sep 17 00:00:00 2001
From 99294d646e58bcbedc5987a1816fed592290566f Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio@kde.org>
Date: Wed, 31 May 2017 15:16:56 +0200
Subject: [PATCH] qtwebengine-opensource-src-5.9.0-no-icudtl-dat

2
qt5-qtwebengine.spec
Unescape View File

@ -368,7 +368,7 @@ export CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ -g / -g1 /g'`
mkdir %{_target_platform}
pushd %{_target_platform}
%{qmake_qt5} CONFIG+="webcore_debug v8base_debug use_system_icu force_debug_info" \
%{qmake_qt5} CONFIG+="webcore_debug v8base_debug force_debug_info" \
WEBENGINE_CONFIG+="use_system_icu use_system_protobuf use_spellchecker" ..
# if we keep these set here, gyp picks up duplicate flags

Write Preview
Loading…
Cancel
Save