[packages/chromium-browser/dev-29] start on 29 branch, up to 29.0.1547.57
glen
glen at pld-linux.org
Mon Aug 19 13:46:40 CEST 2013
commit 7158118464f1e16fefd3ae189ef62443cba5c9aa
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Aug 19 14:45:28 2013 +0300
start on 29 branch, up to 29.0.1547.57
chromium-browser.spec | 22 ++--
chromium_useragent.patch.in | 6 +-
clean-source.sh | 40 ++++---
disable_dlog_and_dcheck_in_release_builds.patch | 11 --
get-source.sh | 3 +-
get-webkit_revision.patch | 26 -----
harfbuzz-icu.patch | 44 --------
nacl-no-untar.patch | 80 ++++---------
nss.patch | 30 -----
sync-session-name.patch | 104 -----------------
system-ffmpeg.patch | 142 +++++++++++++-----------
11 files changed, 139 insertions(+), 369 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 393ed7d..9099330 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -59,9 +59,9 @@
# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
# - to look for new tarball, use update-source.sh script
-%define branch 28.0.1500
-%define basever 45
-%define patchver 95
+%define branch 29.0.1547
+%define basever 57
+#define patchver 95
%define gyp_rev 1014
Summary: A WebKit powered web browser
Name: chromium-browser
@@ -73,7 +73,7 @@ Version: %{branch}.%{basever}
Release: 1
License: BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
Group: X11/Applications/Networking
-Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
+Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{branch}.%{basever}.tar.gz
# Source0-md5: 040b9e7d8ae75d20d63621aca84962bf
%if "%{?patchver}" != ""
Patch0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
@@ -88,9 +88,7 @@ Source7: clean-source.sh
Source8: get-source.sh
Source9: master_preferences.json
Patch1: plugin-searchdirs.patch
-Patch3: disable_dlog_and_dcheck_in_release_builds.patch
Patch4: path-libpdf.patch
-Patch6: get-webkit_revision.patch
Patch7: dlopen_sonamed_gl.patch
Patch8: chromium_useragent.patch.in
Patch10: system-libxnvctrl.patch
@@ -105,9 +103,6 @@ Patch24: nacl-verbose.patch
Patch25: gnome3-volume-control.patch
Patch26: master-prefs-path.patch
Patch28: system-mesa.patch
-Patch31: sync-session-name.patch
-Patch32: nss.patch
-Patch33: harfbuzz-icu.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
%{?with_system_mesa:BuildRequires: Mesa-libGL-devel >= 9.1}
@@ -115,6 +110,7 @@ URL: http://www.chromium.org/Home
%{?with_system_mesa:BuildRequires: Mesa-libGLU-devel}
%{?with_system_mesa:BuildRequires: Mesa-libOSMesa-devel >= 9.1}
BuildRequires: alsa-lib-devel
+BuildRequires: perl-JSON
BuildRequires: atk-devel
BuildRequires: bison
BuildRequires: bzip2-devel
@@ -281,15 +277,13 @@ v8=$MAJOR_VERSION.$MINOR_VERSION.$BUILD_NUMBER.$PATCH_LEVEL
sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
-e 's/@BUILD_DIST_NAME@/PLD/g' \
-e 's/@BUILD_DIST_VERSION@/%{pld_version}/g' \
- < %{PATCH8} | %{__patch} -p2
+ < %{PATCH8} | %{__patch} -p1
%{__sed} -e 's, at localedir@,%{_datadir}/%{name},' %{SOURCE5} > find-lang.sh
ln -s %{SOURCE7} .
%patch1 -p2
-%patch3 -p2
%patch4 -p3
-%patch6 -p2
%patch7 -p1
%patch10 -p1
%patch15 -p2
@@ -301,9 +295,6 @@ ln -s %{SOURCE7} .
%patch18 -p1
%patch24 -p2
%patch26 -p2
-%patch31 -p0
-%patch32 -p2
-%patch33 -p2
sh -x clean-source.sh \
%{!?with_nacl:nacl=0} \
@@ -394,6 +385,7 @@ flags="
%{?with_gps:-Dlinux_use_libgps=1 -Dlinux_link_libgps=1} \
-Dlinux_use_gold_binary=0 \
-Dlinux_use_gold_flags=0 \
+ -Dlogging_like_official_build=1 \
-Dgoogle_api_key=%{google_api_key} \
-Dgoogle_default_client_id=%{google_default_client_id} \
-Dgoogle_default_client_secret=%{google_default_client_secret} \
diff --git a/chromium_useragent.patch.in b/chromium_useragent.patch.in
index d75a8c7..9876f91 100644
--- a/chromium_useragent.patch.in
+++ b/chromium_useragent.patch.in
@@ -1,6 +1,6 @@
---- chromium-browser-23.0.1271.60/src/webkit/user_agent/user_agent_util.cc~ 2012-10-30 21:01:17.000000000 +0200
-+++ chromium-browser-23.0.1271.60/src/webkit/user_agent/user_agent_util.cc 2012-11-04 17:00:57.206490293 +0200
-@@ -167,12 +167,20 @@
+--- chromium-browser-29.0.1547.55/webkit/common/user_agent/user_agent_util.cc~ 2013-08-16 19:03:28.000000000 +0300
++++ chromium-browser-29.0.1547.55/webkit/common/user_agent/user_agent_util.cc 2013-08-18 13:39:00.749897316 +0300
+@@ -181,12 +181,20 @@
// This is done to expose our product name in a manner that is maximally
// compatible with Safari, we hope!!
std::string user_agent;
diff --git a/clean-source.sh b/clean-source.sh
index 5ae1de6..9c7ebac 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -134,7 +134,6 @@ remove_nonessential_dirs() {
native_client_sdk \
native_client_sdk/src/libraries/win \
net/android \
- net/tools \
net/tools/testserver \
npapi/npspy/windows \
o3d \
@@ -285,9 +284,9 @@ remove_nonessential_dirs() {
third_party/WebKit/Tools/DumpRenderTree/mac \
third_party/WebKit/Tools/DumpRenderTree/qt \
third_party/WebKit/Tools/DumpRenderTree/win \
- third_party/angle/extensions \
- third_party/angle/samples \
- third_party/angle/samples/gles2_book \
+ third_party/angle_dx11/extensions \
+ third_party/angle_dx11/samples \
+ third_party/angle_dx11/samples/gles2_book \
third_party/boost \
third_party/bsdiff \
third_party/bspatch \
@@ -418,6 +417,7 @@ remove_nonessential_dirs() {
gpu/tools \
native_client/src/include/win \
native_client/src/trusted/service_runtime/win \
+ net/tools \
remoting/tools \
sandbox/win \
third_party/WebKit/Source/WebKit/chromium/public/mac \
@@ -456,6 +456,7 @@ remove_nonessential_dirs() {
'!' -path 'chrome/tools/build/make_version_cc.py' \
'!' -path 'chrome/tools/build/repack_locales.py' \
'!' -path 'chrome/tools/build/version.py' \
+ '!' -path 'chromeos/chromeos_constants.h' \
'!' -path 'chromeos/chromeos_export.h' \
'!' -path 'chromeos/chromeos_switches.h' \
'!' -path 'chromeos/dbus/dbus_client_implementation_type.h' \
@@ -468,6 +469,7 @@ remove_nonessential_dirs() {
'!' -path 'native_client/src/include/win/mman.h' \
'!' -path 'native_client/src/trusted/service_runtime/win/debug_exception_handler.h' \
'!' -path 'native_client/src/trusted/service_runtime/win/exception_patch/ntdll_patch.h' \
+ '!' -path 'net/tools/tld_cleanup/*' \
'!' -path 'remoting/tools/verify_resources.py' \
'!' -path 'sandbox/win/src/sandbox_types.h' \
'!' -path 'third_party/WebKit/Source/WebKit/chromium/public/mac/WebSubstringUtil.h' \
@@ -549,11 +551,11 @@ clean_third_party() {
'!' -iname '*.gyp*' \
\! -path 'third_party/WebKit/*' \
\! -path 'third_party/adobe/flash/*' \
- \! -path 'third_party/angle/include/EGL/*' \
- \! -path 'third_party/angle/include/GLSLANG/*' \
- \! -path 'third_party/angle/src/common/*' \
- \! -path 'third_party/angle/src/compiler/*' \
- \! -path 'third_party/angle/src/third_party/compiler/*' \
+ \! -path 'third_party/angle_dx11/include/EGL/*' \
+ \! -path 'third_party/angle_dx11/include/GLSLANG/*' \
+ \! -path 'third_party/angle_dx11/src/common/*' \
+ \! -path 'third_party/angle_dx11/src/compiler/*' \
+ \! -path 'third_party/angle_dx11/src/third_party/compiler/*' \
\! -path 'third_party/cacheinvalidation/*' \
\! -path 'third_party/cld/*' \
\! -path 'third_party/cros_system_api/*' \
@@ -572,11 +574,12 @@ clean_third_party() {
\! -path 'third_party/libxml/chromium/*' \
\! -path 'third_party/libyuv/*' \
\! -path 'third_party/lss/*.h' \
- \! -path 'third_party/mesa/MesaLib/include/GL/gl.h' \
- \! -path 'third_party/mesa/MesaLib/include/GL/glext.h' \
- \! -path 'third_party/mesa/MesaLib/include/GL/glx.h' \
- \! -path 'third_party/mesa/MesaLib/include/GL/glxext.h' \
- \! -path 'third_party/mesa/MesaLib/include/GL/osmesa.h' \
+ \! -path 'third_party/lzma_sdk/*' \
+ \! -path 'third_party/mesa/src/include/GL/gl.h' \
+ \! -path 'third_party/mesa/src/include/GL/glext.h' \
+ \! -path 'third_party/mesa/src/include/GL/glx.h' \
+ \! -path 'third_party/mesa/src/include/GL/glxext.h' \
+ \! -path 'third_party/mesa/src/include/GL/osmesa.h' \
\! -path 'third_party/modp_b64/*' \
\! -path 'third_party/mt19937ar/*' \
\! -path 'third_party/npapi/*' \
@@ -594,6 +597,7 @@ clean_third_party() {
\! -path 'third_party/tcmalloc/*' \
\! -path 'third_party/trace-viewer/*' \
\! -path 'third_party/undoview/*' \
+ \! -path 'third_party/usrsctp/*' \
\! -path 'third_party/v8-i18n/*' \
\! -path 'third_party/v8/*' \
\! -path 'third_party/webrtc/*' \
@@ -660,7 +664,7 @@ remove_tests() {
chrome/browser/component_updater/test \
chrome/browser/extensions/api/test_ \
chrome/browser/printing/cloud_print/test \
- chrome/browser/resources/gaia_auth/test \
+ chrome/browser/resources/gaia_auth/test_ \
chrome/browser/resources/tracing/tests \
chrome/browser/sync/test \
chrome/browser/ui/cocoa/test \
@@ -752,7 +756,7 @@ remove_tests() {
third_party/WebKit/Tools/TestWebKitAPI/Tests/mac \
third_party/WebKit/Tools/TestWebKitAPI/mac \
third_party/WebKit/Tools/TestWebKitAPI/win \
- third_party/angle/tests \
+ third_party/angle_dx11/tests \
third_party/cacheinvalidation/files/src/google/cacheinvalidation/test \
third_party/cacheinvalidation/src/google/cacheinvalidation/test \
third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/testing \
@@ -891,6 +895,7 @@ remove_tests() {
'!' -path './chrome/browser/diagnostics/diagnostics_test.*' \
'!' -path './chrome/browser/extensions/api/declarative/test_rules_registry.*' \
'!' -path './chrome/browser/extensions/api/test/test_api.*' \
+ '!' -path './chrome/browser/resources/gaia_auth/manifest_test.json' \
'!' -path './chrome/browser/resources/net_internals/*' \
'!' -path './chrome/browser/storage_monitor/test_media_transfer_protocol_manager_linux.*' \
'!' -path './chrome/browser/ui/webui/test_chrome_web_ui_controller_factory*' \
@@ -908,7 +913,8 @@ remove_tests() {
'!' -path './third_party/skia/src/gpu/gr_unittests.*' \
'!' -path './tools/compile_test/compile_test.py' \
'!' -path './ui/compositor/test_web_graphics_context_3d.*' \
- '!' -path './webkit/fileapi/test_mount_point_provider.*' \
+ '!' -path './webkit/browser/fileapi/test_mount_point_provider.*' \
+ '!' -path './webkit/common/gpu/test_context_provider_factory.*' \
'!' -path './webkit/gpu/test_context_provider_factory.*' \
'!' -path './webkit/support/test_webkit_platform_support.h' \
'!' -path './webkit/tools/test_shell/*.h' \
diff --git a/disable_dlog_and_dcheck_in_release_builds.patch b/disable_dlog_and_dcheck_in_release_builds.patch
deleted file mode 100644
index 8cd9f61..0000000
--- a/disable_dlog_and_dcheck_in_release_builds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chromium-browser-17.0.963.26/src/base/logging.h~ 2012-01-04 04:02:02.000000000 +0200
-+++ chromium-browser-17.0.963.26/src/base/logging.h 2012-01-05 22:54:29.330576996 +0200
-@@ -451,7 +451,7 @@
- // uses OFFICIAL_BUILD and other platforms use the branding flag when NDEBUG is
- // defined.
- #if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \
-- (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))
-+ (!defined(OS_WIN) && defined(NDEBUG))
- #define LOGGING_IS_OFFICIAL_BUILD 1
- #else
- #define LOGGING_IS_OFFICIAL_BUILD 0
diff --git a/get-source.sh b/get-source.sh
index 8290a21..76cff0a 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -9,13 +9,14 @@ PACKAGE_NAME=chromium-browser
PROGRAM=${0##*/}
WORK_DIR=$(cd "$(dirname "$0")"; pwd)
LOCKFILE=$WORK_DIR/$PACKAGE_NAME-$CHANNEL.lock
+# Browse URL: http://gsdview.appspot.com/chromium-browser-official/
OFFICIAL_URL=http://commondatastorage.googleapis.com/chromium-browser-official
DIST_DIR=$HOME/public_html/chromium-browser/src/$CHANNEL
# skip package build if interactive
tty -s && build_package=0
-VERSION=$(wget -qO - "$CHANNELS_URL?os=linux&channel=$CHANNEL" | awk -F, 'NR > 1{print $3}')
+VERSION=${2:-$(wget -qO - "$CHANNELS_URL?os=linux&channel=$CHANNEL" | awk -F, 'NR > 1{print $3}')}
if [ -z "$VERSION" ]; then
echo >&2 "Can't figure out version for $CHANNEL"
exit 1
diff --git a/get-webkit_revision.patch b/get-webkit_revision.patch
deleted file mode 100644
index 171d436..0000000
--- a/get-webkit_revision.patch
+++ /dev/null
@@ -1,26 +0,0 @@
----
- webkit/build/webkit_version.py | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-Index: src/webkit/build/webkit_version.py
-===================================================================
---- ./src.orig/webkit/build/webkit_version.py
-+++ ./src/webkit/build/webkit_version.py
-@@ -61,8 +61,15 @@
- directory=os.path.join(webkit_dir, version_file_dir),
- directory_regex_prior_to_src_url='webkit')
-
-- if version_info.url == None:
-- version_info.url = 'Unknown URL'
-+ if version_info.url is None or version_info.url == 'unknown':
-+ # parse the DEPS file
-+ data = open("../../DEPS", "rb").read()
-+ x = re.search(r'"webkit_revision": "(\d+)",', data)
-+ rev = x.group(1) if x else "n-a"
-+ x = re.search(r'"webkit_trunk": "(.*?)",', data)
-+ branch = os.path.basename(x.group(1)) if x else "n-a"
-+ return "%s@%s" % (branch, rev)
-+
- version_info.url = version_info.url.strip('/')
-
- if version_info.revision == None:
diff --git a/harfbuzz-icu.patch b/harfbuzz-icu.patch
deleted file mode 100644
index 4395860..0000000
--- a/harfbuzz-icu.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-issues with system harfbuzz-0.9.18
-https://groups.google.com/a/chromium.org/forum/#!topic/chromium-packagers/xULZMMsnolw
-
---- trunk/src/build/linux/unbundle/harfbuzz.gyp 2013/06/05 21:37:20 204344
-+++ trunk/src/build/linux/unbundle/harfbuzz.gyp 2013/06/05 21:40:43 204345
-@@ -3,24 +3,34 @@
- # found in the LICENSE file.
-
- {
-+ 'variables': {
-+ # Check for presence of harfbuzz-icu library, use it if present.
-+ 'harfbuzz_libraries':
-+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
-+ '--code "int main() { return 0; }" '
-+ '--run-linker '
-+ '--on-success "harfbuzz harfbuzz-icu" '
-+ '--on-failure "harfbuzz" '
-+ '-- -lharfbuzz-icu)',
-+ },
- 'targets': [
- {
- 'target_name': 'harfbuzz-ng',
- 'type': 'none',
- 'cflags': [
-- '<!@(pkg-config --cflags harfbuzz)',
-+ '<!@(pkg-config --cflags <(harfbuzz_libraries))',
- ],
- 'direct_dependent_settings': {
- 'cflags': [
-- '<!@(pkg-config --cflags harfbuzz)',
-+ '<!@(pkg-config --cflags <(harfbuzz_libraries))',
- ],
- },
- 'link_settings': {
- 'ldflags': [
-- '<!@(pkg-config --libs-only-L --libs-only-other harfbuzz)',
-+ '<!@(pkg-config --libs-only-L --libs-only-other <(harfbuzz_libraries))',
- ],
- 'libraries': [
-- '<!@(pkg-config --libs-only-l harfbuzz)',
-+ '<!@(pkg-config --libs-only-l <(harfbuzz_libraries))',
- ],
- },
- },
diff --git a/nacl-no-untar.patch b/nacl-no-untar.patch
index b3c13d2..117c7db 100644
--- a/nacl-no-untar.patch
+++ b/nacl-no-untar.patch
@@ -153,7 +153,7 @@
'tool_name': 'newlib',
'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
+# make semaphore.h visible for base/shared_memory_nacl.cc compilation
-+ 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
++ 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
'out_newlib64%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x64.nexe',
'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)',
'source_list_newlib64%': '<(tool_name)-x86-64.>(_target_name).source_list.gypcmd',
@@ -179,7 +179,7 @@
'tool_name': 'newlib',
'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
+# make semaphore.h visible for base/shared_memory_nacl.cc compilation
-+ 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
++ 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)',
'source_list_newlib64%': '<(tool_name)-x86-64.>(_target_name).source_list.gypcmd',
'out_newlib64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib64/>(nlib_target)',
@@ -209,7 +209,7 @@
'tool_name': 'newlib',
'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
+# make semaphore.h visible for base/shared_memory_nacl.cc compilation
-+ 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
++ 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
'out_newlib32%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x32.nexe',
'objdir_newlib32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)',
'source_list_newlib32%': '<(tool_name)-x86-32.>(_target_name).source_list.gypcmd',
@@ -233,7 +233,7 @@
'tool_name': 'newlib',
'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
+# make semaphore.h visible for base/shared_memory_nacl.cc compilation
-+ 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
++ 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
'out_newlib32%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib32/>(nlib_target)',
'objdir_newlib32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)',
'source_list_newlib32%': '<(tool_name)-x86-32.>(_target_name).source_list.gypcmd',
@@ -247,69 +247,37 @@
'--lib-dirs=>(lib_dirs_newlib32)',
'--compile_flags=-m32 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
'--defines=^(defines) >(_defines)',
-#--- /home/users/glen/rpm/packages/chromium-browser/autoupdate/beta/BUILD/chromium-browser-24.0.1312.45/src/native_client/src/untrusted/nacl/nacl.gyp 2012-12-19 10:03:43.000000000 +0200
-#+++ ../../../chromium-browser-24.0.1312.45-almost-there/src/native_client/src/untrusted/nacl/nacl.gyp 2013-01-01 22:26:15.004609235 +0200
-#@@ -94,7 +94,7 @@
-# 'nlib_target': 'libnacl.a',
-# 'build_glibc': 0,
-# 'build_newlib': 1,
-#- 'build_pnacl_newlib': 1,
-#+ 'build_pnacl_newlib': 0,
-# },
-# 'sources': [
-# '<@(sources_for_nacl_extensions)',
-#--- chromium-browser-24.0.1312.45/src/native_client/tools.gyp~ 2012-12-19 10:04:23.000000000 +0200
-#+++ chromium-browser-24.0.1312.45/src/native_client/tools.gyp 2013-01-01 17:22:30.098261613 +0200
-#@@ -134,7 +134,6 @@
-# 'msvs_cygwin_shell': 0,
-# 'description': 'Prep newlib',
-# 'inputs': [
-#- '<(newlib_dir)/stamp.untar',
-# '>!@pymod_do_main(prep_nacl_sdk --inputs --tool newlib)',
-# ],
-# 'outputs': ['<(newlib_dir)/stamp.prep'],
-#@@ -154,7 +153,6 @@
-# 'msvs_cygwin_shell': 0,
-# 'description': 'Prep glibc',
-# 'inputs': [
-#- '<(glibc_dir)/stamp.untar',
-# '>!@pymod_do_main(prep_nacl_sdk --inputs --tool glibc)',
-# ],
-# 'outputs': ['<(glibc_dir)/stamp.prep'],
-#@@ -174,7 +172,6 @@
-# 'msvs_cygwin_shell': 0,
-# 'description': 'Prep pnacl',
-# 'inputs': [
-#- '<(pnacl_dir)/stamp.untar',
-# '>!@pymod_do_main(prep_nacl_sdk --inputs --tool pnacl)',
-# ],
-# 'outputs': ['<(pnacl_dir)/stamp.prep'],
---- chromium-browser-28.0.1500.29/native_client/build/build_nexe.py 2013-05-29 12:09:15.000000000 +0300
-+++ chromium-browser-27.0.1453.3/native_client/build/build_nexe.py 2013-03-27 03:16:47.000000000 +0200
-@@ -154,9 +154,6 @@
+Could not find toolchain prep stamp file: ../native_client/toolchain/linux_x86_newlib/stamp.prep
+Could not find toolchain prep stamp file: ../native_client/toolchain/linux_x86_newlib/stamp.prep
+make: *** [out/Release/obj/gen/tc_newlib/lib32/crtn.o] Error 1
+make: *** Waiting for unfinished jobs....
+make: *** [out/Release/obj/gen/tc_newlib/lib32/crti.o] Error 1
+--- chromium-browser-29.0.1547.55/native_client/build/build_nexe.py~ 2013-08-16 19:08:10.000000000 +0300
++++ chromium-browser-29.0.1547.55/native_client/build/build_nexe.py 2013-08-18 14:05:01.071248669 +0300
+@@ -201,9 +201,6 @@
# Set the toolchain directories
self.toolchain = os.path.join(options.toolpath, tooldir)
self.toolbin = os.path.join(self.toolchain, tool_subdir, 'bin')
- self.toolstamp = os.path.join(self.toolchain, 'stamp.prep')
-- if not os.path.isfile(self.toolstamp):
-- ErrOut('Could not find toolchain prep stamp file: %s' % (self.toolstamp))
+- if not IsFile(self.toolstamp):
+- raise Error('Could not find toolchain prep stamp file: ' + self.toolstamp)
self.inc_paths = ArgToList(options.incdirs)
self.lib_paths = ArgToList(options.libdirs)
-@@ -362,10 +314,6 @@
+@@ -410,10 +407,6 @@
return path
def NeedsRebuild(self, outd, out, src, rebuilt=False):
-- if not os.path.isfile(self.toolstamp):
+- if not IsFile(self.toolstamp):
- if rebuilt:
-- print 'Could not find toolchain stamp file %s.' % self.toolstamp
+- raise Error('Could not find toolchain stamp file %s.' % self.toolstamp)
- return True
- if not os.path.isfile(outd):
+ if not IsFile(outd):
if rebuilt:
- print 'Could not find dependency file %s.' % outd
-@@ -374,15 +322,9 @@
+ raise Error('Could not find dependency file %s.' % outd)
+@@ -422,15 +415,9 @@
if rebuilt:
- print 'Could not find output file %s.' % out
+ raise Error('Could not find output file %s.' % out)
return True
- stamp_tm = GetMTime(self.toolstamp)
out_tm = GetMTime(out)
@@ -317,9 +285,9 @@
src_tm = GetMTime(src)
- if IsStale(out_tm, stamp_tm, rebuilt):
- if rebuilt:
-- print 'Output %s is older than toolchain stamp %s' % (out,
-- self.toolstamp)
+- raise Error('Output %s is older than toolchain stamp %s' % (
+- out, self.toolstamp))
- return True
if IsStale(out_tm, src_tm, rebuilt):
if rebuilt:
- print 'Output %s is older than source %s.' % (out, src)
+ raise Error('Output %s is older than source %s.' % (out, src))
diff --git a/nss.patch b/nss.patch
deleted file mode 100644
index 5e36cc3..0000000
--- a/nss.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Linux: fix compatibility with nss-3.15.
-
-https://groups.google.com/a/chromium.org/forum/#!topic/chromium-packagers/Jwz20yLB_7E
-https://src.chromium.org/viewvc/chrome?revision=206184&view=revision
---- trunk/src/net/third_party/nss/ssl/bodge/secitem_array.c 2013/06/13 22:43:39 206183
-+++ trunk/src/net/third_party/nss/ssl/bodge/secitem_array.c 2013/06/13 22:44:52 206184
-@@ -6,6 +6,7 @@
- * Support routines for SECItemArray data structure.
- */
-
-+#include "nssutil.h"
- #include "seccomon.h"
- #include "secitem.h"
- #include "secerr.h"
-@@ -13,10 +14,15 @@
-
- typedef struct SECItemArrayStr SECItemArray;
-
-+#define NSSUTIL_VERSION_NUM \
-+ (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH)
-+#if NSSUTIL_VERSION_NUM < 31500
-+// Added in NSS 3.15.
- struct SECItemArrayStr {
- SECItem *items;
- unsigned int len;
- };
-+#endif
-
- SECItemArray *
- SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len)
diff --git a/sync-session-name.patch b/sync-session-name.patch
deleted file mode 100644
index 09fd7b6..0000000
--- a/sync-session-name.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-https://code.google.com/p/chromium/issues/detail?id=123827
-
-Index: sync/sync_core.gypi
-===================================================================
---- sync/sync_core.gypi (revision 198703)
-+++ sync/sync_core.gypi (revision 198704)
-@@ -181,6 +181,8 @@
- 'util/get_session_name.h',
- 'util/get_session_name_ios.mm',
- 'util/get_session_name_ios.h',
-+ 'util/get_session_name_linux.cc',
-+ 'util/get_session_name_linux.h',
- 'util/get_session_name_mac.mm',
- 'util/get_session_name_mac.h',
- 'util/get_session_name_win.cc',
-Index: sync/util/get_session_name_linux.h
-===================================================================
---- sync/util/get_session_name_linux.h (revision 0)
-+++ sync/util/get_session_name_linux.h (revision 198704)
-@@ -0,0 +1,19 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SYNC_UTIL_GET_SESSION_NAME_LINUX_H_
-+#define SYNC_UTIL_GET_SESSION_NAME_LINUX_H_
-+
-+#include <string>
-+
-+namespace syncer {
-+namespace internal {
-+
-+std::string GetHostname();
-+
-+} // namespace internal
-+} // namespace syncer
-+
-+#endif // SYNC_UTIL_GET_SESSION_NAME_LINUX_H_
-+
-
-Property changes on: sync/util/get_session_name_linux.h
-___________________________________________________________________
-Added: svn:eol-style
-## -0,0 +1 ##
-+LF
-\ No newline at end of property
-Index: sync/util/get_session_name.cc
-===================================================================
---- sync/util/get_session_name.cc (revision 198703)
-+++ sync/util/get_session_name.cc (revision 198704)
-@@ -15,7 +15,7 @@
- #include "base/command_line.h"
- #include "chromeos/chromeos_switches.h"
- #elif defined(OS_LINUX)
--#include "base/linux_util.h"
-+#include "sync/util/get_session_name_linux.h"
- #elif defined(OS_IOS)
- #include "sync/util/get_session_name_ios.h"
- #elif defined(OS_MACOSX)
-@@ -60,7 +60,7 @@
- // "CHROMEOS_RELEASE_BOARD" line in chrome://system.
- session_name = board.substr(0, 6) == "stumpy" ? "Chromebox" : "Chromebook";
- #elif defined(OS_LINUX)
-- session_name = base::GetLinuxDistro();
-+ session_name = internal::GetHostname();
- #elif defined(OS_IOS)
- session_name = internal::GetComputerName();
- #elif defined(OS_MACOSX)
-Index: sync/util/get_session_name_linux.cc
-===================================================================
---- sync/util/get_session_name_linux.cc (revision 0)
-+++ sync/util/get_session_name_linux.cc (revision 198704)
-@@ -0,0 +1,24 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "sync/util/get_session_name_linux.h"
-+
-+#include <limits.h> // for HOST_NAME_MAX
-+#include <unistd.h> // for gethostname()
-+
-+#include "base/linux_util.h"
-+
-+namespace syncer {
-+namespace internal {
-+
-+std::string GetHostname() {
-+ char hostname[HOST_NAME_MAX];
-+ if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success.
-+ return hostname;
-+ return base::GetLinuxDistro();
-+}
-+
-+} // namespace internal
-+} // namespace syncer
-+
-
-Property changes on: sync/util/get_session_name_linux.cc
-___________________________________________________________________
-Added: svn:eol-style
-## -0,0 +1 ##
-+LF
-\ No newline at end of property
diff --git a/system-ffmpeg.patch b/system-ffmpeg.patch
index 70b2058..f3c2b96 100644
--- a/system-ffmpeg.patch
+++ b/system-ffmpeg.patch
@@ -1,27 +1,3 @@
---- chromium-browser-28.0.1500.20/tools/compile_test/compile_test.py~ 2013-05-25 17:14:51.000000000 +0300
-+++ chromium-browser-28.0.1500.20/tools/compile_test/compile_test.py 2013-05-25 17:24:02.334165592 +0300
-@@ -30,7 +30,9 @@ def DoMain(argv):
- if not options.code:
- parser.error('Missing required --code switch.')
-
-- cxx = os.environ.get('CXX', 'g++')
-+ # The environment variable might expand to a string with spaces,
-+ # e.g. "ccache g++". Convert it to a list suitable for argv.
-+ cxx = os.environ.get('CXX', 'g++').split()
-
- tmpdir = tempfile.mkdtemp()
- try:
-@@ -42,7 +42,7 @@
-
- o_path = os.path.join(tmpdir, 'test.o')
-
-- cxx_cmdline = [cxx, cxx_path, '-o', o_path]
-+ cxx_cmdline = cxx + [cxx_path, '-o', o_path]
- if not options.run_linker:
- cxx_cmdline.append('-c')
- # Pass remaining arguments to the compiler.
-diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
-index 17241b9..8a92312 100644
--- a/media/filters/ffmpeg_glue.h
+++ b/media/filters/ffmpeg_glue.h
@@ -28,9 +28,9 @@
@@ -35,46 +11,52 @@ index 17241b9..8a92312 100644
namespace media {
-diff --git a/media/media.gyp b/media/media.gyp
-index df217d2..fde3830 100644
---- a/media/media.gyp
-+++ b/media/media.gyp
-@@ -363,6 +363,9 @@
- 'dependencies': [
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
- ],
-+ 'export_dependent_settings': [
-+ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-+ ],
- }, { # media_use_ffmpeg == 0
- # Exclude the sources that depend on ffmpeg.
- 'sources!': [
--- a/media/ffmpeg/ffmpeg_common.cc.orig 2013-01-17 00:07:51.635057013 +0000
+++ b/media/ffmpeg/ffmpeg_common.cc 2013-01-17 00:15:50.867406811 +0000
-@@ -10,6 +10,8 @@
- #include "media/base/video_frame.h"
- #include "media/base/video_util.h"
-
-+#undef SampleFormat
-+
- namespace media {
-
- // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
---- a/media/media.gyp.orig 2013-05-09 18:02:50.958682676 +0000
-+++ b/media/media.gyp 2013-05-09 18:03:45.009023680 +0000
-@@ -530,6 +530,12 @@
- '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
- '--code "#define __STDC_CONSTANT_MACROS\n'
- '#include <libavcodec/avcodec.h>\n'
-+ 'int test() { return AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL; }" '
-+ '--on-failure -DCHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL=1)',
-+
-+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
-+ '--code "#define __STDC_CONSTANT_MACROS\n'
-+ '#include <libavcodec/avcodec.h>\n'
- 'int test() { struct AVFrame frame;\n'
- 'return av_frame_get_channels(&frame); }" '
- '--on-failure -DCHROMIUM_NO_AVFRAME_CHANNELS=1)',
+@@ -85,8 +85,10 @@
+ return kCodecGSM_MS;
+ case AV_CODEC_ID_PCM_MULAW:
+ return kCodecPCM_MULAW;
++#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS
+ case AV_CODEC_ID_OPUS:
+ return kCodecOpus;
++#endif
+ default:
+ DVLOG(1) << "Unknown audio CodecID: " << codec_id;
+ }
+@@ -130,8 +132,10 @@
+ return AV_CODEC_ID_GSM_MS;
+ case kCodecPCM_MULAW:
+ return AV_CODEC_ID_PCM_MULAW;
++#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS
+ case kCodecOpus:
+ return AV_CODEC_ID_OPUS;
++#endif
+ default:
+ DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
+ }
+@@ -149,8 +153,10 @@
+ return kCodecMPEG4;
+ case AV_CODEC_ID_VP8:
+ return kCodecVP8;
++#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
+ case AV_CODEC_ID_VP9:
+ return kCodecVP9;
++#endif
+ default:
+ DVLOG(1) << "Unknown video CodecID: " << codec_id;
+ }
+@@ -167,8 +173,10 @@
+ return AV_CODEC_ID_MPEG4;
+ case kCodecVP8:
+ return AV_CODEC_ID_VP8;
++#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
+ case kCodecVP9:
+ return AV_CODEC_ID_VP9;
++#endif
+ default:
+ DVLOG(1) << "Unknown VideoCodec: " << video_codec;
+ }
--- a/media/filters/ffmpeg_demuxer.cc.orig 2013-05-09 18:04:25.089276403 +0000
+++ b/media/filters/ffmpeg_demuxer.cc 2013-05-09 18:05:16.289599070 +0000
@@ -111,12 +111,15 @@
@@ -95,3 +77,39 @@ index df217d2..fde3830 100644
// If a packet is returned by FFmpeg's av_parser_parse2() the packet will
// reference inner memory of FFmpeg. As such we should transfer the packet
+--- a/media/base/media_posix.cc.orig 2013-05-24 20:59:12.963046035 +0000
++++ b/media/base/media_posix.cc 2013-05-24 20:59:50.593275882 +0000
+@@ -11,12 +11,15 @@
+ #include "base/path_service.h"
+ #include "base/strings/stringize_macros.h"
+ #include "media/ffmpeg/ffmpeg_common.h"
++
++#if !defined(USE_SYSTEM_FFMPEG)
+ #include "third_party/ffmpeg/ffmpeg_stubs.h"
+
+ using third_party_ffmpeg::kNumStubModules;
+ using third_party_ffmpeg::kModuleFfmpegsumo;
+ using third_party_ffmpeg::InitializeStubs;
+ using third_party_ffmpeg::StubPathMap;
++#endif
+
+ namespace media {
+ namespace internal {
+@@ -46,6 +49,9 @@
+ #endif
+
+ bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
++#if defined(USE_SYSTEM_FFMPEG)
++ return true;
++#else
+ StubPathMap paths;
+
+ // First try to initialize with Chrome's sumo library.
+@@ -61,6 +67,7 @@
+ FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION))).value());
+
+ return InitializeStubs(paths);
++#endif
+ }
+
+ } // namespace internal
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/7158118464f1e16fefd3ae189ef62443cba5c9aa
More information about the pld-cvs-commit
mailing list