Added chromium with NPAPI support
This commit is contained in:
layman
@@ -0,0 +1,11 @@
|
||||
--- third_party/icu/icu.gyp.orig 2014-03-16 17:49:02.561203814 -0500
|
||||
+++ third_party/icu/icu.gyp 2014-03-16 17:49:23.191037086 -0500
|
||||
@@ -30,7 +30,7 @@
|
||||
}],
|
||||
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
|
||||
or OS=="netbsd" or OS=="mac" or OS=="android") and \
|
||||
- (target_arch=="arm" or target_arch=="ia32" or \
|
||||
+ (target_arch=="ia32" or \
|
||||
target_arch=="mipsel")', {
|
||||
'target_conditions': [
|
||||
['_toolset=="host"', {
|
||||
@@ -0,0 +1,14 @@
|
||||
Backport https://codereview.chromium.org/64243002/ to fix a renderer crash.
|
||||
--- third_party/WebKit/Source/platform/fonts/AlternateFontFamily.h.orig 2013-11-07 18:46:58.174333486 +0000
|
||||
+++ third_party/WebKit/Source/platform/fonts/AlternateFontFamily.h 2013-11-07 18:47:13.974434037 +0000
|
||||
@@ -117,9 +117,8 @@
|
||||
case FontDescription::MonospaceFamily:
|
||||
return monospaceStr;
|
||||
case FontDescription::SansSerifFamily:
|
||||
- return sansStr;
|
||||
default:
|
||||
- return AtomicString();
|
||||
+ return sansStr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd">
|
||||
<default-apps>
|
||||
<web-browsers>
|
||||
<web-browser>
|
||||
<name>Chromium</name>
|
||||
<executable>chromium-browser</executable>
|
||||
<command>chromium-browser %s</command>
|
||||
<icon-name>chromium-browser</icon-name>
|
||||
<run-in-terminal>false</run-in-terminal>
|
||||
</web-browser>
|
||||
</web-browsers>
|
||||
</default-apps>
|
||||
@@ -0,0 +1,87 @@
|
||||
Fix HOST_OS detection in build_ffpeg.sh
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=491466
|
||||
|
||||
Enable gold linker
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=491850
|
||||
|
||||
--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh
|
||||
+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh
|
||||
@@ -75,7 +75,7 @@
|
||||
LIBAVUTIL_VERSION_MAJOR=52
|
||||
|
||||
case $(uname -sm) in
|
||||
- Linux\ i386)
|
||||
+ Linux\ i?86)
|
||||
HOST_OS=linux
|
||||
HOST_ARCH=ia32
|
||||
JOBS=$(grep processor /proc/cpuinfo | wc -l)
|
||||
@@ -85,6 +85,11 @@
|
||||
HOST_ARCH=x64
|
||||
JOBS=$(grep processor /proc/cpuinfo | wc -l)
|
||||
;;
|
||||
+ Linux\ arm*)
|
||||
+ HOST_OS=linux
|
||||
+ HOST_ARCH=arm
|
||||
+ JOBS=$(grep processor /proc/cpuinfo | wc -l)
|
||||
+ ;;
|
||||
Darwin\ i386)
|
||||
HOST_OS=mac
|
||||
HOST_ARCH=ia32
|
||||
@@ -117,14 +122,6 @@
|
||||
echo "LD = $(ld --version | head -n1)"
|
||||
echo
|
||||
|
||||
-# As of this writing gold 2.20.1-system.20100303 is unable to link FFmpeg.
|
||||
-if ld --version | grep -q gold; then
|
||||
- echo "gold is unable to link FFmpeg"
|
||||
- echo
|
||||
- echo "Switch /usr/bin/ld to the regular binutils ld and try again"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
# We want to use a sufficiently recent version of yasm on Windows.
|
||||
if [[ "$TARGET_OS" == "win" || "$TARGET_OS" == "win-vs2013" ]]; then
|
||||
if !(which yasm 2>&1 > /dev/null); then
|
||||
@@ -292,14 +289,16 @@
|
||||
add_flag_common --extra-cflags=-m32
|
||||
add_flag_common --extra-ldflags=-m32
|
||||
elif [ "$TARGET_ARCH" = "arm" ]; then
|
||||
- # This if-statement essentially is for chroot tegra2.
|
||||
- add_flag_common --enable-cross-compile
|
||||
+ if [ "$HOST_ARCH" != "arm" ]; then
|
||||
+ # This if-statement essentially is for chroot tegra2.
|
||||
+ add_flag_common --enable-cross-compile
|
||||
|
||||
- # Location is for CrOS chroot. If you want to use this, enter chroot
|
||||
- # and copy ffmpeg to a location that is reachable.
|
||||
- add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
|
||||
- add_flag_common --target-os=linux
|
||||
- add_flag_common --arch=arm
|
||||
+ # Location is for CrOS chroot. If you want to use this, enter chroot
|
||||
+ # and copy ffmpeg to a location that is reachable.
|
||||
+ add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
|
||||
+ add_flag_common --target-os=linux
|
||||
+ add_flag_common --arch=arm
|
||||
+ fi
|
||||
|
||||
# TODO(ihf): ARM compile flags are tricky. The final options
|
||||
# overriding everything live in chroot /build/*/etc/make.conf
|
||||
@@ -322,11 +321,13 @@
|
||||
# NOTE: softfp/hardfp selected at gyp time.
|
||||
add_flag_common --extra-cflags=-mfloat-abi=hard
|
||||
elif [ "$TARGET_ARCH" = "arm-neon" ]; then
|
||||
- # This if-statement is for chroot arm-generic.
|
||||
- add_flag_common --enable-cross-compile
|
||||
- add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
|
||||
- add_flag_common --target-os=linux
|
||||
- add_flag_common --arch=arm
|
||||
+ if [ "$HOST_ARCH" != "arm" ]; then
|
||||
+ # This if-statement is for chroot arm-generic.
|
||||
+ add_flag_common --enable-cross-compile
|
||||
+ add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
|
||||
+ add_flag_common --target-os=linux
|
||||
+ add_flag_common --arch=arm
|
||||
+ fi
|
||||
add_flag_common --enable-armv6
|
||||
add_flag_common --enable-armv6t2
|
||||
add_flag_common --enable-vfp
|
||||
@@ -0,0 +1,13 @@
|
||||
--- chrome/test/chromedriver/embed_version_in_cpp.py.orig 2013-09-27 18:44:27.221221038 +0000
|
||||
+++ chrome/test/chromedriver/embed_version_in_cpp.py 2013-09-27 18:44:59.861416643 +0000
|
||||
@@ -25,9 +25,8 @@
|
||||
options, args = parser.parse_args()
|
||||
|
||||
version = open(options.version_file, 'r').read().strip()
|
||||
- revision = lastchange.FetchVersionInfo(None).revision.strip()
|
||||
global_string_map = {
|
||||
- 'kChromeDriverVersion': version + '.' + revision
|
||||
+ 'kChromeDriverVersion': version
|
||||
}
|
||||
cpp_source.WriteSource('version',
|
||||
'chrome/test/chromedriver',
|
||||
@@ -0,0 +1,18 @@
|
||||
--- chrome/browser/ui/libgtk2ui/libgtk2ui.gyp.orig 2014-02-28 02:42:18.993134286 +0000
|
||||
+++ chrome/browser/ui/libgtk2ui/libgtk2ui.gyp 2014-02-28 02:43:37.633657361 +0000
|
||||
@@ -17,6 +17,7 @@
|
||||
'../../../../build/linux/system.gyp:gconf',
|
||||
'../../../../build/linux/system.gyp:gtk',
|
||||
'../../../../build/linux/system.gyp:gtkprint',
|
||||
+ '../../../../printing/printing.gyp:cups',
|
||||
'../../../../skia/skia.gyp:skia',
|
||||
'../../../../ui/base/strings/ui_strings.gyp:ui_strings',
|
||||
'../../../../ui/resources/ui_resources.gyp:ui_resources',
|
||||
@@ -29,7 +30,6 @@
|
||||
],
|
||||
'defines': [
|
||||
'LIBGTK2UI_IMPLEMENTATION',
|
||||
- 'USE_CUPS',
|
||||
],
|
||||
# Several of our source files are named _gtk2.cc. This isn't to
|
||||
# differentiate them from their source files (ninja and make are sane
|
||||
@@ -0,0 +1,10 @@
|
||||
--- build/all.gyp.orig 2014-02-12 19:11:50.200718819 +0000
|
||||
+++ build/all.gyp 2014-02-12 19:12:11.160850317 +0000
|
||||
@@ -676,7 +676,6 @@
|
||||
}],
|
||||
['chromeos==0', {
|
||||
'dependencies': [
|
||||
- '../v8/src/d8.gyp:d8',
|
||||
],
|
||||
}],
|
||||
['internal_filter_fuzzer==1', {
|
||||
@@ -0,0 +1,11 @@
|
||||
--- build/gyp_chromium.orig 2014-01-29 01:22:52.527247671 +0000
|
||||
+++ build/gyp_chromium 2014-01-29 01:23:49.857623290 +0000
|
||||
@@ -38,8 +38,6 @@
|
||||
sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
|
||||
'Source', 'build', 'scripts'))
|
||||
|
||||
-import find_depot_tools
|
||||
-
|
||||
# On Windows, Psyco shortens warm runs of build/gyp_chromium by about
|
||||
# 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
|
||||
# seconds. Conversely, memory usage of build/gyp_chromium with Psyco
|
||||
@@ -0,0 +1,12 @@
|
||||
--- build/gyp_chromium.orig 2013-12-11 03:07:03.941915587 +0000
|
||||
+++ build/gyp_chromium 2013-12-11 03:07:29.812073301 +0000
|
||||
@@ -221,9 +221,6 @@
|
||||
|
||||
supplemental_includes = GetSupplementalFiles()
|
||||
|
||||
- if not RunGN(supplemental_includes):
|
||||
- sys.exit(1)
|
||||
-
|
||||
args.extend(
|
||||
['-I' + i for i in additional_include_files(supplemental_includes, args)])
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- build/gyp_chromium.orig 2014-01-16 22:55:50.292718339 +0000
|
||||
+++ build/gyp_chromium 2014-01-16 23:15:17.890248708 +0000
|
||||
@@ -370,8 +370,6 @@
|
||||
args.append('--check')
|
||||
|
||||
supplemental_includes = GetSupplementalFiles()
|
||||
- if not RunGN(supplemental_includes):
|
||||
- sys.exit(1)
|
||||
args.extend(
|
||||
['-I' + i for i in additional_include_files(supplemental_includes, args)])
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- build/gyp_chromium.orig 2014-02-28 01:05:10.794646362 +0000
|
||||
+++ build/gyp_chromium 2014-02-28 01:05:52.764917862 +0000
|
||||
@@ -537,8 +537,6 @@
|
||||
'GYP_CROSSCOMPILE' not in os.environ)):
|
||||
os.environ['GYP_CROSSCOMPILE'] = '1'
|
||||
|
||||
- if not RunGN(gn_vars_dict):
|
||||
- sys.exit(1)
|
||||
args.extend(
|
||||
['-I' + i for i in additional_include_files(supplemental_includes, args)])
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
--- chrome/chrome_browser.gypi.orig 2013-11-13 18:24:41.237282707 +0000
|
||||
+++ chrome/chrome_browser.gypi 2013-11-13 18:26:03.357780490 +0000
|
||||
@@ -3064,7 +3064,11 @@
|
||||
'browser/password_manager/native_backend_gnome_x.cc',
|
||||
'browser/password_manager/native_backend_gnome_x.h',
|
||||
],
|
||||
- }],
|
||||
+ }, {
|
||||
+ 'dependencies': [
|
||||
+ '../build/linux/system.gyp:gnome_keyring',
|
||||
+ ],
|
||||
+ }],
|
||||
['use_aura==1', {
|
||||
'sources/': [
|
||||
['exclude', '^browser/automation/testing_automation_provider_win.cc'],
|
||||
@@ -3153,11 +3157,6 @@
|
||||
],
|
||||
},
|
||||
}],
|
||||
- ['use_gnome_keyring==1', {
|
||||
- 'dependencies': [
|
||||
- '../build/linux/system.gyp:gnome_keyring',
|
||||
- ],
|
||||
- }],
|
||||
],
|
||||
}],
|
||||
['input_speech==0', {
|
||||
@@ -0,0 +1,12 @@
|
||||
--- build/linux/system.gyp.orig 2013-01-28 16:03:43.709477316 +0000
|
||||
+++ build/linux/system.gyp 2013-01-28 16:06:14.210254835 +0000
|
||||
@@ -175,9 +175,6 @@
|
||||
'gps_open',
|
||||
'gps_close',
|
||||
'gps_read',
|
||||
- # We don't use gps_shm_read() directly, just to make
|
||||
- # sure that libgps has the shared memory support.
|
||||
- 'gps_shm_read',
|
||||
],
|
||||
'message': 'Generating libgps library loader.',
|
||||
'process_outputs_as_sources': 1,
|
||||
@@ -0,0 +1,32 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Allow the user to override command-line flags, bug #357629.
|
||||
# This is based on Debian's chromium-browser package, and is intended
|
||||
# to be consistent with Debian.
|
||||
if [ -f /etc/chromium/default ] ; then
|
||||
. /etc/chromium/default
|
||||
fi
|
||||
|
||||
# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
|
||||
# default CHROMIUM_FLAGS (from /etc/chromium/default).
|
||||
CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
|
||||
|
||||
# Let the wrapped binary know that it has been run through the wrapper
|
||||
export CHROME_WRAPPER="`readlink -f "$0"`"
|
||||
|
||||
PROGDIR="`dirname "$CHROME_WRAPPER"`"
|
||||
|
||||
case ":$PATH:" in
|
||||
*:$PROGDIR:*)
|
||||
# $PATH already contains $PROGDIR
|
||||
;;
|
||||
*)
|
||||
# Append $PROGDIR to $PATH
|
||||
export PATH="$PATH:$PROGDIR"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Set the .desktop file name
|
||||
export CHROME_DESKTOP="chromium-browser-chromium.desktop"
|
||||
|
||||
exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
|
||||
@@ -0,0 +1,39 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Allow the user to override command-line flags, bug #357629.
|
||||
# This is based on Debian's chromium-browser package, and is intended
|
||||
# to be consistent with Debian.
|
||||
for f in /etc/chromium/*; do
|
||||
[[ -f ${f} ]] && source "${f}"
|
||||
done
|
||||
|
||||
# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
|
||||
# default CHROMIUM_FLAGS (from /etc/chromium/default).
|
||||
CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
|
||||
|
||||
# Let the wrapped binary know that it has been run through the wrapper
|
||||
export CHROME_WRAPPER=$(readlink -f "$0")
|
||||
|
||||
PROGDIR=${CHROME_WRAPPER%/*}
|
||||
|
||||
case ":$PATH:" in
|
||||
*:$PROGDIR:*)
|
||||
# $PATH already contains $PROGDIR
|
||||
;;
|
||||
*)
|
||||
# Append $PROGDIR to $PATH
|
||||
export PATH="$PATH:$PROGDIR"
|
||||
;;
|
||||
esac
|
||||
|
||||
if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then
|
||||
# Running as root with HOME owned by root.
|
||||
# Pass --user-data-dir to work around upstream failsafe.
|
||||
CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium
|
||||
${CHROMIUM_FLAGS}"
|
||||
fi
|
||||
|
||||
# Set the .desktop file name
|
||||
export CHROME_DESKTOP="chromium-browser-chromium.desktop"
|
||||
|
||||
exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
|
||||
@@ -0,0 +1,26 @@
|
||||
--- build/linux/unbundle/icu.gyp.orig 2013-09-27 18:18:50.531839532 +0000
|
||||
+++ build/linux/unbundle/icu.gyp 2013-09-27 18:19:08.301950500 +0000
|
||||
@@ -7,6 +7,7 @@
|
||||
{
|
||||
'target_name': 'system_icu',
|
||||
'type': 'none',
|
||||
+ 'toolsets': ['host', 'target'],
|
||||
'direct_dependent_settings': {
|
||||
'defines': [
|
||||
'U_USING_ICU_NAMESPACE=0',
|
||||
@@ -30,6 +31,7 @@
|
||||
{
|
||||
'target_name': 'icui18n',
|
||||
'type': 'none',
|
||||
+ 'toolsets': ['host', 'target'],
|
||||
'dependencies': ['system_icu'],
|
||||
'export_dependent_settings': ['system_icu'],
|
||||
'variables': {
|
||||
@@ -116,6 +118,7 @@
|
||||
{
|
||||
'target_name': 'icuuc',
|
||||
'type': 'none',
|
||||
+ 'toolsets': ['host', 'target'],
|
||||
'dependencies': ['system_icu'],
|
||||
'export_dependent_settings': ['system_icu'],
|
||||
'variables': {
|
||||
@@ -0,0 +1,13 @@
|
||||
--- third_party/WebKit/Source/core/core.gypi.orig 2013-09-27 18:25:24.634284363 +0000
|
||||
+++ third_party/WebKit/Source/core/core.gypi 2013-09-27 18:25:48.614432099 +0000
|
||||
@@ -3863,10 +3863,6 @@
|
||||
'tests/TreeTestHelpers.h',
|
||||
],
|
||||
'scripts_for_in_files': [
|
||||
- # jinja2/__init__.py contains version string, so sufficient as
|
||||
- # dependency for whole jinja2 package
|
||||
- '<(DEPTH)/third_party/jinja2/__init__.py',
|
||||
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
'scripts/in_file.py',
|
||||
'scripts/in_generator.py',
|
||||
'scripts/license.py',
|
||||
@@ -0,0 +1,13 @@
|
||||
--- third_party/WebKit/Source/core/core.gypi.orig 2013-10-16 18:07:10.783245029 +0000
|
||||
+++ third_party/WebKit/Source/core/core.gypi 2013-10-16 18:07:31.253373879 +0000
|
||||
@@ -3613,10 +3613,6 @@
|
||||
'rendering/RenderOverflowTest.cpp',
|
||||
],
|
||||
'scripts_for_in_files': [
|
||||
- # jinja2/__init__.py contains version string, so sufficient as
|
||||
- # dependency for whole jinja2 package
|
||||
- '<(DEPTH)/third_party/jinja2/__init__.py',
|
||||
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
'../build/scripts/hasher.py',
|
||||
'../build/scripts/in_file.py',
|
||||
'../build/scripts/in_generator.py',
|
||||
@@ -0,0 +1,27 @@
|
||||
--- third_party/WebKit/Source/bindings/derived_sources.gyp.orig 2013-11-06 18:36:38.369949986 +0000
|
||||
+++ third_party/WebKit/Source/bindings/derived_sources.gyp 2013-11-06 18:37:06.980134563 +0000
|
||||
@@ -53,11 +53,6 @@
|
||||
],
|
||||
'compiler_module_files': [
|
||||
'scripts/idl_compiler.py',
|
||||
- '<(DEPTH)/third_party/ply/lex.py',
|
||||
- '<(DEPTH)/third_party/ply/yacc.py',
|
||||
- # jinja2/__init__.py contains version string, so sufficient for package
|
||||
- '<(DEPTH)/third_party/jinja2/__init__.py',
|
||||
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
'<(DEPTH)/tools/idl_parser/idl_lexer.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_node.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_parser.py',
|
||||
--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2013-11-06 18:42:10.042086211 +0000
|
||||
+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2013-11-06 18:42:19.412146455 +0000
|
||||
@@ -1,10 +1,6 @@
|
||||
{
|
||||
'variables': {
|
||||
'scripts_for_in_files': [
|
||||
- # jinja2/__init__.py contains version string, so sufficient as
|
||||
- # dependency for whole jinja2 package
|
||||
- '<(DEPTH)/third_party/jinja2/__init__.py',
|
||||
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
'hasher.py',
|
||||
'in_file.py',
|
||||
'in_generator.py',
|
||||
@@ -0,0 +1,27 @@
|
||||
--- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig 2014-01-29 01:37:10.832866464 +0000
|
||||
+++ third_party/WebKit/Source/bindings/generated_bindings.gyp 2014-01-29 01:37:29.082985891 +0000
|
||||
@@ -74,11 +74,6 @@
|
||||
|
||||
'compiler_module_files': [
|
||||
'scripts/idl_compiler.py',
|
||||
- '<(DEPTH)/third_party/ply/lex.py',
|
||||
- '<(DEPTH)/third_party/ply/yacc.py',
|
||||
- # jinja2/__init__.py contains version string, so sufficient for package
|
||||
- '<(DEPTH)/third_party/jinja2/__init__.py',
|
||||
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
'<(DEPTH)/tools/idl_parser/idl_lexer.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_node.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_parser.py',
|
||||
--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-01-29 01:37:58.853180703 +0000
|
||||
+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-01-29 01:38:06.423230239 +0000
|
||||
@@ -1,10 +1,6 @@
|
||||
{
|
||||
'variables': {
|
||||
'scripts_for_in_files': [
|
||||
- # jinja2/__init__.py contains version string, so sufficient as
|
||||
- # dependency for whole jinja2 package
|
||||
- '<(DEPTH)/third_party/jinja2/__init__.py',
|
||||
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
'hasher.py',
|
||||
'in_file.py',
|
||||
'in_generator.py',
|
||||
@@ -0,0 +1,25 @@
|
||||
--- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig 2014-02-20 03:49:21.821527295 +0000
|
||||
+++ third_party/WebKit/Source/bindings/generated_bindings.gyp 2014-02-20 03:49:34.401607238 +0000
|
||||
@@ -110,9 +110,6 @@
|
||||
'scripts/unstable/idl_compiler.py',
|
||||
'<(DEPTH)/third_party/ply/lex.py',
|
||||
'<(DEPTH)/third_party/ply/yacc.py',
|
||||
- # jinja2/__init__.py contains version string, so sufficient for package
|
||||
- '<(DEPTH)/third_party/jinja2/__init__.py',
|
||||
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
'<(DEPTH)/tools/idl_parser/idl_lexer.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_node.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_parser.py',
|
||||
--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-02-20 03:49:59.351765796 +0000
|
||||
+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-02-20 03:50:08.111821470 +0000
|
||||
@@ -1,10 +1,6 @@
|
||||
{
|
||||
'variables': {
|
||||
'scripts_for_in_files': [
|
||||
- # jinja2/__init__.py contains version string, so sufficient as
|
||||
- # dependency for whole jinja2 package
|
||||
- '<(DEPTH)/third_party/jinja2/__init__.py',
|
||||
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
'hasher.py',
|
||||
'in_file.py',
|
||||
'in_generator.py',
|
||||
@@ -0,0 +1,31 @@
|
||||
--- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig 2014-03-04 23:10:29.140572304 +0000
|
||||
+++ third_party/WebKit/Source/bindings/generated_bindings.gyp 2014-03-04 23:12:53.991556052 +0000
|
||||
@@ -109,15 +109,9 @@
|
||||
|
||||
# Python source
|
||||
'jinja_module_files': [
|
||||
- # jinja2/__init__.py contains version string, so sufficient for package
|
||||
- '<(DEPTH)/third_party/jinja2/__init__.py',
|
||||
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
],
|
||||
'idl_compiler_files': [
|
||||
'scripts/idl_compiler.py',
|
||||
- # PLY (Python Lex-Yacc)
|
||||
- '<(DEPTH)/third_party/ply/lex.py',
|
||||
- '<(DEPTH)/third_party/ply/yacc.py',
|
||||
# Web IDL lexer/parser (base parser)
|
||||
'<(DEPTH)/tools/idl_parser/idl_lexer.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_node.py',
|
||||
--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-03-04 23:11:54.731153647 +0000
|
||||
+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-03-04 23:12:05.861229233 +0000
|
||||
@@ -1,10 +1,6 @@
|
||||
{
|
||||
'variables': {
|
||||
'scripts_for_in_files': [
|
||||
- # jinja2/__init__.py contains version string, so sufficient as
|
||||
- # dependency for whole jinja2 package
|
||||
- '<(DEPTH)/third_party/jinja2/__init__.py',
|
||||
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
'hasher.py',
|
||||
'in_file.py',
|
||||
'in_generator.py',
|
||||
@@ -0,0 +1,12 @@
|
||||
--- third_party/libyuv/libyuv.gyp.orig 2014-01-16 23:27:36.335011975 +0000
|
||||
+++ third_party/libyuv/libyuv.gyp 2014-01-16 23:28:05.845202472 +0000
|
||||
@@ -24,8 +24,7 @@
|
||||
'HAVE_JPEG'
|
||||
],
|
||||
'conditions': [
|
||||
- # Android uses libjpeg for system jpeg support.
|
||||
- [ 'OS == "android" and use_system_libjpeg == 1', {
|
||||
+ [ 'use_system_libjpeg == 1', {
|
||||
'dependencies': [
|
||||
'<(DEPTH)/third_party/libjpeg/libjpeg.gyp:libjpeg',
|
||||
],
|
||||
@@ -0,0 +1,11 @@
|
||||
--- third_party/WebKit/Source/bindings/derived_sources.gyp.orig 2013-07-30 22:29:53.610647573 +0000
|
||||
+++ third_party/WebKit/Source/bindings/derived_sources.gyp 2013-07-30 22:30:05.150721649 +0000
|
||||
@@ -262,8 +262,6 @@
|
||||
'msvs_external_rule': 1,
|
||||
'inputs': [
|
||||
'scripts/idl_compiler.py',
|
||||
- '<(DEPTH)/third_party/ply/lex.py',
|
||||
- '<(DEPTH)/third_party/ply/yacc.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_lexer.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_node.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_parser.py',
|
||||
@@ -0,0 +1,11 @@
|
||||
--- third_party/WebKit/Source/bindings/derived_sources.gyp.orig 2013-09-09 17:53:37.709978765 +0000
|
||||
+++ third_party/WebKit/Source/bindings/derived_sources.gyp 2013-09-09 17:53:50.540054303 +0000
|
||||
@@ -57,8 +57,6 @@
|
||||
],
|
||||
'compiler_module_files': [
|
||||
'scripts/idl_compiler.py',
|
||||
- '<(DEPTH)/third_party/ply/lex.py',
|
||||
- '<(DEPTH)/third_party/ply/yacc.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_lexer.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_node.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_parser.py',
|
||||
@@ -0,0 +1,10 @@
|
||||
--- media/cast/logging/logging.gyp.orig 2014-03-18 22:32:33.802818765 +0000
|
||||
+++ media/cast/logging/logging.gyp 2014-03-18 22:33:14.683093733 +0000
|
||||
@@ -40,6 +40,7 @@
|
||||
'cast_common_logging',
|
||||
'cast_logging_proto_lib',
|
||||
'<(DEPTH)/base/base.gyp:base',
|
||||
+ '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
'cast_logging_proto_lib',
|
||||
@@ -0,0 +1,5 @@
|
||||
# Default settings for chromium. This file is sourced by /bin/bash from
|
||||
# the chromium launcher.
|
||||
|
||||
# Options to pass to chromium.
|
||||
#CHROMIUM_FLAGS=""
|
||||
@@ -0,0 +1,6 @@
|
||||
solutions = [
|
||||
{ "name" : "src",
|
||||
"url" : "https://src.chromium.org/svn/trunk/src",
|
||||
"safesync_url": "https://chromium-status.appspot.com/lkgr",
|
||||
},
|
||||
]
|
||||
Reference in New Issue
Block a user