diff options
Diffstat (limited to 'dev-util/electron/files/electron-0.36.12-vendor-libchromiumcontent.patch')
-rw-r--r-- | dev-util/electron/files/electron-0.36.12-vendor-libchromiumcontent.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/dev-util/electron/files/electron-0.36.12-vendor-libchromiumcontent.patch b/dev-util/electron/files/electron-0.36.12-vendor-libchromiumcontent.patch deleted file mode 100644 index 168d8db477a9..000000000000 --- a/dev-util/electron/files/electron-0.36.12-vendor-libchromiumcontent.patch +++ /dev/null @@ -1,75 +0,0 @@ -From b7022129450eaf2136746f5332956e76848796ef Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 8 Feb 2016 15:12:12 -0500 -Subject: [PATCH] libchromiumcontent build fixes - ---- - chromiumcontent/chromiumcontent.gyp | 6 +++--- - chromiumcontent/chromiumcontent.gypi | 26 -------------------------- - 2 files changed, 3 insertions(+), 29 deletions(-) - -diff --git a/chromiumcontent/chromiumcontent.gyp b/chromiumcontent/chromiumcontent.gyp -index 52a1d36..db74a52 100644 ---- a/chromiumcontent/chromiumcontent.gyp -+++ b/chromiumcontent/chromiumcontent.gyp -@@ -24,11 +24,11 @@ - }, - { - 'target_name': 'chromiumcontent', -- # Build chromiumcontent as shared_library otherwise some static libraries -- # will not build. -- 'type': 'shared_library', -+ 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base_prefs', -+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', -+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', - '<(DEPTH)/components/components.gyp:cdm_renderer', - '<(DEPTH)/components/components.gyp:devtools_discovery', - '<(DEPTH)/components/components.gyp:devtools_http_handler', -diff --git a/chromiumcontent/chromiumcontent.gypi b/chromiumcontent/chromiumcontent.gypi -index 37c572b..3f4dcea 100644 ---- a/chromiumcontent/chromiumcontent.gypi -+++ b/chromiumcontent/chromiumcontent.gypi -@@ -1,17 +1,5 @@ - { - 'variables': { -- # Enalbe using proprietary codecs. -- 'proprietary_codecs': 1, -- 'ffmpeg_branding': 'Chrome', -- # Enable support for Widevine CDM. -- 'enable_widevine': 1, -- # Using libc++ requires building for >= 10.7. -- 'mac_deployment_target': '10.8', -- # The 10.8 SDK does not work well with C++11. -- 'mac_sdk_min': '10.9', -- # Use the standard way of linking with msvc runtime. -- 'win_use_allocator_shim': 0, -- 'win_release_RuntimeLibrary': '2', - # The V8 libraries. - 'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]', - # The icu libraries. -@@ -22,20 +10,6 @@ - 'v8_use_external_startup_data': 1, - }], - ['OS=="linux"', { -- # Enable high DPI support on Linux. -- 'enable_hidpi': 1, -- # Use Dbus. -- 'use_dbus': 1, -- # Make Linux build contain debug symbols, this flag will add '-g' to -- # cflags. -- 'linux_dump_symbols': 1, -- # The Linux build of libchromiumcontent.so depends on, but doesn't -- # provide, tcmalloc by default. Disabling tcmalloc here also prevents -- # any conflicts when linking to binaries or libraries that don't use -- # tcmalloc. -- 'linux_use_tcmalloc': 0, -- # Force using gold linker. -- 'linux_use_bundled_gold': 1, - 'conditions': [ - ['target_arch=="arm"', { - 'arm_version': 7, --- -2.4.10 - |