commit: 644e800117e287881c134deb2732fe43c0532847 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sun Oct 1 17:36:12 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Oct 2 21:26:47 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=644e8001
www-client/chromium: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/5833 .../files/chromium-FORTIFY_SOURCE-r1.patch | 29 --- .../chromium/files/chromium-FORTIFY_SOURCE.patch | 27 --- .../chromium/files/chromium-dma-buf-r1.patch | 21 -- .../chromium/files/chromium-gn-bootstrap-r15.patch | 11 - .../chromium/files/chromium-gn-bootstrap-r16.patch | 11 - .../chromium/files/chromium-gn-bootstrap-r18.patch | 19 -- .../chromium/files/chromium-gn-bootstrap-r8.patch | 13 -- .../chromium/files/chromium-major-minor.patch | 97 --------- .../chromium/files/chromium-system-ffmpeg-r6.patch | 43 ---- .../chromium/files/chromium-system-icu-r1.patch | 224 --------------------- .../chromium/files/chromium-system-icu-r2.patch | 10 - .../chromium/files/chromium-system-zlib-r1.patch | 22 -- www-client/chromium/files/skia-avx2.patch | 15 -- 13 files changed, 542 deletions(-) diff --git a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch b/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch deleted file mode 100644 index d92863dd819..00000000000 --- a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch +++ /dev/null @@ -1,29 +0,0 @@ -Drop _FORTIFY_SOURCE=2 from defines - -Gentoo toolchains enable this by default. Removing this prevents spammy -warnings about the macro being redefined. - ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -1161,21 +1161,6 @@ - "__STDC_FORMAT_MACROS", - ] - -- if (!is_debug && !using_sanitizer && -- (!is_linux || !is_clang || is_official_build) && -- current_cpu != "s390x" && current_cpu != "s390" && -- current_cpu != "ppc64" && current_cpu != "ppc64") { -- # _FORTIFY_SOURCE isn't really supported by Clang now, see -- # http://llvm.org/bugs/show_bug.cgi?id=16821. -- # It seems to work fine with Ubuntu 12 headers though, so use it in -- # official builds. -- # -- # Non-chromium code is not guaranteed to compile cleanly with -- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are -- # disabled, so only do that for Release build. -- defines += [ "_FORTIFY_SOURCE=2" ] -- } -- - if (is_mac || is_ios) { - cflags_objc = [ "-Wobjc-missing-property-synthesis" ] - cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] diff --git a/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch b/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch deleted file mode 100644 index c6477d69087..00000000000 --- a/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch +++ /dev/null @@ -1,27 +0,0 @@ -Drop _FORTIFY_SOURCE=2 from defines - -Gentoo toolchains enable this by default. Removing this prevents spammy -warnings about the macro being redefined. - ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -1069,19 +1069,6 @@ config("chromium_code") { - "__STDC_FORMAT_MACROS", - ] - -- if (!is_debug && !using_sanitizer && -- (!is_linux || !is_clang || is_official_build)) { -- # _FORTIFY_SOURCE isn't really supported by Clang now, see -- # http://llvm.org/bugs/show_bug.cgi?id=16821. -- # It seems to work fine with Ubuntu 12 headers though, so use it in -- # official builds. -- # -- # Non-chromium code is not guaranteed to compile cleanly with -- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are -- # disabled, so only do that for Release build. -- defines += [ "_FORTIFY_SOURCE=2" ] -- } -- - if (is_mac || is_ios) { - cflags_objc = [ "-Wobjc-missing-property-synthesis" ] - cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] diff --git a/www-client/chromium/files/chromium-dma-buf-r1.patch b/www-client/chromium/files/chromium-dma-buf-r1.patch deleted file mode 100644 index 6cc8d087d3f..00000000000 --- a/www-client/chromium/files/chromium-dma-buf-r1.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2017-03-29 15:08:58.079790070 +0000 -+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc 2017-03-29 15:09:10.068039324 +0000 -@@ -17,7 +17,6 @@ - #include "base/strings/stringprintf.h" - #include "base/trace_event/trace_event.h" - --#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) - #include <linux/types.h> - - struct local_dma_buf_sync { -@@ -35,10 +34,6 @@ - #define LOCAL_DMA_BUF_IOCTL_SYNC \ - _IOW(LOCAL_DMA_BUF_BASE, 0, struct local_dma_buf_sync) - --#else --#include <linux/dma-buf.h> --#endif -- - namespace gfx { - - namespace { diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r15.patch b/www-client/chromium/files/chromium-gn-bootstrap-r15.patch deleted file mode 100644 index 726dca2e903..00000000000 --- a/www-client/chromium/files/chromium-gn-bootstrap-r15.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -550,8 +550,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/trace_event/memory_peak_detector.cc', - 'base/trace_event/memory_usage_estimator.cc', - 'base/trace_event/process_memory_dump.cc', -- 'base/trace_event/process_memory_maps.cc', -- 'base/trace_event/process_memory_totals.cc', - 'base/trace_event/sharded_allocation_register.cc', - 'base/trace_event/trace_buffer.cc', - 'base/trace_event/trace_config.cc', diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r16.patch b/www-client/chromium/files/chromium-gn-bootstrap-r16.patch deleted file mode 100644 index a2b4394d251..00000000000 --- a/www-client/chromium/files/chromium-gn-bootstrap-r16.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py.orig 2017-08-19 09:47:46.919341766 +0000 -+++ b/tools/gn/bootstrap/bootstrap.py 2017-08-19 09:48:07.307745292 +0000 -@@ -348,7 +348,7 @@ - '-pipe', - '-fno-exceptions' - ]) -- cflags_cc.extend(['-std=c++11', '-Wno-c++11-narrowing']) -+ cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing']) - if is_aix: - cflags.extend(['-maix64']) - ldflags.extend([ '-maix64 -Wl,-bbigtoc' ]) diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r18.patch b/www-client/chromium/files/chromium-gn-bootstrap-r18.patch deleted file mode 100644 index 8c9c27121cd..00000000000 --- a/www-client/chromium/files/chromium-gn-bootstrap-r18.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -481,8 +481,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/process/process_handle.cc', - 'base/process/process_iterator.cc', - 'base/process/process_metrics.cc', -- 'base/profiler/scoped_profile.cc', -- 'base/profiler/scoped_tracker.cc', - 'base/rand_util.cc', - 'base/run_loop.cc', - 'base/sequence_token.cc', -@@ -579,7 +577,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/trace_event/trace_log_constants.cc', - 'base/trace_event/tracing_agent.cc', - 'base/tracked_objects.cc', -- 'base/tracking_info.cc', - 'base/unguessable_token.cc', - 'base/value_iterators.cc', - 'base/values.cc', diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r8.patch b/www-client/chromium/files/chromium-gn-bootstrap-r8.patch deleted file mode 100644 index d9f389aaf58..00000000000 --- a/www-client/chromium/files/chromium-gn-bootstrap-r8.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tools/gn/bootstrap/bootstrap.py -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/sys_info.cc', - 'base/task_runner.cc', - 'base/task_scheduler/delayed_task_manager.cc', -+ 'base/task_scheduler/environment_config.cc', - 'base/task_scheduler/post_task.cc', - 'base/task_scheduler/priority_queue.cc', - 'base/task_scheduler/scheduler_lock_impl.cc', diff --git a/www-client/chromium/files/chromium-major-minor.patch b/www-client/chromium/files/chromium-major-minor.patch deleted file mode 100644 index ab8a701c6c1..00000000000 --- a/www-client/chromium/files/chromium-major-minor.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 11e48b29d00fdd714c3ff3f8ebe0d51a2c4ce61c Mon Sep 17 00:00:00 2001 -From: Dongseong Hwang <dongseong.hw...@intel.com> -Date: Tue, 11 Jul 2017 17:20:06 +0000 -Subject: [PATCH] ozone: drm: Remove the debug details when dmabuf mmap fails. - -As we fixed mmap failure, remove the redundant crash reports. -The CL adding the info: crrev.com/2710183005 - -BUG=629521 - -Change-Id: I8de9f16a3fce4a42500fe9c5e2843615940e184e -Reviewed-on: https://chromium-review.googlesource.com/565805 -Reviewed-by: Daniele Castagna <dcasta...@chromium.org> -Reviewed-by: Robert Sesek <rse...@chromium.org> -Reviewed-by: Dongseong Hwang <dongseong.hw...@intel.com> -Commit-Queue: Dongseong Hwang <dongseong.hw...@intel.com> -Cr-Commit-Position: refs/heads/master@{#485662} ---- - chrome/common/crash_keys.cc | 5 ----- - ui/gfx/linux/client_native_pixmap_dmabuf.cc | 28 +++------------------------- - 2 files changed, 3 insertions(+), 30 deletions(-) - -diff --git a/chrome/common/crash_keys.cc b/chrome/common/crash_keys.cc -index c4b563e0309b..2f1efe6f2334 100644 ---- a/chrome/common/crash_keys.cc -+++ b/chrome/common/crash_keys.cc -@@ -153,11 +153,6 @@ size_t RegisterChromeCrashKeys() { - {kInputEventFilterSendFailure, kSmallSize}, - #if defined(OS_CHROMEOS) - {kNumberOfUsers, kSmallSize}, -- // Temporary for https://crbug.com/629521 -- {"mmap_params", kSmallSize}, -- {"buffer_size", kSmallSize}, -- {"errno", kSmallSize}, -- {"number_of_fds", kSmallSize}, - #endif - #if defined(OS_MACOSX) - {mac::kFirstNSException, kMediumSize}, -diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc -index 4927daf3a61d..e532686a4f5b 100644 ---- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc -+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc -@@ -11,11 +11,9 @@ - #include <sys/mman.h> - #include <xf86drm.h> - --#include "base/debug/crash_logging.h" - #include "base/memory/ptr_util.h" - #include "base/posix/eintr_wrapper.h" - #include "base/process/memory.h" --#include "base/process/process_metrics.h" - #include "base/strings/stringprintf.h" - #include "base/trace_event/trace_event.h" - -@@ -87,36 +85,16 @@ ClientNativePixmapDmaBuf::ClientNativePixmapDmaBuf( - if (mmap_error == ENOMEM) - base::TerminateBecauseOutOfMemory(map_size); - -- // TODO(dcastagna): Remove the following diagnostic information and the -- // associated crash keys once crbug.com/629521 is fixed. - bool fd_valid = fcntl(dmabuf_fd_.get(), F_GETFD) != -1 || - logging::GetLastSystemErrorCode() != EBADF; -- int minor = -1; -- int major = -1; -- struct stat buf; -- if (!fstat(dmabuf_fd_.get(), &buf)) { -- minor = minor(buf.st_dev); -- major = major(buf.st_dev); -- } -- - std::string mmap_params = base::StringPrintf( - "(addr=nullptr, length=%zu, prot=(PROT_READ | PROT_WRITE), " -- "flags=MAP_SHARED, fd=%d[valid=%d, minor=%d, major=%d], offset=0)", -- map_size, dmabuf_fd_.get(), fd_valid, minor, major); -+ "flags=MAP_SHARED, fd=%d[valid=%d], offset=0)", -+ map_size, dmabuf_fd_.get(), fd_valid); - std::string errno_str = logging::SystemErrorCodeToString(mmap_error); -- std::unique_ptr<base::ProcessMetrics> process_metrics( -- base::ProcessMetrics::CreateCurrentProcessMetrics()); -- std::string number_of_fds = -- base::StringPrintf("%d", process_metrics->GetOpenFdCount()); -- base::debug::ScopedCrashKey params_crash_key("mmap_params", mmap_params); -- base::debug::ScopedCrashKey size_crash_key("buffer_size", size.ToString()); -- base::debug::ScopedCrashKey errno_crash_key("errno", errno_str); -- base::debug::ScopedCrashKey number_of_fds_crash_key("number_of_fds", -- number_of_fds); - LOG(ERROR) << "Failed to mmap dmabuf; mmap_params: " << mmap_params - << ", buffer_size: (" << size.ToString() -- << "), errno: " << errno_str -- << " , number_of_fds: " << number_of_fds; -+ << "), errno: " << errno_str; - LOG(ERROR) << "NativePixmapHandle:"; - LOG(ERROR) << "Number of fds: " << handle.fds.size(); - LOG(ERROR) << "Number of planes: " << handle.planes.size(); --- -2.13.3 - diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r6.patch b/www-client/chromium/files/chromium-system-ffmpeg-r6.patch deleted file mode 100644 index d2e0157bfe3..00000000000 --- a/www-client/chromium/files/chromium-system-ffmpeg-r6.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/media/ffmpeg/ffmpeg_common.h.orig 2017-04-07 18:17:22.623538889 +0000 -+++ b/media/ffmpeg/ffmpeg_common.h 2017-04-07 18:18:16.780656283 +0000 -@@ -23,10 +23,12 @@ - - // Include FFmpeg header files. - extern "C" { -+#if !defined(USE_SYSTEM_FFMPEG) - // Disable deprecated features which result in spammy compile warnings. This - // list of defines must mirror those in the 'defines' section of FFmpeg's - // BUILD.gn file or the headers below will generate different structures! - #define FF_API_CONVERGENCE_DURATION 0 -+#endif // !defined(USE_SYSTEM_FFMPEG) - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, -@@ -40,7 +42,9 @@ - MSVC_PUSH_DISABLE_WARNING(4244); - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> -+#if !defined(USE_SYSTEM_FFMPEG) - #include <libavformat/internal.h> -+#endif // !defined(USE_SYSTEM_FFMPEG) - #include <libavformat/avio.h> - #include <libavutil/avutil.h> - #include <libavutil/imgutils.h> ---- a/media/filters/ffmpeg_demuxer.cc.orig 2017-04-07 18:15:14.776901183 +0000 -+++ b/media/filters/ffmpeg_demuxer.cc 2017-04-07 18:15:54.813727201 +0000 -@@ -1223,6 +1223,7 @@ - // If no estimate is found, the stream entry will be kInfiniteDuration. - std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, - kInfiniteDuration); -+#if !defined(USE_SYSTEM_FFMPEG) - const AVFormatInternal* internal = format_context->internal; - if (internal && internal->packet_buffer && - format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { -@@ -1246,6 +1247,7 @@ - packet_buffer = packet_buffer->next; - } - } -+#endif // !defined(USE_SYSTEM_FFMPEG) - - std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); - diff --git a/www-client/chromium/files/chromium-system-icu-r1.patch b/www-client/chromium/files/chromium-system-icu-r1.patch deleted file mode 100644 index 6356467c21c..00000000000 --- a/www-client/chromium/files/chromium-system-icu-r1.patch +++ /dev/null @@ -1,224 +0,0 @@ -Index: third_party/WebKit/Source/platform/text/CharacterEmoji.cpp -diff --git a/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp b/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp -index af051b46589bed421afd1da1e44623820c8f9136..60059d25dd808a0a55481d9bec3020b95175e45c 100644 ---- a/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp -+++ b/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp -@@ -192,26 +192,26 @@ static void applyPatternAndFreeze(icu::UnicodeSet* unicodeSet, - DCHECK_EQ(err, U_ZERO_ERROR); - } - --bool Character::isEmoji(UChar32 ch) { -- return Character::isEmojiTextDefault(ch) || -- Character::isEmojiEmojiDefault(ch); -+bool Character::IsEmoji(UChar32 ch) { -+ return Character::IsEmojiTextDefault(ch) || -+ Character::IsEmojiEmojiDefault(ch); - } - --bool Character::isEmojiTextDefault(UChar32 ch) { -+bool Character::IsEmojiTextDefault(UChar32 ch) { - DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojiTextSet, ()); - if (emojiTextSet.isEmpty()) - applyPatternAndFreeze(&emojiTextSet, kEmojiTextPattern); -- return emojiTextSet.contains(ch) && !isEmojiEmojiDefault(ch); -+ return emojiTextSet.contains(ch) && !IsEmojiEmojiDefault(ch); - } - --bool Character::isEmojiEmojiDefault(UChar32 ch) { -+bool Character::IsEmojiEmojiDefault(UChar32 ch) { - DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojiEmojiSet, ()); - if (emojiEmojiSet.isEmpty()) - applyPatternAndFreeze(&emojiEmojiSet, kEmojiEmojiPattern); - return emojiEmojiSet.contains(ch); - } - --bool Character::isEmojiModifierBase(UChar32 ch) { -+bool Character::IsEmojiModifierBase(UChar32 ch) { - DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojieModifierBaseSet, ()); - if (emojieModifierBaseSet.isEmpty()) - applyPatternAndFreeze(&emojieModifierBaseSet, kEmojiModifierBasePattern); -Index: third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp -diff --git a/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp b/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp -index 55c4d36e8c217680da9131aac063e38ad3b1fe3d..f3000190d4473daf39f0bc7fe5c262c21ecca4a0 100644 ---- a/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp -+++ b/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp -@@ -20,7 +20,7 @@ - namespace blink { - - #if defined(USING_SYSTEM_ICU) --static void generate(FILE*) {} -+static void Generate(FILE*) {} - #else - - const UChar32 kMaxCodepoint = 0x10FFFF; -Index: third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp -diff --git a/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp b/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp -index 6d6f6f10e73dd6a413221d1e7f2d1e2a2d674e8b..ddf01cd9e2207bace2a0c4cab461750e86e0bf0d 100644 ---- a/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp -+++ b/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp -@@ -63,16 +63,16 @@ void TextCodecICU::RegisterEncodingNames(EncodingNameRegistrar registrar) { - // apart; ICU treats these names as synonyms. - registrar("ISO-8859-8-I", "ISO-8859-8-I"); - -- int32_t num_encodings = ucnv_countAvailable(); -- for (int32_t i = 0; i < num_encodings; ++i) { -+ int32_t nuencoding_s = ucnv_countAvailable(); -+ for (int32_t i = 0; i < nuencoding_s; ++i) { - const char* name = ucnv_getAvailableName(i); - UErrorCode error = U_ZERO_ERROR; - #if !defined(USING_SYSTEM_ICU) - const char* primary_standard = "HTML"; - const char* secondary_standard = "MIME"; - #else -- const char* primaryStandard = "MIME"; -- const char* secondaryStandard = "IANA"; -+ const char* primary_standard = "MIME"; -+ const char* secondary_standard = "IANA"; - #endif - const char* standard_name = - ucnv_getStandardName(name, primary_standard, &error); -@@ -94,20 +94,21 @@ void TextCodecICU::RegisterEncodingNames(EncodingNameRegistrar registrar) { - // encoding for encoding GB_2312-80 and several others. So, we need to - // override this behavior, too. - #if defined(USING_SYSTEM_ICU) -- if (!strcmp(standardName, "GB2312") || !strcmp(standardName, "GB_2312-80")) -- standardName = "GBK"; -+ if (!strcmp(standard_name, "GB2312") || !strcmp(standard_name, "GB_2312-80")) { -+ standard_name = "GBK"; - // Similarly, EUC-KR encodings all map to an extended version, but - // per HTML5, the canonical name still should be EUC-KR. -- else if (!strcmp(standardName, "EUC-KR") || -- !strcmp(standardName, "KSC_5601") || -- !strcmp(standardName, "cp1363")) -- standardName = "EUC-KR"; -+ } else if (!strcmp(standard_name, "EUC-KR") || -+ !strcmp(standard_name, "KSC_5601") || -+ !strcmp(standard_name, "cp1363")) { -+ standard_name = "EUC-KR"; - // And so on. -- else if (!strcasecmp(standardName, "iso-8859-9")) -+ } else if (!strcasecmp(standard_name, "iso-8859-9")) { - // This name is returned in different case by ICU 3.2 and 3.6. -- standardName = "windows-1254"; -- else if (!strcmp(standardName, "TIS-620")) -- standardName = "windows-874"; -+ standard_name = "windows-1254"; -+ } else if (!strcmp(standard_name, "TIS-620")) { -+ standard_name = "windows-874"; -+ } - #endif - - registrar(standard_name, standard_name); -@@ -229,8 +230,8 @@ void TextCodecICU::RegisterCodecs(TextCodecRegistrar registrar) { - // See comment above in registerEncodingNames. - registrar("ISO-8859-8-I", Create, 0); - -- int32_t num_encodings = ucnv_countAvailable(); -- for (int32_t i = 0; i < num_encodings; ++i) { -+ int32_t nuencoding_s = ucnv_countAvailable(); -+ for (int32_t i = 0; i < nuencoding_s; ++i) { - const char* name = ucnv_getAvailableName(i); - UErrorCode error = U_ZERO_ERROR; - const char* standard_name = ucnv_getStandardName(name, "MIME", &error); -@@ -272,7 +273,7 @@ void TextCodecICU::CreateICUConverter() const { - DCHECK(!converter_icu_); - - #if defined(USING_SYSTEM_ICU) -- const char* name = m_encoding.name(); -+ const char* name = encoding_.GetName(); - m_needsGBKFallbacks = - name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3]; - #endif -@@ -393,16 +394,16 @@ String TextCodecICU::Decode(const char* bytes, - // Chrome's copy of ICU does not have the issue described below. - return result.ToString(); - #else -- String resultString = result.toString(); -+ String resultString = result.ToString(); - - // <http://bugs.webkit.org/show_bug.cgi?id=17014> - // Simplified Chinese pages use the code A3A0 to mean "full-width space", but - // ICU decodes it as U+E5E5. -- if (!strcmp(m_encoding.name(), "GBK")) { -- if (!strcasecmp(m_encoding.name(), "gb18030")) -- resultString.replace(0xE5E5, ideographicSpaceCharacter); -+ if (!strcmp(encoding_.GetName(), "GBK")) { -+ if (!strcasecmp(encoding_.GetName(), "gb18030")) -+ resultString.Replace(0xE5E5, ideographicSpaceCharacter); - // Make GBK compliant to the encoding spec and align with GB18030 -- resultString.replace(0x01F9, 0xE7C8); -+ resultString.Replace(0x01F9, 0xE7C8); - // FIXME: Once https://www.w3.org/Bugs/Public/show_bug.cgi?id=28740#c3 - // is resolved, add U+1E3F => 0xE7C7. - } -@@ -506,7 +507,7 @@ static void gbkCallbackEscape(const void* context, - ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err); - return; - } -- numericEntityCallback(context, fromUArgs, codeUnits, length, codePoint, -+ NumericEntityCallback(context, fromUArgs, codeUnits, length, codePoint, - reason, err); - } - -@@ -525,7 +526,7 @@ static void gbkCssEscapedEntityCallack(const void* context, - ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err); - return; - } -- cssEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint, -+ CssEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint, - reason, err); - return; - } -@@ -548,7 +549,7 @@ static void gbkUrlEscapedEntityCallack(const void* context, - ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err); - return; - } -- urlEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint, -+ UrlEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint, - reason, err); - return; - } -@@ -622,7 +623,7 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input, - 0, 0, &err); - #else - ucnv_setFromUCallBack( -- m_converterICU, m_needsGBKFallbacks ? gbkCallbackSubstitute -+ converter_icu_, m_needsGBKFallbacks ? gbkCallbackSubstitute - : UCNV_FROM_U_CALLBACK_SUBSTITUTE, - 0, 0, 0, &err); - #endif -@@ -633,8 +634,8 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input, - &err); - #else - ucnv_setFromUCallBack( -- m_converterICU, -- m_needsGBKFallbacks ? gbkCallbackEscape : numericEntityCallback, 0, 0, -+ converter_icu_, -+ m_needsGBKFallbacks ? gbkCallbackEscape : NumericEntityCallback, 0, 0, - 0, &err); - #endif - break; -@@ -643,9 +644,9 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input, - ucnv_setFromUCallBack(converter_icu_, UrlEscapedEntityCallback, 0, 0, 0, - &err); - #else -- ucnv_setFromUCallBack(m_converterICU, -+ ucnv_setFromUCallBack(converter_icu_, - m_needsGBKFallbacks ? gbkUrlEscapedEntityCallack -- : urlEscapedEntityCallback, -+ : UrlEscapedEntityCallback, - 0, 0, 0, &err); - #endif - break; -@@ -654,9 +655,9 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input, - ucnv_setFromUCallBack(converter_icu_, CssEscapedEntityCallback, 0, 0, 0, - &err); - #else -- ucnv_setFromUCallBack(m_converterICU, -+ ucnv_setFromUCallBack(converter_icu_, - m_needsGBKFallbacks ? gbkCssEscapedEntityCallack -- : cssEscapedEntityCallback, -+ : CssEscapedEntityCallback, - 0, 0, 0, &err); - #endif - break; diff --git a/www-client/chromium/files/chromium-system-icu-r2.patch b/www-client/chromium/files/chromium-system-icu-r2.patch deleted file mode 100644 index 5c12bbb7cf6..00000000000 --- a/www-client/chromium/files/chromium-system-icu-r2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/build/linux/unbundle/icu.gn -+++ b/build/linux/unbundle/icu.gn -@@ -16,6 +16,7 @@ config("icu_config") { - defines = [ - "USING_SYSTEM_ICU=1", - "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC", -+ "UCHAR_TYPE=uint16_t", - ] - } - diff --git a/www-client/chromium/files/chromium-system-zlib-r1.patch b/www-client/chromium/files/chromium-system-zlib-r1.patch deleted file mode 100644 index 23ee934b522..00000000000 --- a/www-client/chromium/files/chromium-system-zlib-r1.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/gpu/command_buffer/service/memory_program_cache.cc -+++ b/gpu/command_buffer/service/memory_program_cache.cc -@@ -226,7 +226,7 @@ bool ProgramBinaryExtensionsAvailable() { - // Returns an empty vector if compression fails. - std::vector<uint8_t> CompressData(const std::vector<uint8_t>& data) { - auto start_time = base::TimeTicks::Now(); -- Cr_z_uLongf compressed_size = compressBound(data.size()); -+ uLongf compressed_size = compressBound(data.size()); - std::vector<uint8_t> compressed_data(compressed_size); - // Level indicates a trade-off between compression and speed. Level 1 - // indicates fastest speed (with worst compression). -@@ -256,8 +256,8 @@ std::vector<uint8_t> DecompressData(const std::vector<uint8_t>& data, - size_t max_size_bytes) { - auto start_time = base::TimeTicks::Now(); - std::vector<uint8_t> decompressed_data(decompressed_size); -- Cr_z_uLongf decompressed_size_out = -- static_cast<Cr_z_uLongf>(decompressed_size); -+ uLongf decompressed_size_out = -+ static_cast<uLongf>(decompressed_size); - auto result = uncompress(decompressed_data.data(), &decompressed_size_out, - data.data(), data.size()); - diff --git a/www-client/chromium/files/skia-avx2.patch b/www-client/chromium/files/skia-avx2.patch deleted file mode 100644 index a1b530990c0..00000000000 --- a/www-client/chromium/files/skia-avx2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Disable AVX2 code to prevent build failure with GCC - -Bug: https://bugs.gentoo.org/608640 - ---- a/third_party/skia/include/core/SkPreConfig.h -+++ b/third_party/skia/include/core/SkPreConfig.h -@@ -125,7 +125,7 @@ - // These checks must be done in descending order to ensure we set the highest - // available SSE level. - #if defined(__AVX2__) -- #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX2 -+ #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX - #elif defined(__AVX__) - #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX - #elif defined(__SSE4_2__)
