Merge lp:~ken-vandine/chromium-browser/chromium-browser.precise into lp:~chromium-team/chromium-browser/chromium-browser.precise

[Ken VanDine]

  [ Matthieu Baerts ]
  * debian/apport:
   - Update apport hook for python3 (LP: #1013171)
     patch made with the help of Edward Donovan

  [ Ken VanDine ]
  * New upstream release from the Stable Channel
  * debian/control
    - Added build depends binutils-gold, libssl-dev and subversion
    - Bumped standards version to 3.9.3
    - don't build depend on binutils-gold for armel
    - add build depends for g++-4.6-multilib
  * debian/rules
    - explicitly set arm_float_abi=hard for armhf builds and let the rest
      fallback to softfp
    - do not use third_party/gold as the linker.
    - enable compile-time dependency on gnome-keyring
    - don't build with -Werror
    - include armv7 in GYP_DEFINES for 11.10, 12.04 and 12.10. Fixes
      FTBFS on arm (LP: #993080)
  * -debian/patches/ubuntu_dont_overwrite_default_download_directory.patch
    - no longer needed
  * debian/patches/grd_parse_fix.patch
    - Patched to fix broken XML until we can get a proper fix for
      chromium-translation-tools.
  * debian/patches/arm.patch
    - patch from debian to fix FTBFS on armel

[Micah Gersten (micahg)]

I've merged this in, it would be good if we could get a dep3 header for the arm patches for future uploads.

=== modified file 'debian/apport/chromium-browser.py'
--- debian/apport/chromium-browser.py	2011-05-09 17:41:33 +0000
+++ debian/apport/chromium-browser.py	2012-07-24 14:10:28 +0000
@@ -11,6 +11,7 @@
 the full text of the license.
 '''
 
+from __future__ import print_function
 import os, sys, getopt, codecs
 import time
 from stat import *
@@ -57,7 +58,7 @@
     report['RelatedPackagesPolicy'] = ''
     for pkg in pkgs:
         script = subprocess.Popen(['apt-cache', 'policy', pkg], stdout=subprocess.PIPE)
-        report['RelatedPackagesPolicy'] += script.communicate()[0] + "\n"
+        report['RelatedPackagesPolicy'] += str(script.communicate()[0]) + "\n"
 
 def gconf_values(report, keys):
     report['gconf-keys'] = ''
@@ -67,7 +68,7 @@
         except OSError:
             report['gconf-keys'] = "gconftool-2 not found"
             return
-        out = script.communicate()[0]
+        out = str(script.communicate()[0])
         if out == "":
             out = "**unset**\n"
         report['gconf-keys'] += key + " = " + out
@@ -105,7 +106,7 @@
     # list entensions+versions
     report['ChromiumPrefs'] += "extensions/settings =\n"
     if 'settings' in entry['extensions']:
-        for ext in entry['extensions']['settings'].keys():
+        for ext in list(entry['extensions']['settings'].keys()):
             report['ChromiumPrefs'] += " - '" + ext + "'\n"
             if 'manifest' in entry['extensions']['settings'][ext]:
                 for k in [ 'name', 'description', 'version', 'update_url' ]:
@@ -243,17 +244,17 @@
 
     # Disk usage
     script = subprocess.Popen([ 'df', '-Th' ], stdout=subprocess.PIPE)
-    report['DiskUsage'] = script.communicate()[0] + "\n\nInodes:\n"
+    report['DiskUsage'] = str(script.communicate()[0]) + "\n\nInodes:\n"
     script = subprocess.Popen([ 'df', '-ih' ], stdout=subprocess.PIPE)
-    report['DiskUsage'] += script.communicate()[0]
+    report['DiskUsage'] += str(script.communicate()[0])
 
 ## DEBUGING ##
 if __name__ == '__main__':
     sys.stdout = codecs.getwriter('utf8')(sys.stdout)
     try:
         opts, args = getopt.getopt(sys.argv[1:], "-u:", [ 'user-dir=' ])
-    except getopt.GetoptError, err:
-        print str(err)
+    except getopt.GetoptError as err:
+        print(str(err))
         sys.exit(2)
 
     userdir = None
@@ -266,4 +267,4 @@
     report = {}
     add_info(report, userdir = userdir)
     for key in report:
-        print '[%s]\n%s\n' % (key, report[key])
+        print('[%s]\n%s\n' % (key, report[key]))

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-01 05:03:00 +0000
+++ debian/changelog	2012-07-24 14:10:28 +0000
@@ -1,3 +1,35 @@
+chromium-browser (20.0.1132.47~r144678-0ubuntu0.12.04.1) UNRELEASED; urgency=low
+
+  [ Matthieu Baerts ]
+  * debian/apport:
+   - Update apport hook for python3 (LP: #1013171)
+     patch made with the help of Edward Donovan
+
+  [ Ken VanDine ]
+  * New upstream release from the Stable Channel
+  * debian/control
+    - Added build depends binutils-gold, libssl-dev and subversion
+    - Bumped standards version to 3.9.3
+    - don't build depend on binutils-gold for armel
+    - add build depends for g++-4.6-multilib
+  * debian/rules
+    - explicitly set arm_float_abi=hard for armhf builds and let the rest
+      fallback to softfp
+    - do not use third_party/gold as the linker.
+    - enable compile-time dependency on gnome-keyring
+    - don't build with -Werror
+    - include armv7 in GYP_DEFINES for 11.10, 12.04 and 12.10.  Fixes 
+      FTBFS on arm (LP: #993080)
+  * -debian/patches/ubuntu_dont_overwrite_default_download_directory.patch
+    - no longer needed
+  * debian/patches/grd_parse_fix.patch
+    - Patched to fix broken XML until we can get a proper fix for
+      chromium-translation-tools.
+  * debian/patches/arm.patch
+    - patch from debian to fix FTBFS on armel
+
+ -- Ken VanDine <[e-mail]>  Thu, 12 Jul 2012 14:02:44 -0400
+
 chromium-browser (18.0.1025.168~r134367-0ubuntu0.12.04.1) precise-security; urgency=low
 
   * New upstream release from the Stable Channel (LP: #992352)

=== modified file 'debian/control'
--- debian/control	2012-03-30 08:38:01 +0000
+++ debian/control	2012-07-24 14:10:28 +0000
@@ -13,6 +13,8 @@
 	patchutils (>= 0.2.25),
 	libc6-dev-i386 [amd64],
 	g++-multilib [amd64],
+	g++-4.6-multilib,
+	binutils-gold [!armel],
 	hardening-wrapper,
 	python,
 	bison,
@@ -48,8 +50,10 @@
 	libdbus-glib-1-dev,
 	libgnome-keyring-dev,
 	libudev-dev,
-	libgconf2-dev
-Standards-Version: 3.8.3
+	libgconf2-dev,
+	libssl-dev,
+	subversion
+Standards-Version: 3.9.3
 
 Package: chromium-browser
 Architecture: any

=== added file 'debian/patches/arm.patch'
--- debian/patches/arm.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/arm.patch	2012-07-24 14:10:28 +0000
@@ -0,0 +1,50 @@
+Index: src/skia/skia.gyp
+===================================================================
+--- src.orig/skia/skia.gyp	2012-05-19 16:54:19.000000000 +0200
++++ src/skia/skia.gyp	2012-06-20 14:34:13.131318952 +0200
+@@ -1157,9 +1157,11 @@
+         [ 'target_arch == "arm" and armv7 != 1', {
+           'sources': [
+             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
++            '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
+           ],
+           'sources!': [
+             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
++            '../third_party/skia/src/opts/opts_check_arm.cpp',
+           ],
+         }],
+       ],
+Index: src/ui/base/resource/data_pack.cc
+===================================================================
+--- src.orig/ui/base/resource/data_pack.cc	2012-05-19 16:55:37.000000000 +0200
++++ src/ui/base/resource/data_pack.cc	2012-06-20 14:38:32.507316901 +0200
+@@ -130,9 +130,11 @@
+   // 2) Verify the entries are within the appropriate bounds. There's an extra
+   // entry after the last item which gives us the length of the last item.
+   for (size_t i = 0; i < resource_count_ + 1; ++i) {
++    uint32 t;
+     const DataPackEntry* entry = reinterpret_cast<const DataPackEntry*>(
+         mmap_->data() + kHeaderLength + (i * sizeof(DataPackEntry)));
+-    if (entry->file_offset > mmap_->length()) {
++    memcpy(&t, &entry->file_offset, 32/8);
++    if (t > mmap_->length()) {
+       LOG(ERROR) << "Entry #" << i << " in data pack points off end of file. "
+                  << "Was the file corrupted?";
+       UMA_HISTOGRAM_ENUMERATION("DataPack.Load", ENTRY_NOT_FOUND,
+Index: src/v8/src/arm/macro-assembler-arm.cc
+===================================================================
+--- src.orig/v8/src/arm/macro-assembler-arm.cc	2012-05-19 16:57:27.000000000 +0200
++++ src/v8/src/arm/macro-assembler-arm.cc	2012-06-20 14:35:27.339318363 +0200
+@@ -61,9 +61,9 @@
+ // We do not support thumb inter-working with an arm architecture not supporting
+ // the blx instruction (below v5t).  If you know what CPU you are compiling for
+ // you can use -march=armv7 or similar.
+-#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
+-# error "For thumb inter-working we require an architecture which supports blx"
+-#endif
++//#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
++//# error "For thumb inter-working we require an architecture which supports blx"
++//#endif
+ 
+ 
+ // Using bx does not yield better code, so use it only when required

=== modified file 'debian/patches/dlopen_sonamed_gl.patch'
--- debian/patches/dlopen_sonamed_gl.patch	2011-10-26 06:14:33 +0000
+++ debian/patches/dlopen_sonamed_gl.patch	2012-07-24 14:10:28 +0000
@@ -9,9 +9,9 @@
 
 Index: src/ui/gfx/gl/gl_implementation_linux.cc
 ===================================================================
---- src.orig/ui/gfx/gl/gl_implementation_linux.cc	2011-10-21 17:35:43.000000000 +0100
-+++ src/ui/gfx/gl/gl_implementation_linux.cc	2011-10-21 18:40:52.767139411 +0100
-@@ -73,7 +73,7 @@
+--- src.orig/ui/gfx/gl/gl_implementation_linux.cc	2012-06-21 16:09:03.011162386 -0400
++++ src/ui/gfx/gl/gl_implementation_linux.cc	2012-06-21 16:14:21.867172877 -0400
+@@ -75,7 +75,7 @@
        }
  
        base::NativeLibrary library = LoadLibrary(
@@ -20,16 +20,3 @@
        if (!library)
          return false;
  
-@@ -120,10 +120,10 @@
-     }
- #endif  // !defined(USE_WAYLAND)
-     case kGLImplementationEGLGLES2: {
--      base::NativeLibrary gles_library = LoadLibrary("libGLESv2.so");
-+      base::NativeLibrary gles_library = LoadLibrary("libGLESv2.so.2");
-       if (!gles_library)
-         return false;
--      base::NativeLibrary egl_library = LoadLibrary("libEGL.so");
-+      base::NativeLibrary egl_library = LoadLibrary("libEGL.so.1");
-       if (!egl_library) {
-         base::UnloadNativeLibrary(gles_library);
-         return false;

=== modified file 'debian/patches/fix-armhf-ftbfs.patch'
--- debian/patches/fix-armhf-ftbfs.patch	2012-03-07 07:24:59 +0000
+++ debian/patches/fix-armhf-ftbfs.patch	2012-07-24 14:10:28 +0000
@@ -2,23 +2,11 @@
 Subject: Fix FTBFS on armhf
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/943281
 
-Index: src/build/common.gypi
-===================================================================
---- src.orig/build/common.gypi	2012-03-05 10:39:30.082526500 +0200
-+++ src/build/common.gypi	2012-03-05 11:02:24.082526500 +0200
-@@ -1814,7 +1814,6 @@
-                     'cflags': [
-                       '-march=armv7-a',
-                       '-mtune=cortex-a8',
--                      '-mfloat-abi=softfp',
-                     ],
-                     'conditions': [
-                       ['arm_neon==1', {
 Index: src/native_client/build/common.gypi
 ===================================================================
---- src.orig/native_client/build/common.gypi	2012-02-15 23:35:45.000000000 +0200
-+++ src/native_client/build/common.gypi	2012-03-05 11:03:09.160651492 +0200
-@@ -289,7 +289,6 @@
+--- src.orig/native_client/build/common.gypi	2012-06-21 14:40:40.000000000 -0400
++++ src/native_client/build/common.gypi	2012-06-21 16:16:02.195176177 -0400
+@@ -294,7 +294,6 @@
                  '-march=armv7-a',
                  '-mtune=cortex-a8',
                  '-mfpu=neon',
@@ -26,15 +14,3 @@
                  '-fno-exceptions',
                  '-Wall',
                  '-fPIC',
-Index: src/third_party/ffmpeg/ffmpeg.gyp
-===================================================================
---- src.orig/third_party/ffmpeg/ffmpeg.gyp	2012-02-15 23:35:36.000000000 +0200
-+++ src/third_party/ffmpeg/ffmpeg.gyp	2012-03-05 11:02:34.004401501 +0200
-@@ -170,7 +170,6 @@
-                 '-mthumb',
-                 '-march=armv7-a',
-                 '-mtune=cortex-a8',
--                '-mfloat-abi=softfp',
-               ],
-               'conditions': [
-                 ['arm_neon == 0', {

=== added file 'debian/patches/grd_parse_fix.patch'
--- debian/patches/grd_parse_fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/grd_parse_fix.patch	2012-07-24 14:10:28 +0000
@@ -0,0 +1,12 @@
+Index: src/chrome/app/chromium_strings.grd
+===================================================================
+--- src.orig/chrome/app/chromium_strings.grd	2012-07-09 14:16:01.091449368 -0400
++++ src/chrome/app/chromium_strings.grd	2012-07-09 14:25:12.951467521 -0400
+@@ -111,7 +111,6 @@
+     <if expr="not pp_ifdef('use_third_party_translations')">
+       <file path="resources/chromium_strings_am.xtb" lang="am" />
+       <file path="resources/chromium_strings_ar.xtb" lang="ar" />
+-    </if>
+       <file path="../../third_party/launchpad_translations/chromium_strings_ast.xtb" lang="ast" />
+       <file path="../../third_party/launchpad_translations/chromium_strings_bg.xtb" lang="bg" />
+       <file path="resources/chromium_strings_bn.xtb" lang="bn" />

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-30 08:42:27 +0000
+++ debian/patches/series	2012-07-24 14:10:28 +0000
@@ -1,8 +1,8 @@
 # system_v8.patch
-ubuntu_dont_overwrite_default_download_directory.patch
 chromium_useragent.patch
 disable_dlog_and_dcheck_in_release_builds.patch
 webkit_rev_parser.patch
 dlopen_sonamed_gl.patch
-glib-header-single-entry.patch
 fix-armhf-ftbfs.patch
+arm.patch
+grd_parse_fix.patch

=== removed file 'debian/patches/ubuntu_dont_overwrite_default_download_directory.patch'
--- debian/patches/ubuntu_dont_overwrite_default_download_directory.patch	2011-05-06 22:59:06 +0000
+++ debian/patches/ubuntu_dont_overwrite_default_download_directory.patch	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-See http://code.google.com/p/chromium/issues/detail?id=16442
-Restore the default Downloads location used on Ubuntu.
-
----
- chrome/common/chrome_paths_linux.cc |   15 ---------------
- 1 file changed, 15 deletions(-)
-
-Index: src/chrome/common/chrome_paths_linux.cc
-===================================================================
---- src.orig/chrome/common/chrome_paths_linux.cc
-+++ src/chrome/common/chrome_paths_linux.cc
-@@ -79,35 +79,20 @@
- }
- 
- bool GetUserDocumentsDirectory(FilePath* result) {
-   scoped_ptr<base::Environment> env(base::Environment::Create());
-   *result = base::nix::GetXDGUserDirectory(env.get(), "DOCUMENTS", "Documents");
-   return true;
- }
- 
--// We respect the user's preferred download location, unless it is
--// ~ or their desktop directory, in which case we default to ~/Downloads.
- bool GetUserDownloadsDirectory(FilePath* result) {
-   scoped_ptr<base::Environment> env(base::Environment::Create());
-   *result = base::nix::GetXDGUserDirectory(env.get(), "DOWNLOAD",
-                                            kDownloadsDir);
--
--  FilePath home = file_util::GetHomeDir();
--  if (*result == home) {
--    *result = home.Append(kDownloadsDir);
--    return true;
--  }
--
--  FilePath desktop;
--  GetUserDesktop(&desktop);
--  if (*result == desktop) {
--    *result = home.Append(kDownloadsDir);
--  }
--
-   return true;
- }
- 
- bool GetUserDesktop(FilePath* result) {
-   scoped_ptr<base::Environment> env(base::Environment::Create());
-   *result = base::nix::GetXDGUserDirectory(env.get(), "DESKTOP", "Desktop");
-   return true;
- }

=== modified file 'debian/rules'
--- debian/rules	2012-04-01 19:50:28 +0000
+++ debian/rules	2012-07-24 14:10:28 +0000
@@ -72,9 +72,13 @@
 # Disable NaCl until we figure out what to do with the private toolchain
 GYP_DEFINES += disable_nacl=1
 
+# do not use third_party/gold as the linker.
+GYP_DEFINES += linux_use_gold_binary=0 linux_use_gold_flags=0
+
 ifneq (,$(findstring armhf,$(DEB_BUILD_ARCH)))
 GYP_DEFINES += \
 	v8_use_arm_eabi_hardfloat=true \
+	arm_float_abi=hard \
 	$(NULL)
 endif
 
@@ -90,7 +94,7 @@
 	use_cups=0 \
 	$(NULL)
 WANT_XZ_DEBS := 0
-ifneq (,$(filter 10.10 11.04 unstable development,$(DEBIAN_DIST)))
+ifneq (,$(filter 10.10 11.04 11.10 12.04 12.10 unstable development,$(DEBIAN_DIST)))
 # on $(DEB_BUILD_ARCH) and $(DEBIAN_DIST), enforce an armv7 with thumb build (or not)
 GYP_DEFINES += \
 	armv7=1 \
@@ -143,6 +147,17 @@
 
 CC_VERSION   := $(shell gcc -dumpversion | cut -d. -f-2)
 
+# Set this to use gcc 4.6 instead of 4.7
+AVOID_GCC_47 ?= 1
+ifeq (4.7,$(CC_VERSION))
+GYP_DEFINES += werror=$(NULL)
+ifeq (1,$(AVOID_GCC_47))
+CC  := gcc-4.6
+CXX := g++-4.6
+BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX) LINK.host=$(CXX)
+endif
+endif
+
 # Set this to use gcc 4.5 instead of 4.6
 AVOID_GCC_46 ?= 0
   
@@ -235,6 +250,14 @@
 FFMPEG_MT_STD_GYP_DEFINES   = $(NULL)
 FFMPEG_MT_EXTRA_GYP_DEFINES = ffmpeg_branding=Chrome
 
+ifneq (,$(filter 12.10 unstable development,$(DEBIAN_DIST)))
+# enable compile-time dependency on gnome-keyring
+GYP_DEFINES += use_gnome_keyring=1 linux_link_gnome_keyring=1
+# controlling the use of GConf (the classic GNOME configuration
+# and GIO, which contains GSettings (the new GNOME config system)
+GYP_DEFINES += use_gconf=1 use_gio=1
+endif
+
 USE_SYSTEM_SQLITE := $(shell pkg-config 'sqlite3 >= 3.6.1' && echo 1 || echo 0)
 USE_SYSTEM_SQLITE := 0
 
@@ -549,6 +572,7 @@
 	third_party/ffmpeg/binaries \
 	third_party/fuzzymatch \
 	third_party/gles_book_examples \
+	third_party/gold \
 	third_party/hunspell/dictionaries \
 	third_party/icu/mac \
 	third_party/lcov \