summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-skia_BUILD.gn
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-skia_BUILD.gn')
-rw-r--r--www/chromium/files/patch-skia_BUILD.gn16
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-skia_BUILD.gn b/www/chromium/files/patch-skia_BUILD.gn
index 5f5fcda18d85..c2d845f94577 100644
--- a/www/chromium/files/patch-skia_BUILD.gn
+++ b/www/chromium/files/patch-skia_BUILD.gn
@@ -1,6 +1,6 @@
---- skia/BUILD.gn.orig 2016-08-03 22:02:22.000000000 +0300
-+++ skia/BUILD.gn 2016-10-09 06:26:37.625935000 +0300
-@@ -213,7 +213,7 @@
+--- skia/BUILD.gn.orig 2017-01-26 00:49:17 UTC
++++ skia/BUILD.gn
+@@ -135,7 +135,7 @@ config("skia_library_config") {
}
# Settings for text blitting, chosen to approximate the system browser.
@@ -9,16 +9,16 @@
defines += [
"SK_GAMMA_EXPONENT=1.2",
"SK_GAMMA_CONTRAST=0.2",
-@@ -405,7 +405,7 @@
+@@ -363,7 +363,7 @@ component("skia") {
sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
}
- if (!is_linux) {
+ if (!is_linux && !is_bsd) {
sources -= [
- "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
+ "//third_party/skia/src/ports/SkFontConfigInterface.cpp",
"//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-@@ -416,14 +416,14 @@
+@@ -375,14 +375,14 @@ component("skia") {
# Add the files for the SkFontMgr_Android. This is used to emulate android
# fonts on linux. See content/zygote/zygote_main_linux.cc
@@ -35,8 +35,8 @@
sources -= [
"//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
"//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
-@@ -463,7 +463,7 @@
- "//third_party/zlib",
+@@ -421,7 +421,7 @@ component("skia") {
+ "//base/third_party/dynamic_annotations",
]
- if (is_linux) {