[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/18.0.1025.168_r134367-1-14-gca0f508

Giuseppe Iuculano iuculano at debian.org
Tue May 29 14:34:08 UTC 2012


The following commit has been merged in the experimental branch:
commit ca0f508c24b568498d3a3077f7d9b381fd41a287
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Tue May 29 16:34:38 2012 +0200

    Updated patches

diff --git a/debian/patches/protobuf.patch b/debian/patches/protobuf.patch
index f32cef2..ec77c4f 100644
--- a/debian/patches/protobuf.patch
+++ b/debian/patches/protobuf.patch
@@ -1,7 +1,7 @@
 Index: exp/src/chrome/app/policy/cloud_policy_codegen.gyp
 ===================================================================
---- exp.orig/src/chrome/app/policy/cloud_policy_codegen.gyp	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/chrome/app/policy/cloud_policy_codegen.gyp	2012-05-28 18:53:39.090754087 +0200
+--- exp.orig/src/chrome/app/policy/cloud_policy_codegen.gyp	2012-05-19 16:54:41.000000000 +0200
++++ exp/src/chrome/app/policy/cloud_policy_codegen.gyp	2012-05-29 14:22:19.006236717 +0200
 @@ -115,7 +115,7 @@
          'cloud_policy_proto_compile',
          'cloud_policy_backend_header_compile',
@@ -13,9 +13,9 @@ Index: exp/src/chrome/app/policy/cloud_policy_codegen.gyp
    ],
 Index: exp/src/chrome/chrome_browser.gypi
 ===================================================================
