[packages/chromium-browser/dev-28: 2/6] up to 28.0.1500.20
glen
glen at pld-linux.org
Fri May 31 14:16:21 CEST 2013
commit 7879021e9c31b977479f0ba70d5a5debd1d604ed
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu May 30 12:14:37 2013 +0300
up to 28.0.1500.20
chromium-browser.spec | 53 +++++++++++----------
clean-source.sh | 29 ++++++------
dlopen_sonamed_gl.patch | 6 +--
no-pnacl.patch | 11 -----
speechd-0.8.patch | 11 -----
system-ffmpeg.patch | 54 ++++++++++++++++-----
system-libxnvctrl.patch | 122 +++++++++++++++++++-----------------------------
7 files changed, 137 insertions(+), 149 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 0f6045d..e54cfe6 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -58,8 +58,8 @@
# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
# - to look for new tarball, use update-source.sh script
-%define branch 27.0.1453
-%define basever 93
+%define branch 28.0.1500
+%define basever 20
#define patchver 70
%define gyp_rev 1014
Summary: A WebKit powered web browser
@@ -69,14 +69,14 @@ Version: %{branch}.%{patchver}
%else
Version: %{branch}.%{basever}
%endif
-Release: 1
+Release: 0.16
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-md5: 6bb4fc8f0c437b447a76c3bd91cf9f81
+Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/dev/%{name}-%{branch}.%{basever}.tar.gz
+# Source0-md5: eafd6a919faadc8a7446cd673f460c4c
%if "%{?patchver}" != ""
Patch0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
-# Patch0-md5: 8eaaa7eb2866d1b3b5536074853de998
+# Patch0-md5: 7e2f26d76ca6241961276a328a9230cf
%endif
Source1: %{name}.default
Source2: %{name}.sh
@@ -104,8 +104,6 @@ Patch24: nacl-verbose.patch
Patch25: gnome3-volume-control.patch
Patch26: master-prefs-path.patch
Patch28: system-mesa.patch
-Patch29: speechd-0.8.patch
-Patch30: no-pnacl.patch
Patch31: sync-session-name.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
@@ -280,8 +278,8 @@ ln -s %{SOURCE7} .
%patch3 -p2
%patch4 -p3
%patch6 -p2
-%patch7 -p2
-%patch10 -p2
+%patch7 -p1
+%patch10 -p1
%patch15 -p2
%{!?with_libjpegturbo:%patch11 -p0}
%patch12 -p1
@@ -291,8 +289,6 @@ ln -s %{SOURCE7} .
%patch18 -p2
%patch24 -p2
%patch26 -p2
-%patch29 -p2
-%patch30 -p0
%patch31 -p0
sh -x clean-source.sh \
@@ -343,17 +339,7 @@ cd ../../../../..
fi
%endif
-test %{_specdir}/%{name}.spec -nt Makefile && %{__rm} -f Makefile
-test -e Makefile || \
- CC="%{__cc}" \
- CXX="%{__cxx}" \
- LDFLAGS="%{rpmldflags} -fuse-ld=gold" \
- CFLAGS="%{rpmcflags} %{rpmcppflags}" \
- CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}" \
-%{__python} build/gyp_chromium \
- --format=make \
- --depth=. \
- build/all.gyp \
+flags="
%ifarch %{ix86}
-Dtarget_arch=ia32 \
%endif
@@ -387,7 +373,7 @@ test -e Makefile || \
%{?with_selinux:-Dselinux=1} \
-Dusb_ids_path=$(pkg-config --variable usbids usbutils) \
-Dlinux_link_libpci=1 \
- -Dlinux_link_libspeechd=1 \
+ -Dlinux_link_libspeechd=1 -Dlibspeechd_h_prefix=speech-dispatcher/ \
%{!?with_tcmalloc:-Dlinux_use_tcmalloc=0} \
%{?with_gps:-Dlinux_use_libgps=1 -Dlinux_link_libgps=1} \
-Dlinux_use_gold_binary=0 \
@@ -428,6 +414,25 @@ test -e Makefile || \
-Duse_system_libxslt=1 \
-Duse_system_nspr=1 \
-Duse_system_xdg_utils=1 \
+"
+
+build/linux/unbundle/replace_gyp_files.py $flags
+
+test %{_specdir}/%{name}.spec -nt Makefile && %{__rm} -f Makefile
+test -e Makefile || \
+ CC="%{__cc}" \
+ CXX="%{__cxx}" \
+ LDFLAGS="%{rpmldflags} -fuse-ld=gold" \
+ CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+ CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}" \
+ CC_host="%{__cc}" \
+ CXX_host="%{__cxx}" \
+ LD_host="%{__cxx}" \
+%{__python} build/gyp_chromium \
+ --format=make \
+ --depth=. \
+ build/all.gyp \
+ $flags
# need {CC/CXX/LDFLAGS}.host overrides for v8 build
%{__make} -r chrome %{?with_sandboxing:chrome_sandbox} \
diff --git a/clean-source.sh b/clean-source.sh
index 44828c9..437aa7f 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -52,12 +52,12 @@ remove_nonessential_dirs() {
breakpad/src/common/mac \
breakpad/src/tools/mac \
build/mac \
- build/win \
+ build/win_ \
chrome/android \
chrome/app/android \
chrome/app/resources/terms/chromeos \
chrome/app/theme/default_100_percent/cros_ \
- chrome/app/theme/default_100_percent/mac \
+ chrome/app/theme/default_100_percent/mac_ \
chrome/app/theme/default_100_percent/win \
chrome/app/theme/default_200_percent/cros_ \
chrome/app/theme/default_200_percent/mac \
@@ -94,7 +94,6 @@ remove_nonessential_dirs() {
chrome/tools/build/mac \
chrome/tools/build/win \
chrome_frame \
- cloud_print/service/win \
cloud_print/virtual_driver/win \
content/app/android \
content/browser/android \
@@ -412,6 +411,7 @@ remove_nonessential_dirs() {
chrome/browser/component/web_contents_delegate_android \
chrome/tools \
chromeos \
+ cloud_print/service/win \
content/browser/renderer_host/java \
content/common/mac \
content/renderer/java \
@@ -442,7 +442,7 @@ remove_nonessential_dirs() {
'!' -path 'build/android/cpufeatures.gypi' \
'!' -path 'chrome/browser/chromeos/contacts/contact.proto' \
'!' -path 'chrome/browser/chromeos/extensions/echo_private_api.h' \
- '!' -path 'chrome/browser/chromeos/extensions/file_browser_handler_api.h' \
+ '!' -path 'chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h' \
'!' -path 'chrome/browser/chromeos/extensions/info_private_api.h' \
'!' -path 'chrome/browser/chromeos/extensions/media_player_api.h' \
'!' -path 'chrome/browser/chromeos/extensions/networking_private_api.h' \
@@ -510,7 +510,7 @@ almost_strip_dirs() {
'!' -path 'tools/grit/*' \
'!' -path 'tools/gritsettings/*' \
'!' -path 'tools/gyp/*' \
- '!' -path 'tools/json_comment_eater.py' \
+ '!' -path 'tools/json_comment_eater/json_comment_eater.py' \
'!' -path 'tools/json_schema_compiler/*' \
'!' -path 'tools/json_to_struct/*' \
'!' -path 'tools/licenses.py' \
@@ -538,7 +538,6 @@ clean_third_party() {
third_party/mach_override \
third_party/npapi/npspy \
third_party/re2/benchlog \
- third_party/snappy \
third_party/sqlite/*.patch \
third_party/sqlite/src/*.patch \
third_party/sudden_motion_sensor \
@@ -588,6 +587,7 @@ clean_third_party() {
\! -path 'third_party/sfntly/*' \
\! -path 'third_party/skia/*' \
\! -path 'third_party/smhasher/*' \
+ \! -path 'third_party/snappy/*' \
\! -path 'third_party/sqlite/amalgamation/*' \
\! -path 'third_party/sqlite/sqlite3.h' \
\! -path 'third_party/sqlite/src/ext/*' \
@@ -599,6 +599,7 @@ clean_third_party() {
\! -path 'third_party/webrtc/*' \
\! -path 'third_party/widevine/*' \
\! -path 'third_party/x86inc/*' \
+ \! -path 'third_party/zlib/google/*' \
-print -delete
rm -vf third_party/expat/files/lib/expat.h
@@ -790,7 +791,6 @@ remove_tests() {
third_party/webrtc/system_wrappers/test \
third_party/webrtc/test/manual \
third_party/webrtc/test/testsupport/mac \
- third_party/webrtc/video_engine/test/android \
third_party/webrtc/video_engine/test/auto_test/android \
third_party/webrtc/voice_engine/test/android \
third_party/xdg-utils/tests \
@@ -886,6 +886,7 @@ remove_tests() {
'!' -path './chrome/browser/extensions/api/declarative/test_rules_registry.*' \
'!' -path './chrome/browser/extensions/api/test/test_api.*' \
'!' -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*' \
'!' -path './chrome/common/net/test_server_locations.*' \
'!' -path './chrome/renderer/resources/extensions/test_custom_bindings.js' \
@@ -896,7 +897,7 @@ remove_tests() {
'!' -path './native_client/src/trusted/service_runtime/env_cleanser_test.h' \
'!' -path './net/base/test_completion_callback.*' \
'!' -path './net/base/test_data_stream.*' \
- '!' -path './net/base/test_root_certs*' \
+ '!' -path './net/cert/test_root_certs*' \
'!' -path './remoting/base/resources_unittest.*' \
'!' -path './third_party/skia/src/gpu/gr_unittests.*' \
'!' -path './tools/compile_test/compile_test.py' \
@@ -908,11 +909,6 @@ remove_tests() {
-print -delete || :
}
-remove_nonessential_dirs > REMOVED-nonessential_dirs.txt
-almost_strip_dirs > REMOVED-stripped.txt
-remove_bin_only > REMOVED-bin_only.txt
-remove_tests > REMOVED-tests.txt
-
strip_system_dirs \
native_client/src/third_party_mod/jsoncpp \
third_party/bzip2 \
@@ -935,12 +931,17 @@ strip_system_dirs \
third_party/opus \
third_party/protobuf \
third_party/re2 \
+ third_party/snappy \
third_party/speex \
third_party/sqlite \
third_party/yasm \
- third_party/zlib \
+ third_party/zlib_ \
v8 \
> REMOVED-system_dirs.txt
+remove_nonessential_dirs > REMOVED-nonessential_dirs.txt
+almost_strip_dirs > REMOVED-stripped.txt
+remove_bin_only > REMOVED-bin_only.txt
+remove_tests > REMOVED-tests.txt
if [ "${sqlite:-1}" = 1 ]; then
# some code does not pass -DUSE_SYSTEM_SQLITE properly
diff --git a/dlopen_sonamed_gl.patch b/dlopen_sonamed_gl.patch
index 93e3806..4043c86 100644
--- a/dlopen_sonamed_gl.patch
+++ b/dlopen_sonamed_gl.patch
@@ -4,9 +4,9 @@ as we don't want to Depend on the -dev packages for the .so files:
- libGLESv2.so.2: Mesa-libGLES-7.11-0.20110227.1
- libEGL.so.1: Mesa-libEGL-7.10-1
---- chromium-browser-21.0.1180.57/src/ui/gl/gl_implementation_linux.cc~ 2012-07-27 04:02:32.000000000 +0300
-+++ chromium-browser-21.0.1180.57/src/ui/gl/gl_implementation_linux.cc 2012-08-01 00:18:16.271402111 +0300
-@@ -75,7 +75,7 @@
+--- chromium-browser-28.0.1500.20/ui/gl/gl_implementation_x11.cc~ 2013-05-21 05:45:59.000000000 +0300
++++ chromium-browser-28.0.1500.20/ui/gl/gl_implementation_x11.cc 2013-05-28 00:21:02.745914853 +0300
+@@ -79,7 +79,7 @@
}
base::NativeLibrary library = LoadLibrary(
diff --git a/no-pnacl.patch b/no-pnacl.patch
deleted file mode 100644
index 8ec0151..0000000
--- a/no-pnacl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp.orig 2013-03-27 19:49:17.000000000 +0100
-+++ ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp 2013-03-27 19:49:59.000000000 +0100
-@@ -13,7 +13,7 @@
- 'target_name': 'pnacl_support_extension',
- 'type': 'none',
- 'conditions': [
-- ['disable_nacl==0 and disable_nacl_untrusted==0', {
-+ ['disable_nacl==0 and disable_pnacl==0 and disable_nacl_untrusted==0', {
- 'dependencies': [
- '../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim',
- '../../../../../native_client/tools.gyp:prep_toolchain',
diff --git a/speechd-0.8.patch b/speechd-0.8.patch
deleted file mode 100644
index c2e11e6..0000000
--- a/speechd-0.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chromium-browser-26.0.1410.19/src/build/linux/system.gyp~ 2013-03-04 00:04:06.000000000 +0200
-+++ chromium-browser-26.0.1410.19/src/build/linux/system.gyp 2013-03-04 13:45:31.822101677 +0200
-@@ -494,7 +494,7 @@
- '--name', 'LibSpeechdLoader',
- '--output-h', '<(output_h)',
- '--output-cc', '<(output_cc)',
-- '--header', '<libspeechd.h>',
-+ '--header', '<speech-dispatcher/libspeechd.h>',
- '--link-directly=<(linux_link_libspeechd)',
- 'spd_open',
- 'spd_say',
diff --git a/system-ffmpeg.patch b/system-ffmpeg.patch
index d9358f5..70b2058 100644
--- a/system-ffmpeg.patch
+++ b/system-ffmpeg.patch
@@ -1,8 +1,5 @@
-Index: tools/compile_test/compile_test.py
-diff --git a/tools/compile_test/compile_test.py b/tools/compile_test/compile_test.py
-index 79371a1fd05d2e03e098340527fc897faadad54c..bbda4abfe54f327aabede26f400bebd5e1376d82 100755
---- a/tools/compile_test/compile_test.py
-+++ b/tools/compile_test/compile_test.py
+--- 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.')
@@ -14,15 +11,15 @@ index 79371a1fd05d2e03e098340527fc897faadad54c..bbda4abfe54f327aabede26f400bebd5
tmpdir = tempfile.mkdtemp()
try:
-@@ -41,7 +41,7 @@
+@@ -42,7 +42,7 @@
o_path = os.path.join(tmpdir, 'test.o')
-- cxx_popen = subprocess.Popen([cxx, cxx_path, '-o', o_path, '-c'],
-+ cxx_popen = subprocess.Popen(cxx + [cxx_path, '-o', o_path, '-c'],
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
- cxx_stdout, cxx_stderr = cxx_popen.communicate()
+- 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
@@ -63,3 +60,38 @@ index df217d2..fde3830 100644
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)',
+--- 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 @@
+ // Get side data if any. For now, the only type of side_data is VP8 Alpha. We
+ // keep this generic so that other side_data types in the future can be
+ // handled the same way as well.
+- av_packet_split_side_data(packet.get());
+ int side_data_size = 0;
+- uint8* side_data = av_packet_get_side_data(
++ uint8* side_data = NULL;
++#ifndef CHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL
++ av_packet_split_side_data(packet.get());
++ side_data = av_packet_get_side_data(
+ packet.get(),
+ AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
+ &side_data_size);
++#endif
+
+ // 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
diff --git a/system-libxnvctrl.patch b/system-libxnvctrl.patch
index c332fef..be4624a 100644
--- a/system-libxnvctrl.patch
+++ b/system-libxnvctrl.patch
@@ -1,79 +1,51 @@
-todo use generate_shim_headers script
+TODO: use generate_shim_headers script
---- chromium-browser-24.0.1312.45/src/third_party/libXNVCtrl/libXNVCtrl.gyp 2013-01-04 00:45:35.620067292 +0200
-+++ chromium-browser-25.0.1364.29/src/third_party/libXNVCtrl/libXNVCtrl.gyp 2013-01-12 16:17:25.440747088 +0200
-@@ -5,14 +5,55 @@
- {
-- 'targets': [
-- {
-- 'target_name': 'libXNVCtrl',
-- 'type': 'static_library',
-- 'sources': [
-- 'NVCtrl.c',
-- 'NVCtrl.h',
-- 'NVCtrlLib.h',
-- 'nv_control.h',
-+ 'variables': {
-+ 'use_system_libxnvctrl%': 0,
-+ },
-+ 'conditions': [
-+ ['use_system_libxnvctrl==0', {
-+ 'targets': [
-+ {
-+ 'target_name': 'libXNVCtrl',
-+ 'type': 'static_library',
-+ 'sources': [
-+ 'NVCtrl.c',
-+ 'NVCtrl.h',
-+ 'NVCtrlLib.h',
-+ 'nv_control.h',
-+ ],
-+ },
- ],
-- },
-- ],
-+ }, { # use_system_libxnvctrl==1
-+ 'conditions': [
-+ ['sysroot!=""', {
-+ 'variables': {
-+ 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
-+ },
-+ }, {
-+ 'variables': {
-+ 'pkg-config': 'pkg-config'
-+ },
-+ }],
-+ ],
-+ 'targets': [
-+ {
-+ 'target_name': 'libXNVCtrl',
-+ 'type': 'none',
-+ 'direct_dependent_settings': {
-+ 'cflags': [
-+ '<!@(<(pkg-config) --cflags libXNVCtrl)',
-+ ],
-+ 'defines': [
-+ 'USE_SYSTEM_LIBXNVCTRL',
-+ ],
-+ },
-+ 'link_settings': {
-+ 'ldflags': [
-+ '<!@(<(pkg-config) --libs-only-L --libs-only-other libXNVCtrl)',
-+ ],
-+ 'libraries': [
-+ '<!@(<(pkg-config) --libs-only-l libXNVCtrl)',
-+ ],
-+ },
-+ }
-+ ],
-+ }],
-+ ]
- }
---- chromium-browser-25.0.1364.29/src/content/gpu/gpu_info_collector_linux.cc 2013-01-12 16:11:48.998635662 +0200
-+++ chromium-browser-25.0.1364.29/src/content/gpu/gpu_info_collector_linux.cc 2013-01-12 16:29:12.273316708 +0200
+--- /dev/null 2007-02-13 18:29:53.000000000 +0200
++++ chromium-browser-28.0.1500.20/build/linux/unbundle/libXNVCtrl.gyp 2013-05-28 00:31:04.522225050 +0300
+@@ -0,0 +1,28 @@
++# 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.
++
++{
++ 'targets': [
++ {
++ 'target_name': 'libXNVCtrl',
++ 'type': 'none',
++ 'direct_dependent_settings': {
++ 'cflags': [
++ '<!@(pkg-config --cflags libXNVCtrl)',
++ ],
++ 'defines': [
++ 'USE_SYSTEM_LIBXNVCTRL',
++ ],
++ },
++ 'link_settings': {
++ 'ldflags': [
++ '<!@(pkg-config --libs-only-L --libs-only-other libXNVCtrl)',
++ ],
++ 'libraries': [
++ '<!@(pkg-config --libs-only-l libXNVCtrl)',
++ ],
++ },
++ }
++ ],
++}
+--- chromium-browser-28.0.1500.20/build/linux/unbundle/replace_gyp_files.py~ 2013-05-21 05:47:31.000000000 +0300
++++ chromium-browser-28.0.1500.20/build/linux/unbundle/replace_gyp_files.py 2013-05-29 23:15:43.738468072 +0300
+@@ -29,6 +29,7 @@
+ 'use_system_libvpx': 'third_party/libvpx/libvpx.gyp',
+ 'use_system_libwebp': 'third_party/libwebp/libwebp.gyp',
+ 'use_system_libxml': 'third_party/libxml/libxml.gyp',
++ 'use_system_libxnvctrl' : 'third_party/libXNVCtrl/libXNVCtrl.gyp',
+ 'use_system_libxslt': 'third_party/libxslt/libxslt.gyp',
+ 'use_system_opus': 'third_party/opus/opus.gyp',
+ 'use_system_re2': 'third_party/re2/re2.gyp',
+--- chromium-browser-28.0.1500.20/content/gpu/gpu_info_collector_x11.cc~ 2013-05-21 05:47:09.000000000 +0300
++++ chromium-browser-28.0.1500.20/content/gpu/gpu_info_collector_x11.cc 2013-05-28 21:17:34.045674426 +0300
@@ -18,8 +18,7 @@
- #include "base/string_tokenizer.h"
- #include "base/string_util.h"
+ #include "base/strings/string_split.h"
+ #include "base/strings/string_tokenizer.h"
#include "library_loaders/libpci.h"
-#include "third_party/libXNVCtrl/NVCtrl.h"
-#include "third_party/libXNVCtrl/NVCtrlLib.h"
@@ -82,7 +54,7 @@ todo use generate_shim_headers script
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_implementation.h"
--- /dev/null 2007-02-13 18:29:53.000000000 +0200
-+++ hromium-browser-25.0.1364.29/src/third_party/libXNVCtrl/libXNVCtrl.h 2013-01-12 16:27:55.676465329 +0200
++++ chromium-browser-25.0.1364.29/src/third_party/libXNVCtrl/libXNVCtrl.h 2013-01-12 16:27:55.676465329 +0200
@@ -0,0 +1,17 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/9245150b876ee2d96f57b259ff344071be66224d
More information about the pld-cvs-commit
mailing list