summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-skia_BUILD.gn
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2017-04-29 22:08:59 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2017-04-29 22:08:59 +0000
commite07f65b746ff1d52d943dd930315f7ec7a0c726a (patch)
tree6455e241c8b173fb7059c54c6bde8ef44284f2d0 /www/chromium/files/patch-skia_BUILD.gn
parentdns/unbound: update 1.6.1 -> 1.6.2 (diff)
www/chromium: update to 58.0.3029.81
MFH: 2017Q2 Security: https://vuxml.freebsd.org/freebsd/95a74a48-2691-11e7-9e2d-e8e0b747a45a.html
Notes
Notes: svn path=/head/; revision=439776
Diffstat (limited to 'www/chromium/files/patch-skia_BUILD.gn')
-rw-r--r--www/chromium/files/patch-skia_BUILD.gn24
1 files changed, 12 insertions, 12 deletions
diff --git a/www/chromium/files/patch-skia_BUILD.gn b/www/chromium/files/patch-skia_BUILD.gn
index d2b4ff49ca82..ff9f856b82fb 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 2017-03-09 20:04:36 UTC
+--- skia/BUILD.gn.orig 2017-04-19 19:06:37 UTC
+++ skia/BUILD.gn
-@@ -124,7 +124,7 @@ config("skia_library_config") {
+@@ -127,7 +127,7 @@ config("skia_library_config") {
}
# Settings for text blitting, chosen to approximate the system browser.
@@ -9,25 +9,25 @@
defines += [
"SK_GAMMA_EXPONENT=1.2",
"SK_GAMMA_CONTRAST=0.2",
-@@ -340,7 +340,7 @@ component("skia") {
- sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
+@@ -326,7 +326,7 @@ component("skia") {
+ set_sources_assignment_filter(sources_assignment_filter)
}
-- if (!is_linux) {
-+ if (!is_linux && !is_bsd) {
- sources -= [
+- if (is_linux) {
++ if (is_linux || is_bsd) {
+ sources += [
"//third_party/skia/src/ports/SkFontConfigInterface.cpp",
"//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-@@ -349,7 +349,7 @@ component("skia") {
+@@ -335,7 +335,7 @@ component("skia") {
]
}
-- if (!is_linux && !is_android) {
-+ if (!is_linux && !is_bsd && !is_android) {
- sources -= [
+- if (is_linux || is_android) {
++ if (is_linux || is_bsd || is_android) {
+ sources += [
"//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
"//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
-@@ -387,7 +387,7 @@ component("skia") {
+@@ -374,7 +374,7 @@ component("skia") {
"//base/third_party/dynamic_annotations",
]