Clean up patches

This commit is contained in:
xsmile
2018-04-08 13:03:29 +02:00
parent c5870e451e
commit 1d3ea63249
8 changed files with 8 additions and 62 deletions
@@ -1,8 +1,8 @@
inox-patchset/chromium-clang-r2.patch
inox-patchset/fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch
inox-patchset/fix-frame-buttons-rendering-too-large-when-using-OSX.patch
inox-patchset/chromium-exclude_unwind_tables.patch
inox-patchset/chromium-ffmpeg-r1.patch
inox-patchset/chromium-skia-harmony.patch
inox-patchset/chromium-math.h-r0.patch
inox-patchset/chromium-stdint.patch
inox-patchset/0001-fix-building-without-safebrowsing.patch
inox-patchset/0002-fix-building-without-reporting.patch
inox-patchset/0003-disable-autofill-download-manager.patch
@@ -1,2 +1,2 @@
ungoogled-chromium/linux/manpage.patch
ungoogled-chromium/linux/fix-libstdcxx630-errors.patch
ungoogled-chromium/linux/fix-libstdcxx-errors.patch
@@ -1,6 +1,6 @@
inox-patchset/chromium-vaapi-r17.patch
ungoogled-chromium/linux/fix-libstdcxx630-errors.patch
ungoogled-chromium/linux/fix-libstdcxx-errors.patch
opensuse/fix-network-api-crash.patch
opensuse/master-preferences.patch
@@ -1,2 +1,2 @@
ungoogled-chromium/linux/manpage.patch
ungoogled-chromium/linux/fix-libstdcxx630-errors.patch
ungoogled-chromium/linux/fix-libstdcxx-errors.patch
@@ -1,27 +0,0 @@
From 9f63f94a11abc34d40ede8b8712fa15b5844a8c0 Mon Sep 17 00:00:00 2001
From: Tom Anderson <thomasanderson@chromium.org>
Date: Sat, 27 Jan 2018 20:03:37 +0000
Subject: [PATCH] Fix build with glibc 2.27
BUG=806340
TBR=hamelphi@chromium.org
Change-Id: Ib4e5091212d874d9ad88f3e9a1fdfee3ed7e0d5e
Reviewed-on: https://chromium-review.googlesource.com/890059
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Philippe Hamel <hamelphi@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532249}
---
--- a/components/assist_ranker/ranker_example_util.cc
+++ b/components/assist_ranker/ranker_example_util.cc
@@ -4,6 +4,8 @@
#include <math.h>
+#include <math.h>
+
#include "components/assist_ranker/ranker_example_util.h"
#include "base/bit_cast.h"
#include "base/format_macros.h"
@@ -1,16 +0,0 @@
From 0235c2b657d936f3cdb09053776e5929fc84704b Mon Sep 17 00:00:00 2001
From: Tomas Popela <tomas.popela@gmail.com>
Date: Wed, 31 Jan 2018 18:57:07 +0000
Subject: [PATCH] Add missing stdint include
--- a/chrome/browser/vr/sample_queue.cc
+++ b/chrome/browser/vr/sample_queue.cc
@@ -4,6 +4,8 @@
#include <stdint.h>
+#include <stdint.h>
+
#include "chrome/browser/vr/sample_queue.h"
namespace vr {
@@ -1,3 +1,5 @@
# Fix using libstdc++ with clang
--- a/device/fido/u2f_ble_transaction.cc
+++ b/device/fido/u2f_ble_transaction.cc
@@ -131,7 +131,7 @@ void U2fBleTransaction::StopTimeout() {
@@ -1,13 +0,0 @@
# Fix using libstdc++ 6.3.0 with clang
--- a/device/u2f/u2f_ble_transaction.cc
+++ b/device/u2f/u2f_ble_transaction.cc
@@ -131,7 +131,7 @@ void U2fBleTransaction::StopTimeout() {
void U2fBleTransaction::OnError() {
request_frame_.reset();
- request_cont_fragments_ = {};
+ request_cont_fragments_ = base::queue<U2fBleFrameContinuationFragment>();
response_frame_assembler_.reset();
std::move(callback_).Run(base::nullopt);
}