[Pkg-chromium-commit] [pkg-chromium] 02/04: refresh patches for chromium 34

Michael Gilbert mgilbert at moszumanska.debian.org
Sat May 17 19:48:54 UTC 2014 

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch wheezy
in repository pkg-chromium.

commit 9c75bea1349683164d93ee5a495e8254df551733
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Apr 13 16:11:29 2014 -0400

    refresh patches for chromium 34
    
    Conflicts:
    	debian/patches/chromedriver-revision.patch
    	debian/patches/gold-linker.patch
    	debian/patches/no-promo.patch
    	debian/patches/series
    	debian/patches/window-placement.patch
---
 debian/patches/disable-gn.patch    | 25 +++++++++++++++++--------
 debian/patches/icon.patch          |  8 ++++----
 debian/patches/nspr.patch          | 26 +++++++++++++-------------
 debian/patches/nss.patch           |  8 ++++----
 debian/patches/system-speech.patch | 22 +++++++++++-----------
 5 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/debian/patches/disable-gn.patch b/debian/patches/disable-gn.patch
index 0d4ecf0..d9c1be5 100644
--- a/debian/patches/disable-gn.patch
+++ b/debian/patches/disable-gn.patch
@@ -1,15 +1,24 @@
-Index: sid/src/build/gyp_chromium
+description: disable RunGN
+
+Index: chromium/src/build/gyp_chromium
 ===================================================================
---- sid.orig/src/build/gyp_chromium	2014-03-12 10:11:40.000000000 +0100
-+++ sid/src/build/gyp_chromium	2014-03-14 18:33:43.564918455 +0100
-@@ -245,8 +245,8 @@
+--- chromium.orig/src/build/gyp_chromium	2014-04-11 01:47:45.796272377 +0000
++++ chromium/src/build/gyp_chromium	2014-04-11 01:57:42.008257029 +0000
+@@ -39,8 +39,6 @@
+ sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
+     'Source', 'build', 'scripts'))
  
-   supplemental_includes = GetSupplementalFiles()
+-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
+@@ -477,8 +475,6 @@
+     args.append('--check')
  
+   supplemental_includes = GetSupplementalFiles()
 -  if not RunGN(supplemental_includes):
 -    sys.exit(1)
-+  #if not RunGN(supplemental_includes):
-+  #  sys.exit(1)
- 
    args.extend(
        ['-I' + i for i in additional_include_files(supplemental_includes, args)])
+ 
diff --git a/debian/patches/icon.patch b/debian/patches/icon.patch
index 719cfbc..558c706 100644
--- a/debian/patches/icon.patch
+++ b/debian/patches/icon.patch
@@ -1,8 +1,8 @@
-Index: sid/src/chrome/browser/ui/gtk/gtk_util.cc
+Index: chromium/src/chrome/browser/ui/gtk/gtk_util.cc
 ===================================================================
---- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc	2014-03-14 17:20:03.532905820 +0100
-+++ sid/src/chrome/browser/ui/gtk/gtk_util.cc	2014-03-14 17:20:03.528905820 +0100
-@@ -55,7 +55,7 @@
+--- chromium.orig/src/chrome/browser/ui/gtk/gtk_util.cc	2014-04-11 01:43:18.260279264 +0000
++++ chromium/src/chrome/browser/ui/gtk/gtk_util.cc	2014-04-11 01:43:18.256279264 +0000
+@@ -56,7 +56,7 @@
  #if defined(GOOGLE_CHROME_BUILD)
  static const char* kIconName = "google-chrome";
  #else
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 4f327c3..8671fb7 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,8 +1,8 @@
 Include system copy of prtime.h
-Index: sid/src/chrome/browser/metrics/metrics_log.cc
+Index: chromium/src/chrome/browser/metrics/metrics_log.cc
 ===================================================================
---- sid.orig/src/chrome/browser/metrics/metrics_log.cc	2014-03-14 17:19:44.940905767 +0100
-+++ sid/src/chrome/browser/metrics/metrics_log.cc	2014-03-14 17:19:44.936905766 +0100
+--- chromium.orig/src/chrome/browser/metrics/metrics_log.cc	2014-04-11 01:42:59.284279752 +0000
++++ chromium/src/chrome/browser/metrics/metrics_log.cc	2014-04-11 01:42:59.252279753 +0000
 @@ -22,7 +22,7 @@
  #include "base/strings/string_util.h"
  #include "base/strings/utf_string_conversions.h"
@@ -12,11 +12,11 @@ Index: sid/src/chrome/browser/metrics/metrics_log.cc
  #include "base/time/time.h"
  #include "base/tracked_objects.h"
  #include "chrome/browser/autocomplete/autocomplete_input.h"
-Index: sid/src/base/base.gypi
+Index: chromium/src/base/base.gypi
 ===================================================================
---- sid.orig/src/base/base.gypi	2014-03-14 17:19:44.940905767 +0100
-+++ sid/src/base/base.gypi	2014-03-14 17:19:44.936905766 +0100
-@@ -25,7 +25,6 @@
+--- chromium.orig/src/base/base.gypi	2014-04-11 01:42:59.284279752 +0000
++++ chromium/src/base/base.gypi	2014-04-11 01:42:59.252279753 +0000
+@@ -26,7 +26,6 @@
            'third_party/nspr/prcpucfg_openbsd.h',
            'third_party/nspr/prcpucfg_solaris.h',
            'third_party/nspr/prcpucfg_win.h',
@@ -24,10 +24,10 @@ Index: sid/src/base/base.gypi
            'third_party/nspr/prtime.h',
            'third_party/nspr/prtypes.h',
            'third_party/xdg_mime/xdgmime.h',
-Index: sid/src/base/time/pr_time_unittest.cc
+Index: chromium/src/base/time/pr_time_unittest.cc
 ===================================================================
---- sid.orig/src/base/time/pr_time_unittest.cc	2014-03-14 17:19:44.940905767 +0100
-+++ sid/src/base/time/pr_time_unittest.cc	2014-03-14 17:19:44.936905766 +0100
+--- chromium.orig/src/base/time/pr_time_unittest.cc	2014-04-11 01:42:59.284279752 +0000
++++ chromium/src/base/time/pr_time_unittest.cc	2014-04-11 01:42:59.252279753 +0000
 @@ -5,7 +5,7 @@
  #include <time.h>
  
@@ -37,10 +37,10 @@ Index: sid/src/base/time/pr_time_unittest.cc
  #include "base/time/time.h"
  #include "testing/gtest/include/gtest/gtest.h"
  
-Index: sid/src/base/time/time.cc
+Index: chromium/src/base/time/time.cc
 ===================================================================
---- sid.orig/src/base/time/time.cc	2014-03-14 17:19:44.940905767 +0100
-+++ sid/src/base/time/time.cc	2014-03-14 17:19:44.936905766 +0100
+--- chromium.orig/src/base/time/time.cc	2014-04-11 01:42:59.284279752 +0000
++++ chromium/src/base/time/time.cc	2014-04-11 01:42:59.252279753 +0000
 @@ -10,8 +10,8 @@
  #include "base/float_util.h"
  #include "base/lazy_instance.h"
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index 7ebbf0c..d2491c4 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,9 +1,9 @@
 webkit needs to call nss to pull in nspr headers
-Index: sid/src/chrome/chrome_common.gypi
+Index: chromium/src/chrome/chrome_common.gypi
 ===================================================================
---- sid.orig/src/chrome/chrome_common.gypi	2014-03-14 17:19:52.612905788 +0100
-+++ sid/src/chrome/chrome_common.gypi	2014-03-14 17:19:52.608905788 +0100
-@@ -508,6 +508,11 @@
+--- chromium.orig/src/chrome/chrome_common.gypi	2014-04-11 01:43:04.164279626 +0000
++++ chromium/src/chrome/chrome_common.gypi	2014-04-11 01:43:04.164279626 +0000
+@@ -492,6 +492,11 @@
                'common/local_discovery/local_discovery_messages.h',
              ]
          }],
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 9bdb9e9..090a24f 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,9 +1,9 @@
 Use system speex
-Index: sid/src/build/linux/system.gyp
+Index: chromium/src/build/linux/system.gyp
 ===================================================================
---- sid.orig/src/build/linux/system.gyp	2014-03-14 17:19:59.160905807 +0100
-+++ sid/src/build/linux/system.gyp	2014-03-14 17:19:59.156905807 +0100
-@@ -337,6 +337,26 @@
+--- chromium.orig/src/build/linux/system.gyp	2014-04-11 01:43:12.108279422 +0000
++++ chromium/src/build/linux/system.gyp	2014-04-11 01:43:12.104279422 +0000
+@@ -332,6 +332,26 @@
        ],
      },
      {
@@ -30,10 +30,10 @@ Index: sid/src/build/linux/system.gyp
        'target_name': 'gnome_keyring',
        'type': 'none',
        'conditions': [
-Index: sid/src/content/browser/speech/audio_encoder.cc
+Index: chromium/src/content/browser/speech/audio_encoder.cc
 ===================================================================
---- sid.orig/src/content/browser/speech/audio_encoder.cc	2014-03-14 17:19:59.160905807 +0100
-+++ sid/src/content/browser/speech/audio_encoder.cc	2014-03-14 17:19:59.156905807 +0100
+--- chromium.orig/src/content/browser/speech/audio_encoder.cc	2014-04-11 01:43:12.108279422 +0000
++++ chromium/src/content/browser/speech/audio_encoder.cc	2014-04-11 01:43:12.104279422 +0000
 @@ -11,7 +11,7 @@
  #include "base/strings/string_number_conversions.h"
  #include "content/browser/speech/audio_buffer.h"
@@ -43,11 +43,11 @@ Index: sid/src/content/browser/speech/audio_encoder.cc
  
  namespace content {
  namespace {
-Index: sid/src/content/content_browser.gypi
+Index: chromium/src/content/content_browser.gypi
 ===================================================================
---- sid.orig/src/content/content_browser.gypi	2014-03-14 17:19:59.160905807 +0100
-+++ sid/src/content/content_browser.gypi	2014-03-14 17:19:59.156905807 +0100
-@@ -1627,7 +1627,7 @@
+--- chromium.orig/src/content/content_browser.gypi	2014-04-11 01:43:12.108279422 +0000
++++ chromium/src/content/content_browser.gypi	2014-04-11 01:43:12.104279422 +0000
+@@ -1639,7 +1639,7 @@
      }, {  # input_speech==1
        'dependencies': [
          '../third_party/flac/flac.gyp:libflac',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git

More information about the Pkg-chromium-commit mailing list