---- exp.orig/src/chrome/chrome_browser.gypi	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/chrome/chrome_browser.gypi	2012-05-28 18:53:39.090754087 +0200
-@@ -4837,8 +4837,7 @@
+--- exp.orig/src/chrome/chrome_browser.gypi	2012-05-28 09:38:34.000000000 +0200
++++ exp/src/chrome/chrome_browser.gypi	2012-05-29 14:22:19.006236717 +0200
+@@ -4843,8 +4843,7 @@
              ['chromeos==1',{
                'dependencies': [
                  '../dbus/dbus.gyp:dbus',
@@ -27,8 +27,8 @@ Index: exp/src/chrome/chrome_browser.gypi
                  ['system_libcros==0', {
 Index: exp/src/net/net.gyp
 ===================================================================
---- exp.orig/src/net/net.gyp	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/net/net.gyp	2012-05-28 18:53:39.094754086 +0200
+--- exp.orig/src/net/net.gyp	2012-05-19 16:54:19.000000000 +0200
++++ exp/src/net/net.gyp	2012-05-29 14:22:19.006236717 +0200
 @@ -1539,7 +1539,7 @@
              '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_compile',
              # The test server uses Python modules generated by the sync protos.
@@ -40,9 +40,9 @@ Index: exp/src/net/net.gyp
          ['os_posix == 1 and OS != "mac" and OS != "android"', {
 Index: exp/src/remoting/remoting.gyp
 ===================================================================
---- exp.orig/src/remoting/remoting.gyp	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/remoting/remoting.gyp	2012-05-28 18:53:39.094754086 +0200
-@@ -1030,7 +1030,7 @@
+--- exp.orig/src/remoting/remoting.gyp	2012-05-29 14:22:01.046237146 +0200
++++ exp/src/remoting/remoting.gyp	2012-05-29 14:22:19.010236718 +0200
+@@ -1046,7 +1046,7 @@
          '../net/net.gyp:net',
          '../skia/skia.gyp:skia',
          '../third_party/libvpx/libvpx.gyp:libvpx',
@@ -51,7 +51,7 @@ Index: exp/src/remoting/remoting.gyp
          '../third_party/zlib/zlib.gyp:zlib',
          '../media/media.gyp:yuv_convert',
          'remoting_jingle_glue',
-@@ -1040,7 +1040,7 @@
+@@ -1056,7 +1056,7 @@
          '../base/base.gyp:base',
          '../net/net.gyp:net',
          '../skia/skia.gyp:skia',
@@ -62,8 +62,8 @@ Index: exp/src/remoting/remoting.gyp
        # This target needs a hard dependency because dependent targets
 Index: exp/src/third_party/cacheinvalidation/cacheinvalidation.gyp
 ===================================================================
---- exp.orig/src/third_party/cacheinvalidation/cacheinvalidation.gyp	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/third_party/cacheinvalidation/cacheinvalidation.gyp	2012-05-28 18:53:39.094754086 +0200
+--- exp.orig/src/third_party/cacheinvalidation/cacheinvalidation.gyp	2012-05-19 16:54:27.000000000 +0200
++++ exp/src/third_party/cacheinvalidation/cacheinvalidation.gyp	2012-05-29 14:22:19.010236718 +0200
 @@ -18,7 +18,7 @@
      # Where files generated from proto files are put.
      'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
@@ -102,8 +102,8 @@ Index: exp/src/third_party/cacheinvalidation/cacheinvalidation.gyp
        # header files.
 Index: exp/src/third_party/safe_browsing/safe_browsing.gyp
 ===================================================================
---- exp.orig/src/third_party/safe_browsing/safe_browsing.gyp	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/third_party/safe_browsing/safe_browsing.gyp	2012-05-28 18:53:39.094754086 +0200
+--- exp.orig/src/third_party/safe_browsing/safe_browsing.gyp	2012-05-19 16:54:32.000000000 +0200
++++ exp/src/third_party/safe_browsing/safe_browsing.gyp	2012-05-29 14:22:19.010236718 +0200
 @@ -13,10 +13,10 @@
          'testing/testing_input.dat',
        ],
@@ -119,8 +119,8 @@ Index: exp/src/third_party/safe_browsing/safe_browsing.gyp
    ],
 Index: exp/src/build/linux/system.gyp
 ===================================================================
---- exp.orig/src/build/linux/system.gyp	2012-05-28 18:53:39.014754085 +0200
-+++ exp/src/build/linux/system.gyp	2012-05-28 18:53:57.342754139 +0200
+--- exp.orig/src/build/linux/system.gyp	2012-05-29 14:22:18.926236719 +0200
++++ exp/src/build/linux/system.gyp	2012-05-29 14:22:19.010236718 +0200
 @@ -447,6 +447,26 @@
        ],
      },
@@ -150,8 +150,8 @@ Index: exp/src/build/linux/system.gyp
        # link directly in this version of the target to allow this.
 Index: exp/src/chrome/chrome_browser_extensions.gypi
 ===================================================================
---- exp.orig/src/chrome/chrome_browser_extensions.gypi	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/chrome/chrome_browser_extensions.gypi	2012-05-28 18:53:39.094754086 +0200
+--- exp.orig/src/chrome/chrome_browser_extensions.gypi	2012-05-19 16:55:35.000000000 +0200
++++ exp/src/chrome/chrome_browser_extensions.gypi	2012-05-29 14:22:19.010236718 +0200
 @@ -634,8 +634,7 @@
                ],
                'dependencies': [
@@ -164,8 +164,8 @@ Index: exp/src/chrome/chrome_browser_extensions.gypi
                  ['system_libcros==0', {
 Index: exp/src/dbus/dbus.gyp
 ===================================================================
---- exp.orig/src/dbus/dbus.gyp	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/dbus/dbus.gyp	2012-05-28 18:53:39.094754086 +0200
+--- exp.orig/src/dbus/dbus.gyp	2012-05-19 16:54:07.000000000 +0200
++++ exp/src/dbus/dbus.gyp	2012-05-29 14:22:19.010236718 +0200
 @@ -13,7 +13,7 @@
        'dependencies': [
          '../base/base.gyp:base',
@@ -177,8 +177,8 @@ Index: exp/src/dbus/dbus.gyp
          '../base/base.gyp:base',
 Index: exp/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp
 ===================================================================
---- exp.orig/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp	2012-05-28 18:53:39.094754086 +0200
+--- exp.orig/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp	2012-05-19 16:56:41.000000000 +0200
++++ exp/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp	2012-05-29 14:22:19.010236718 +0200
 @@ -73,14 +73,14 @@
            'rule_name': 'genproto',
            'extension': 'proto',
@@ -217,8 +217,8 @@ Index: exp/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp
      {
 Index: exp/src/third_party/webrtc/build/protoc.gypi
 ===================================================================
---- exp.orig/src/third_party/webrtc/build/protoc.gypi	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/third_party/webrtc/build/protoc.gypi	2012-05-28 18:53:39.094754086 +0200
+--- exp.orig/src/third_party/webrtc/build/protoc.gypi	2012-05-28 09:38:46.000000000 +0200
++++ exp/src/third_party/webrtc/build/protoc.gypi	2012-05-29 14:22:19.010236718 +0200
 @@ -44,7 +44,7 @@
  
  {
@@ -249,8 +249,8 @@ Index: exp/src/third_party/webrtc/build/protoc.gypi
    # files.
 Index: exp/src/third_party/mozc/session/session.gyp
 ===================================================================
---- exp.orig/src/third_party/mozc/session/session.gyp	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/third_party/mozc/session/session.gyp	2012-05-28 18:53:39.094754086 +0200
+--- exp.orig/src/third_party/mozc/session/session.gyp	2012-05-19 16:56:45.000000000 +0200
++++ exp/src/third_party/mozc/session/session.gyp	2012-05-29 14:22:19.010236718 +0200
 @@ -70,7 +70,7 @@
        'dependencies': [
          '../composer/composer.gyp:composer',
@@ -262,8 +262,8 @@ Index: exp/src/third_party/mozc/session/session.gyp
        ],
 Index: exp/src/third_party/mozc/session/session_base.gyp
 ===================================================================
---- exp.orig/src/third_party/mozc/session/session_base.gyp	2012-05-28 11:16:48.842675720 +0200
-+++ exp/src/third_party/mozc/session/session_base.gyp	2012-05-28 18:53:39.094754086 +0200
+--- exp.orig/src/third_party/mozc/session/session_base.gyp	2012-05-19 16:56:45.000000000 +0200
++++ exp/src/third_party/mozc/session/session_base.gyp	2012-05-29 14:22:19.010236718 +0200
 @@ -118,7 +118,7 @@
          '<(proto_out_dir)/<(relative_dir)/state.pb.cc',
        ],
diff --git a/debian/patches/vpx.patch b/debian/patches/vpx.patch
index 9936761..0a2e422 100644
--- a/debian/patches/vpx.patch
+++ b/debian/patches/vpx.patch
@@ -1,8 +1,8 @@
 Index: exp/src/remoting/remoting.gyp
 ===================================================================
---- exp.orig/src/remoting/remoting.gyp	2012-05-28 11:15:29.000000000 +0200
-+++ exp/src/remoting/remoting.gyp	2012-05-28 11:16:36.962675697 +0200
-@@ -1029,7 +1029,7 @@
+--- exp.orig/src/remoting/remoting.gyp	2012-05-29 14:22:19.000000000 +0200
++++ exp/src/remoting/remoting.gyp	2012-05-29 14:23:06.154235589 +0200
+@@ -1045,7 +1045,7 @@
          '../ui/ui.gyp:ui',
          '../net/net.gyp:net',
          '../skia/skia.gyp:skia',
@@ -11,16 +11,3 @@ Index: exp/src/remoting/remoting.gyp
          '../build/linux/system.gyp:protobuf',
          '../third_party/zlib/zlib.gyp:zlib',
          '../media/media.gyp:yuv_convert',
-Index: exp/src/third_party/ffmpeg/ffmpeg.gyp
-===================================================================
---- exp.orig/src/third_party/ffmpeg/ffmpeg.gyp	2012-05-28 11:06:45.000000000 +0200
-+++ exp/src/third_party/ffmpeg/ffmpeg.gyp	2012-05-28 11:15:48.230675556 +0200
-@@ -504,7 +504,7 @@
-             ['OS == "linux" or OS == "solaris"', {
-               'link_settings': {
-                 'libraries': [
--                  '-ldl',
-+                  '-ldl', '-lvpx',
-                 ],
-               },
-             }],

-- 
Git repository for pkg-chromium



More information about the Pkg-chromium-commit mailing list