Commit 90863469 authored by Michael Gilbert's avatar Michael Gilbert

refresh patches for chromium 53

parent 6c0fd2f2
......@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -106,6 +106,10 @@
@@ -108,6 +108,10 @@
}],
],
},
......@@ -16,16 +16,16 @@ author: Michael Gilbert <mgilbert@debian.org>
'type': 'none',
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -69,7 +69,7 @@
'../build/linux/system.gyp:xtst',
],
@@ -73,7 +73,7 @@
'host/linux/unicode_to_keysym.cc',
],
}],
- ['chromeos==0 and use_ozone==0', {
+ ['chromeos==0 and use_ozone==0 and use_gtk3==0', {
'dependencies': [
# use GTK on Linux, even for Aura builds.
'../build/linux/system.gyp:gtk2',
@@ -650,7 +650,7 @@
@@ -658,7 +658,7 @@
'host/it2me/it2me_native_messaging_host_main.h',
],
'conditions': [
......@@ -36,7 +36,7 @@ author: Michael Gilbert <mgilbert@debian.org>
'../build/linux/system.gyp:gtk2',
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1719,7 +1719,7 @@
@@ -1739,7 +1739,7 @@
}, { # Everything but desktop Linux.
'sources': [ '<@(chrome_interactive_ui_test_non_desktop_linux_sources)' ],
}],
......
......@@ -15,7 +15,7 @@ origin: https://bugs.archlinux.org/task/47682
// Hack for default color
if (color.alpha == 0.0)
color = {1, 1, 1, 1};
@@ -510,8 +515,11 @@ GtkWidget* NativeThemeGtk2::GetEntry() c
@@ -507,8 +512,11 @@ GtkWidget* NativeThemeGtk2::GetEntry() c
GtkWidget* NativeThemeGtk2::GetLabel() const {
static GtkWidget* fake_label = NULL;
......
......@@ -21,7 +21,7 @@ author: Michael Gilbert <mgilbert@debian.org>
'../gpu/gpu.gyp:gpu_unittests',
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -384,7 +384,6 @@
@@ -383,7 +383,6 @@
'../extensions/extensions_tests.gyp:extensions_unittests',
'../gin/gin.gyp:gin_shell',
'../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test', # TODO(GYP) crbug.com/471920
......
......@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -5955,8 +5955,8 @@
@@ -5985,8 +5985,8 @@
['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
'and OS!="win"', {
'make_global_settings': [
......
......@@ -17,7 +17,7 @@ Last-Update: <2015-07-26>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -1101,24 +1101,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
@@ -1106,24 +1106,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
// If no estimate is found, the stream entry will be kInfiniteDuration().
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration());
......@@ -44,7 +44,7 @@ Last-Update: <2015-07-26>
AVStream* audio_stream = NULL;
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -152,7 +152,7 @@
@@ -153,7 +153,7 @@
'../third_party/WebKit/public/all.gyp:*',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
'../third_party/codesighs/codesighs.gyp:*',
......@@ -75,7 +75,7 @@ Last-Update: <2015-07-26>
'sender/h264_vt_encoder_unittest.cc',
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -650,7 +650,7 @@
@@ -649,7 +649,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
......@@ -84,7 +84,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
# Exclude the sources that depend on ffmpeg.
@@ -1287,7 +1287,7 @@
@@ -1257,7 +1257,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
......@@ -93,7 +93,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
@@ -1431,7 +1431,7 @@
@@ -1411,7 +1411,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
......@@ -102,7 +102,7 @@ Last-Update: <2015-07-26>
],
}],
],
@@ -1960,7 +1960,7 @@
@@ -1951,7 +1951,7 @@
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
......@@ -113,7 +113,7 @@ Last-Update: <2015-07-26>
'media_test_support',
--- a/media/media_cdm.gypi
+++ b/media/media_cdm.gypi
@@ -38,7 +38,7 @@
@@ -39,7 +39,7 @@
['media_use_ffmpeg == 1' , {
'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
'dependencies': [
......@@ -124,7 +124,7 @@ Last-Update: <2015-07-26>
'cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc',
--- a/third_party/WebKit/Source/core/core.gyp
+++ b/third_party/WebKit/Source/core/core.gyp
@@ -254,7 +254,7 @@
@@ -225,7 +225,7 @@
],
},
'dependencies': [
......@@ -133,7 +133,7 @@ Last-Update: <2015-07-26>
],
}],
['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
@@ -270,7 +270,7 @@
@@ -241,7 +241,7 @@
# Windows shared builder needs extra help for linkage
['OS=="win" and "WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', {
'export_dependent_settings': [
......@@ -144,7 +144,7 @@ Last-Update: <2015-07-26>
],
--- a/third_party/WebKit/Source/platform/blink_platform.gyp
+++ b/third_party/WebKit/Source/platform/blink_platform.gyp
@@ -367,7 +367,7 @@
@@ -371,7 +371,7 @@
'<(DEPTH)/third_party/ffmpeg',
],
'dependencies': [
......
......@@ -6,9 +6,9 @@
-#include "third_party/harfbuzz-ng/src/hb.h"
+#include <hb.h>
#include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/skia/include/core/SkScalar.h"
#include "ui/gfx/font_render_params.h"
--- a/ui/gfx/render_text_harfbuzz.h
+++ b/ui/gfx/render_text_harfbuzz.h
@@ -13,7 +13,7 @@
......
......@@ -2,7 +2,7 @@ Include system copy of prtime.h
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -671,8 +671,6 @@
@@ -676,8 +676,6 @@
'third_party/dmg_fp/g_fmt.cc',
'third_party/icu/icu_utf.cc',
'third_party/icu/icu_utf.h',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment