[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/14.0.835.157_r99685-1-6-gaab210f
Giuseppe Iuculano
iuculano at debian.org
Sat Sep 17 19:52:55 UTC 2011
The following commit has been merged in the master branch:
commit a4f4ee14d817414764dfc1c39618172b750fd054
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Sat Sep 17 15:38:01 2011 +0200
Do not install ffmpeg internal copy
diff --git a/debian/chromium.install b/debian/chromium.install
index 4e14be9..c6f06dc 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -5,7 +5,7 @@ debian/tmp/usr/lib/chromium/resources.pak
debian/tmp/usr/lib/chromium/locales/*
#debian/tmp/usr/lib/chromium/ffmpegsumo_nolink
debian/tmp/usr/lib/chromium/libppGoogleNaClPluginChrome.so
-debian/tmp/usr/lib/chromium/libffmpegsumo.so
+#debian/tmp/usr/lib/chromium/libffmpegsumo.so
debian/tmp/usr/lib/chromium/ssl_false_start_blacklist_process
debian/tmp/usr/lib/chromium/nacl_irt_*
debian/chromium.desktop usr/share/applications
diff --git a/debian/control b/debian/control
index 537d434..ab0fc08 100644
--- a/debian/control
+++ b/debian/control
@@ -71,7 +71,6 @@ Build-Depends: cdbs,
libavcodec-dev (>= 4:0.7.1),
libavformat-dev (>= 4:0.7.1),
libavutil-dev (>= 4:0.7.1)
-
Standards-Version: 3.9.2
Package: chromium-browser
diff --git a/debian/patches/protobuf.patch b/debian/patches/protobuf.patch
index 4fb6ab8..f193de0 100644
--- a/debian/patches/protobuf.patch
+++ b/debian/patches/protobuf.patch
@@ -54,10 +54,10 @@
],
'direct_dependent_settings': {
'include_dirs': [
-@@ -164,7 +164,7 @@
- 'cloud_policy_code_generate',
+@@ -165,7 +165,7 @@
'cloud_policy_proto_compile',
'cloud_policy_backend_header_compile',
+ '<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '<(DEPTH)/build/linux/system.gyp:protobuf',
],
@@ -65,7 +65,7 @@
],
--- a/src/chrome/browser/sync/protocol/sync_proto.gyp
+++ b/src/chrome/browser/sync/protocol/sync_proto.gyp
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
'rule_name': 'genproto',
'extension': 'proto',
'inputs': [
@@ -74,7 +74,7 @@
],
'outputs': [
'<(PRODUCT_DIR)/pyproto/sync_pb/<(RULE_INPUT_ROOT)_pb2.py',
-@@ -41,7 +41,7 @@
+@@ -42,7 +42,7 @@
'<(protoc_out_dir)/chrome/browser/sync/protocol/<(RULE_INPUT_ROOT).pb.cc',
],
'action': [
@@ -83,7 +83,7 @@
'--proto_path=.',
'./<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
'--cpp_out=<(protoc_out_dir)/chrome/browser/sync/protocol',
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
},
],
'dependencies': [
@@ -92,7 +92,7 @@
],
},
{
-@@ -84,11 +84,11 @@
+@@ -87,11 +87,11 @@
'<(protoc_out_dir)/chrome/browser/sync/protocol/typed_url_specifics.pb.h',
],
'export_dependent_settings': [
@@ -108,8 +108,8 @@
'direct_dependent_settings': {
--- a/src/chrome/chrome_browser.gypi
+++ b/src/chrome/chrome_browser.gypi
-@@ -4213,8 +4213,7 @@
- ['exclude', '^browser/ui/login/login_prompt_gtk.cc'],
+@@ -4621,8 +4621,7 @@
+ ['exclude', '^browser/ui/views/download/download_shelf_view.h'],
],
'dependencies': [
- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
@@ -118,7 +118,7 @@
],
'conditions': [
['system_libcros==0', {
-@@ -4237,7 +4236,7 @@
+@@ -4645,7 +4644,7 @@
{
'action_name': 'my_proto',
'inputs': [
@@ -127,7 +127,7 @@
'browser/metrics/system_metrics.proto',
],
'outputs': [
-@@ -4245,10 +4244,10 @@
+@@ -4653,10 +4652,10 @@
'<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.h',
],
'dependencies': [
@@ -140,7 +140,7 @@
'browser/metrics/system_metrics.proto',
'--cpp_out=<(INTERMEDIATE_DIR)/chrome',
],
-@@ -4322,7 +4321,7 @@
+@@ -4733,7 +4732,7 @@
'rule_name': 'genproto',
'extension': 'proto',
'inputs': [
@@ -149,7 +149,7 @@
],
'variables': {
# The protoc compiler requires a proto_path argument with the
-@@ -4335,7 +4334,7 @@
+@@ -4746,7 +4745,7 @@
'<(protoc_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT).pb.cc',
],
'action': [
@@ -158,7 +158,7 @@
'--proto_path=./<(rule_input_relpath)',
'./<(rule_input_relpath)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
'--cpp_out=<(protoc_out_dir)/chrome/<(rule_input_relpath)',
-@@ -4344,8 +4343,7 @@
+@@ -4755,8 +4754,7 @@
},
],
'dependencies': [
@@ -168,7 +168,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
-@@ -4353,7 +4351,7 @@
+@@ -4764,7 +4762,7 @@
]
},
'export_dependent_settings': [
@@ -177,7 +177,7 @@
],
},
{
-@@ -4367,7 +4365,7 @@
+@@ -4778,7 +4776,7 @@
'rule_name': 'genproto',
'extension': 'proto',
'inputs': [
@@ -186,7 +186,7 @@
],
'variables': {
# The protoc compiler requires a proto_path argument with the
-@@ -4381,7 +4379,7 @@
+@@ -4792,7 +4790,7 @@
'<(protoc_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT).pb.cc',
],
'action': [
@@ -195,7 +195,7 @@
'--proto_path=./<(rule_input_relpath)',
'./<(rule_input_relpath)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
'--cpp_out=<(protoc_out_dir)/chrome/<(rule_input_relpath)',
-@@ -4390,8 +4388,7 @@
+@@ -4801,8 +4799,7 @@
},
],
'dependencies': [
@@ -205,7 +205,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
-@@ -4399,7 +4396,7 @@
+@@ -4810,7 +4807,7 @@
]
},
'export_dependent_settings': [
@@ -214,7 +214,7 @@
],
},
{
-@@ -4413,7 +4410,7 @@
+@@ -4824,7 +4821,7 @@
'rule_name': 'genproto',
'extension': 'proto',
'inputs': [
@@ -223,7 +223,7 @@
],
'variables': {
# The protoc compiler requires a proto_path argument with the
-@@ -4427,7 +4424,7 @@
+@@ -4838,7 +4835,7 @@
'<(protoc_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT).pb.cc',
],
'action': [
@@ -232,7 +232,7 @@
'--proto_path=./<(rule_input_relpath)',
'./<(rule_input_relpath)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
'--cpp_out=<(protoc_out_dir)/chrome/<(rule_input_relpath)',
-@@ -4436,8 +4433,7 @@
+@@ -4847,8 +4844,7 @@
},
],
'dependencies': [
@@ -242,7 +242,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
-@@ -4445,7 +4441,7 @@
+@@ -4856,7 +4852,7 @@
]
},
'export_dependent_settings': [
@@ -251,48 +251,9 @@
],
},
{
---- a/src/chrome/chrome_renderer.gypi
-+++ b/src/chrome/chrome_renderer.gypi
-@@ -229,7 +229,7 @@
- 'rule_name': 'genproto',
- 'extension': 'proto',
- 'inputs': [
-- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-+ '/usr/bin/protoc',
- ],
- 'variables': {
- # The protoc compiler requires a proto_path argument with the
-@@ -242,7 +242,7 @@
- '<(protoc_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT).pb.cc',
- ],
- 'action': [
-- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-+ '/usr/bin/protoc',
- '--proto_path=./<(rule_input_relpath)',
- './<(rule_input_relpath)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
- '--cpp_out=<(protoc_out_dir)/chrome/<(rule_input_relpath)',
-@@ -251,8 +251,7 @@
- },
- ],
- 'dependencies': [
-- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-- '../third_party/protobuf/protobuf.gyp:protoc#host',
-+ '../build/linux/system.gyp:protobuf',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
-@@ -260,7 +259,7 @@
- ]
- },
- 'export_dependent_settings': [
-- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-+ '../build/linux/system.gyp:protobuf',
- ],
- },
- ],
--- a/src/net/net.gyp
+++ b/src/net/net.gyp
-@@ -1216,7 +1216,7 @@
+@@ -1214,7 +1214,7 @@
'dependencies': [
'../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_compile',
'../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto',
@@ -300,7 +261,7 @@
+ '../build/linux/system.gyp:protobuf',
],
}],
- ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+ ['os_posix == 1 and OS != "mac"', {
--- a/src/remoting/proto/chromotocol.gyp
+++ b/src/remoting/proto/chromotocol.gyp
@@ -24,14 +24,14 @@
@@ -331,7 +292,7 @@
'include_dirs': [
@@ -56,11 +56,11 @@
'target_name': 'chromotocol_proto_lib',
- 'type': '<(library)',
+ 'type': 'static_library',
'export_dependent_settings': [
- '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '<(DEPTH)/build/linux/system.gyp:protobuf',
@@ -374,7 +335,7 @@
# files.
@@ -50,11 +50,11 @@
'target_name': 'trace_proto_lib',
- 'type': '<(library)',
+ 'type': 'static_library',
'export_dependent_settings': [
- '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '<(DEPTH)/build/linux/system.gyp:protobuf',
@@ -388,19 +349,19 @@
# This target exports a hard dependency because depedents require
--- a/src/remoting/remoting.gyp
+++ b/src/remoting/remoting.gyp
-@@ -116,7 +116,7 @@
- 'dependencies': [
- '../ui/ui.gyp:ui_gfx',
- '../media/media.gyp:media',
+@@ -269,7 +269,7 @@
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../ui/ui.gyp:ui',
+ '../net/net.gyp:net',
- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '../build/linux/system.gyp:protobuf',
'../third_party/libvpx/libvpx.gyp:libvpx_include',
'../third_party/zlib/zlib.gyp:zlib',
- 'chromoting_jingle_glue',
-@@ -126,7 +126,7 @@
- #'third_party/on2/on2.gyp:vp8',
- ],
+ '../media/media.gyp:yuv_convert',
+@@ -282,7 +282,7 @@
'export_dependent_settings': [
+ '../base/base.gyp:base',
+ '../net/net.gyp:net',
- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '../build/linux/system.gyp:protobuf',
'proto/chromotocol.gyp:chromotocol_proto_lib',
@@ -408,7 +369,7 @@
# This target needs a hard dependency because dependent targets
--- a/src/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/src/third_party/cacheinvalidation/cacheinvalidation.gyp
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
# Where files generated from proto files are put.
'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
# The path to the protoc executable.
@@ -417,7 +378,7 @@
},
'targets': [
# The rule/action to generate files from the cacheinvalidation proto
-@@ -55,7 +55,7 @@
+@@ -57,7 +57,7 @@
},
],
'dependencies': [
@@ -426,7 +387,7 @@
],
},
# The C++ files generated from the cache invalidation protocol buffers.
-@@ -71,7 +71,7 @@
+@@ -75,7 +75,7 @@
'<(protoc_out_dir)/<(proto_dir_relpath)/types.pb.cc',
],
'dependencies': [
@@ -435,7 +396,7 @@
'cacheinvalidation_proto',
],
'include_dirs': [
-@@ -83,7 +83,7 @@
+@@ -87,7 +87,7 @@
],
},
'export_dependent_settings': [
@@ -602,3 +563,194 @@
package sync_pb;
+--- a/src/build/linux/system.gyp
++++ b/src/build/linux/system.gyp
+@@ -343,6 +343,26 @@
+ }]]
+ },
+ {
++ 'target_name': 'protobuf',
++ 'type': 'settings',
++ 'conditions': [
++ ['_toolset=="target"', {
++ 'direct_dependent_settings': {
++ 'cflags': [
++ '<!@(pkg-config --cflags protobuf)',
++ ],
++ },
++ 'link_settings': {
++ 'ldflags': [
++ '<!@(pkg-config --libs-only-L --libs-only-other protobuf)',
++ ],
++ 'libraries': [
++ '<!@(pkg-config --libs-only-l protobuf)',
++ ],
++ },
++ }]]
++ },
++ {
+ 'target_name': 'v8',
+ 'type': 'settings',
+ 'conditions': [
+--- a/src/chrome/chrome_common.gypi
++++ b/src/chrome/chrome_common.gypi
+@@ -127,7 +127,7 @@
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
+ '../third_party/libxml/libxml.gyp:libxml',
+- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
++ '../build/linux/system.gyp:protobuf',
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+ '../third_party/zlib/zlib.gyp:zlib',
+ '../ui/ui.gyp:ui_resources',
+@@ -358,7 +358,7 @@
+ 'hard_dependency': 1,
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
++ '../build/linux/system.gyp:protobuf',
+ 'safe_browsing_csd_proto',
+ 'safe_browsing_proto',
+ ],
+@@ -437,7 +437,7 @@
+ 'rule_name': 'genproto',
+ 'extension': 'proto',
+ 'inputs': [
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
++ '/usr/bin/protoc',
+ ],
+ 'variables': {
+ # The protoc compiler requires a proto_path argument with the
+@@ -451,7 +451,7 @@
+ '<(protoc_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT).pb.cc',
+ ],
+ 'action': [
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
++ '/usr/bin/protoc',
+ '--proto_path=./<(rule_input_relpath)',
+ './<(rule_input_relpath)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
+ '--cpp_out=<(protoc_out_dir)/chrome/<(rule_input_relpath)',
+@@ -460,8 +460,7 @@
+ },
+ ],
+ 'dependencies': [
+- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+- '../third_party/protobuf/protobuf.gyp:protoc#host',
++ '../build/linux/system.gyp:protobuf',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+@@ -469,7 +468,7 @@
+ ]
+ },
+ 'export_dependent_settings': [
+- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
++ '../build/linux/system.gyp:protobuf',
+ ],
+ },
+ {
+@@ -484,7 +483,7 @@
+ 'rule_name': 'genproto',
+ 'extension': 'proto',
+ 'inputs': [
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
++ '/usr/bin/protoc',
+ ],
+ 'variables': {
+ # The protoc compiler requires a proto_path argument with the
+@@ -498,7 +497,7 @@
+ '<(protoc_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT).pb.cc',
+ ],
+ 'action': [
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
++ '/usr/bin/protoc',
+ '--proto_path=./<(rule_input_relpath)',
+ './<(rule_input_relpath)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
+ '--cpp_out=<(protoc_out_dir)/chrome/<(rule_input_relpath)',
+@@ -507,8 +506,7 @@
+ },
+ ],
+ 'dependencies': [
+- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+- '../third_party/protobuf/protobuf.gyp:protoc#host',
++ '../build/linux/system.gyp:protobuf',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+@@ -516,7 +514,7 @@
+ ]
+ },
+ 'export_dependent_settings': [
+- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
++ '../build/linux/system.gyp:protobuf',
+ ],
+ },
+ ],
+--- a/src/third_party/libphonenumber/libphonenumber.gyp
++++ b/src/third_party/libphonenumber/libphonenumber.gyp
+@@ -25,7 +25,7 @@
+ 'dependencies': [
+ '../icu/icu.gyp:icui18n',
+ '../icu/icu.gyp:icuuc',
+- '../protobuf/protobuf.gyp:protobuf_lite',
++ '../../build/linux/system.gyp:protobuf',
+ '../../base/base.gyp:base',
+ '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ 'phonenumber_proto',
+@@ -67,7 +67,7 @@
+ 'rule_name': 'genproto',
+ 'extension': 'proto',
+ 'inputs': [
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
++ '/usr/bin/protoc',
+ ],
+ 'variables': {
+ # The protoc compiler requires a proto_path argument with the
+@@ -80,7 +80,7 @@
+ '<(protoc_out_dir)/<(RULE_INPUT_ROOT).pb.cc',
+ ],
+ 'action': [
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
++ '/usr/bin/protoc',
+ '--proto_path=<(rule_input_relpath)',
+ '<(rule_input_relpath)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
+ '--cpp_out=<(protoc_out_dir)',
+@@ -88,8 +88,7 @@
+ 'message': 'Generating C++ code from <(RULE_INPUT_PATH)',
+ }],
+ 'dependencies': [
+- '../protobuf/protobuf.gyp:protobuf_lite',
+- '../protobuf/protobuf.gyp:protoc#host',
++ '../../build/linux/system.gyp:protobuf',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+@@ -97,7 +96,7 @@
+ ]
+ },
+ 'export_dependent_settings': [
+- '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
++ '../../build/linux/system.gyp:protobuf',
+ ],
+ },
+ {
+@@ -113,7 +112,7 @@
+ 'dependencies': [
+ '../icu/icu.gyp:icui18n',
+ '../icu/icu.gyp:icuuc',
+- '../protobuf/protobuf.gyp:protobuf_lite',
++ '../../build/linux/system.gyp:protobuf',
+ '../../base/base.gyp:base',
+ '../../base/base.gyp:test_support_base',
+ '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+--- a/src/third_party/webrtc/modules/audio_processing/main/apm_tests.gyp
++++ b/src/third_party/webrtc/modules/audio_processing/main/apm_tests.gyp
+@@ -21,7 +21,7 @@
+
+ '../../../../testing/gtest.gyp:gtest',
+ '../../../../testing/gtest.gyp:gtest_main',
+- '../../../../third_party/protobuf/protobuf.gyp:protobuf_lite',
++ '../../../../build/linux/system.gyp:protobuf',
+ ],
+ 'include_dirs': [
+ '../../../../testing/gtest/include',
diff --git a/debian/patches/series b/debian/patches/series
index ffbc035..1baa641 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ nspr.patch
nss.patch
expat.patch
prefs.patch
-#protobuf.patch
armv4.patch
ffmpeg_arm.patch
system-speech.patch
@@ -19,3 +18,4 @@ webkit-version.patch
cups1.5.patch
system_v8.patch
system_v8_i18n.patch
+protobuf.patch
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list