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

Proposed by Ken VanDine on 2012-07-24
Status: Merged
Merged at revision: 737
Proposed branch: lp:~ken-vandine/chromium-browser/chromium-browser.precise
Merge into: lp:~chromium-team/chromium-browser/chromium-browser.precise
Diff against target: 420 lines (+142/-103)
10 files modified
debian/apport/chromium-browser.py (+9/-8)
debian/changelog (+32/-0)
debian/control (+6/-2)
debian/patches/arm.patch (+50/-0)
debian/patches/dlopen_sonamed_gl.patch (+3/-16)
debian/patches/fix-armhf-ftbfs.patch (+3/-27)
debian/patches/grd_parse_fix.patch (+12/-0)
debian/patches/series (+2/-2)
debian/patches/ubuntu_dont_overwrite_default_download_directory.patch (+0/-47)
debian/rules (+25/-1)
To merge this branch: bzr merge lp:~ken-vandine/chromium-browser/chromium-browser.precise
Reviewer Review Type Date Requested Status
Chromium team 2012-07-24 Pending
Review via email: mp+116486@code.launchpad.net

Description of the change

  [ 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

To post a comment you must log in.
Micah Gersten (micahg) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/apport/chromium-browser.py'
2--- debian/apport/chromium-browser.py 2011-05-09 17:41:33 +0000
3+++ debian/apport/chromium-browser.py 2012-07-24 14:10:28 +0000
4@@ -11,6 +11,7 @@
5 the full text of the license.
6 '''
7
8+from __future__ import print_function
9 import os, sys, getopt, codecs
10 import time
11 from stat import *
12@@ -57,7 +58,7 @@
13 report['RelatedPackagesPolicy'] = ''
14 for pkg in pkgs:
15 script = subprocess.Popen(['apt-cache', 'policy', pkg], stdout=subprocess.PIPE)
16- report['RelatedPackagesPolicy'] += script.communicate()[0] + "\n"
17+ report['RelatedPackagesPolicy'] += str(script.communicate()[0]) + "\n"
18
19 def gconf_values(report, keys):
20 report['gconf-keys'] = ''
21@@ -67,7 +68,7 @@
22 except OSError:
23 report['gconf-keys'] = "gconftool-2 not found"
24 return
25- out = script.communicate()[0]
26+ out = str(script.communicate()[0])
27 if out == "":
28 out = "**unset**\n"
29 report['gconf-keys'] += key + " = " + out
30@@ -105,7 +106,7 @@
31 # list entensions+versions
32 report['ChromiumPrefs'] += "extensions/settings =\n"
33 if 'settings' in entry['extensions']:
34- for ext in entry['extensions']['settings'].keys():
35+ for ext in list(entry['extensions']['settings'].keys()):
36 report['ChromiumPrefs'] += " - '" + ext + "'\n"
37 if 'manifest' in entry['extensions']['settings'][ext]:
38 for k in [ 'name', 'description', 'version', 'update_url' ]:
39@@ -243,17 +244,17 @@
40
41 # Disk usage
42 script = subprocess.Popen([ 'df', '-Th' ], stdout=subprocess.PIPE)
43- report['DiskUsage'] = script.communicate()[0] + "\n\nInodes:\n"
44+ report['DiskUsage'] = str(script.communicate()[0]) + "\n\nInodes:\n"
45 script = subprocess.Popen([ 'df', '-ih' ], stdout=subprocess.PIPE)
46- report['DiskUsage'] += script.communicate()[0]
47+ report['DiskUsage'] += str(script.communicate()[0])
48
49 ## DEBUGING ##
50 if __name__ == '__main__':
51 sys.stdout = codecs.getwriter('utf8')(sys.stdout)
52 try:
53 opts, args = getopt.getopt(sys.argv[1:], "-u:", [ 'user-dir=' ])
54- except getopt.GetoptError, err:
55- print str(err)
56+ except getopt.GetoptError as err:
57+ print(str(err))
58 sys.exit(2)
59
60 userdir = None
61@@ -266,4 +267,4 @@
62 report = {}
63 add_info(report, userdir = userdir)
64 for key in report:
65- print '[%s]\n%s\n' % (key, report[key])
66+ print('[%s]\n%s\n' % (key, report[key]))
67
68=== modified file 'debian/changelog'
69--- debian/changelog 2012-05-01 05:03:00 +0000
70+++ debian/changelog 2012-07-24 14:10:28 +0000
71@@ -1,3 +1,35 @@
72+chromium-browser (20.0.1132.47~r144678-0ubuntu0.12.04.1) UNRELEASED; urgency=low
73+
74+ [ Matthieu Baerts ]
75+ * debian/apport:
76+ - Update apport hook for python3 (LP: #1013171)
77+ patch made with the help of Edward Donovan
78+
79+ [ Ken VanDine ]
80+ * New upstream release from the Stable Channel
81+ * debian/control
82+ - Added build depends binutils-gold, libssl-dev and subversion
83+ - Bumped standards version to 3.9.3
84+ - don't build depend on binutils-gold for armel
85+ - add build depends for g++-4.6-multilib
86+ * debian/rules
87+ - explicitly set arm_float_abi=hard for armhf builds and let the rest
88+ fallback to softfp
89+ - do not use third_party/gold as the linker.
90+ - enable compile-time dependency on gnome-keyring
91+ - don't build with -Werror
92+ - include armv7 in GYP_DEFINES for 11.10, 12.04 and 12.10. Fixes
93+ FTBFS on arm (LP: #993080)
94+ * -debian/patches/ubuntu_dont_overwrite_default_download_directory.patch
95+ - no longer needed
96+ * debian/patches/grd_parse_fix.patch
97+ - Patched to fix broken XML until we can get a proper fix for
98+ chromium-translation-tools.
99+ * debian/patches/arm.patch
100+ - patch from debian to fix FTBFS on armel
101+
102+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 12 Jul 2012 14:02:44 -0400
103+
104 chromium-browser (18.0.1025.168~r134367-0ubuntu0.12.04.1) precise-security; urgency=low
105
106 * New upstream release from the Stable Channel (LP: #992352)
107
108=== modified file 'debian/control'
109--- debian/control 2012-03-30 08:38:01 +0000
110+++ debian/control 2012-07-24 14:10:28 +0000
111@@ -13,6 +13,8 @@
112 patchutils (>= 0.2.25),
113 libc6-dev-i386 [amd64],
114 g++-multilib [amd64],
115+ g++-4.6-multilib,
116+ binutils-gold [!armel],
117 hardening-wrapper,
118 python,
119 bison,
120@@ -48,8 +50,10 @@
121 libdbus-glib-1-dev,
122 libgnome-keyring-dev,
123 libudev-dev,
124- libgconf2-dev
125-Standards-Version: 3.8.3
126+ libgconf2-dev,
127+ libssl-dev,
128+ subversion
129+Standards-Version: 3.9.3
130
131 Package: chromium-browser
132 Architecture: any
133
134=== added file 'debian/patches/arm.patch'
135--- debian/patches/arm.patch 1970-01-01 00:00:00 +0000
136+++ debian/patches/arm.patch 2012-07-24 14:10:28 +0000
137@@ -0,0 +1,50 @@
138+Index: src/skia/skia.gyp
139+===================================================================
140+--- src.orig/skia/skia.gyp 2012-05-19 16:54:19.000000000 +0200
141++++ src/skia/skia.gyp 2012-06-20 14:34:13.131318952 +0200
142+@@ -1157,9 +1157,11 @@
143+ [ 'target_arch == "arm" and armv7 != 1', {
144+ 'sources': [
145+ '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
146++ '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
147+ ],
148+ 'sources!': [
149+ '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
150++ '../third_party/skia/src/opts/opts_check_arm.cpp',
151+ ],
152+ }],
153+ ],
154+Index: src/ui/base/resource/data_pack.cc
155+===================================================================
156+--- src.orig/ui/base/resource/data_pack.cc 2012-05-19 16:55:37.000000000 +0200
157++++ src/ui/base/resource/data_pack.cc 2012-06-20 14:38:32.507316901 +0200
158+@@ -130,9 +130,11 @@
159+ // 2) Verify the entries are within the appropriate bounds. There's an extra
160+ // entry after the last item which gives us the length of the last item.
161+ for (size_t i = 0; i < resource_count_ + 1; ++i) {
162++ uint32 t;
163+ const DataPackEntry* entry = reinterpret_cast<const DataPackEntry*>(
164+ mmap_->data() + kHeaderLength + (i * sizeof(DataPackEntry)));
165+- if (entry->file_offset > mmap_->length()) {
166++ memcpy(&t, &entry->file_offset, 32/8);
167++ if (t > mmap_->length()) {
168+ LOG(ERROR) << "Entry #" << i << " in data pack points off end of file. "
169+ << "Was the file corrupted?";
170+ UMA_HISTOGRAM_ENUMERATION("DataPack.Load", ENTRY_NOT_FOUND,
171+Index: src/v8/src/arm/macro-assembler-arm.cc
172+===================================================================
173+--- src.orig/v8/src/arm/macro-assembler-arm.cc 2012-05-19 16:57:27.000000000 +0200
174++++ src/v8/src/arm/macro-assembler-arm.cc 2012-06-20 14:35:27.339318363 +0200
175+@@ -61,9 +61,9 @@
176+ // We do not support thumb inter-working with an arm architecture not supporting
177+ // the blx instruction (below v5t). If you know what CPU you are compiling for
178+ // you can use -march=armv7 or similar.
179+-#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
180+-# error "For thumb inter-working we require an architecture which supports blx"
181+-#endif
182++//#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
183++//# error "For thumb inter-working we require an architecture which supports blx"
184++//#endif
185+
186+
187+ // Using bx does not yield better code, so use it only when required
188
189=== modified file 'debian/patches/dlopen_sonamed_gl.patch'
190--- debian/patches/dlopen_sonamed_gl.patch 2011-10-26 06:14:33 +0000
191+++ debian/patches/dlopen_sonamed_gl.patch 2012-07-24 14:10:28 +0000
192@@ -9,9 +9,9 @@
193
194 Index: src/ui/gfx/gl/gl_implementation_linux.cc
195 ===================================================================
196---- src.orig/ui/gfx/gl/gl_implementation_linux.cc 2011-10-21 17:35:43.000000000 +0100
197-+++ src/ui/gfx/gl/gl_implementation_linux.cc 2011-10-21 18:40:52.767139411 +0100
198-@@ -73,7 +73,7 @@
199+--- src.orig/ui/gfx/gl/gl_implementation_linux.cc 2012-06-21 16:09:03.011162386 -0400
200++++ src/ui/gfx/gl/gl_implementation_linux.cc 2012-06-21 16:14:21.867172877 -0400
201+@@ -75,7 +75,7 @@
202 }
203
204 base::NativeLibrary library = LoadLibrary(
205@@ -20,16 +20,3 @@
206 if (!library)
207 return false;
208
209-@@ -120,10 +120,10 @@
210- }
211- #endif // !defined(USE_WAYLAND)
212- case kGLImplementationEGLGLES2: {
213-- base::NativeLibrary gles_library = LoadLibrary("libGLESv2.so");
214-+ base::NativeLibrary gles_library = LoadLibrary("libGLESv2.so.2");
215- if (!gles_library)
216- return false;
217-- base::NativeLibrary egl_library = LoadLibrary("libEGL.so");
218-+ base::NativeLibrary egl_library = LoadLibrary("libEGL.so.1");
219- if (!egl_library) {
220- base::UnloadNativeLibrary(gles_library);
221- return false;
222
223=== modified file 'debian/patches/fix-armhf-ftbfs.patch'
224--- debian/patches/fix-armhf-ftbfs.patch 2012-03-07 07:24:59 +0000
225+++ debian/patches/fix-armhf-ftbfs.patch 2012-07-24 14:10:28 +0000
226@@ -2,23 +2,11 @@
227 Subject: Fix FTBFS on armhf
228 Bug-Ubuntu: https://bugs.launchpad.net/bugs/943281
229
230-Index: src/build/common.gypi
231-===================================================================
232---- src.orig/build/common.gypi 2012-03-05 10:39:30.082526500 +0200
233-+++ src/build/common.gypi 2012-03-05 11:02:24.082526500 +0200
234-@@ -1814,7 +1814,6 @@
235- 'cflags': [
236- '-march=armv7-a',
237- '-mtune=cortex-a8',
238-- '-mfloat-abi=softfp',
239- ],
240- 'conditions': [
241- ['arm_neon==1', {
242 Index: src/native_client/build/common.gypi
243 ===================================================================
244---- src.orig/native_client/build/common.gypi 2012-02-15 23:35:45.000000000 +0200
245-+++ src/native_client/build/common.gypi 2012-03-05 11:03:09.160651492 +0200
246-@@ -289,7 +289,6 @@
247+--- src.orig/native_client/build/common.gypi 2012-06-21 14:40:40.000000000 -0400
248++++ src/native_client/build/common.gypi 2012-06-21 16:16:02.195176177 -0400
249+@@ -294,7 +294,6 @@
250 '-march=armv7-a',
251 '-mtune=cortex-a8',
252 '-mfpu=neon',
253@@ -26,15 +14,3 @@
254 '-fno-exceptions',
255 '-Wall',
256 '-fPIC',
257-Index: src/third_party/ffmpeg/ffmpeg.gyp
258-===================================================================
259---- src.orig/third_party/ffmpeg/ffmpeg.gyp 2012-02-15 23:35:36.000000000 +0200
260-+++ src/third_party/ffmpeg/ffmpeg.gyp 2012-03-05 11:02:34.004401501 +0200
261-@@ -170,7 +170,6 @@
262- '-mthumb',
263- '-march=armv7-a',
264- '-mtune=cortex-a8',
265-- '-mfloat-abi=softfp',
266- ],
267- 'conditions': [
268- ['arm_neon == 0', {
269
270=== added file 'debian/patches/grd_parse_fix.patch'
271--- debian/patches/grd_parse_fix.patch 1970-01-01 00:00:00 +0000
272+++ debian/patches/grd_parse_fix.patch 2012-07-24 14:10:28 +0000
273@@ -0,0 +1,12 @@
274+Index: src/chrome/app/chromium_strings.grd
275+===================================================================
276+--- src.orig/chrome/app/chromium_strings.grd 2012-07-09 14:16:01.091449368 -0400
277++++ src/chrome/app/chromium_strings.grd 2012-07-09 14:25:12.951467521 -0400
278+@@ -111,7 +111,6 @@
279+ <if expr="not pp_ifdef('use_third_party_translations')">
280+ <file path="resources/chromium_strings_am.xtb" lang="am" />
281+ <file path="resources/chromium_strings_ar.xtb" lang="ar" />
282+- </if>
283+ <file path="../../third_party/launchpad_translations/chromium_strings_ast.xtb" lang="ast" />
284+ <file path="../../third_party/launchpad_translations/chromium_strings_bg.xtb" lang="bg" />
285+ <file path="resources/chromium_strings_bn.xtb" lang="bn" />
286
287=== modified file 'debian/patches/series'
288--- debian/patches/series 2012-03-30 08:42:27 +0000
289+++ debian/patches/series 2012-07-24 14:10:28 +0000
290@@ -1,8 +1,8 @@
291 # system_v8.patch
292-ubuntu_dont_overwrite_default_download_directory.patch
293 chromium_useragent.patch
294 disable_dlog_and_dcheck_in_release_builds.patch
295 webkit_rev_parser.patch
296 dlopen_sonamed_gl.patch
297-glib-header-single-entry.patch
298 fix-armhf-ftbfs.patch
299+arm.patch
300+grd_parse_fix.patch
301
302=== removed file 'debian/patches/ubuntu_dont_overwrite_default_download_directory.patch'
303--- debian/patches/ubuntu_dont_overwrite_default_download_directory.patch 2011-05-06 22:59:06 +0000
304+++ debian/patches/ubuntu_dont_overwrite_default_download_directory.patch 1970-01-01 00:00:00 +0000
305@@ -1,47 +0,0 @@
306-See http://code.google.com/p/chromium/issues/detail?id=16442
307-Restore the default Downloads location used on Ubuntu.
308-
309----
310- chrome/common/chrome_paths_linux.cc | 15 ---------------
311- 1 file changed, 15 deletions(-)
312-
313-Index: src/chrome/common/chrome_paths_linux.cc
314-===================================================================
315---- src.orig/chrome/common/chrome_paths_linux.cc
316-+++ src/chrome/common/chrome_paths_linux.cc
317-@@ -79,35 +79,20 @@
318- }
319-
320- bool GetUserDocumentsDirectory(FilePath* result) {
321- scoped_ptr<base::Environment> env(base::Environment::Create());
322- *result = base::nix::GetXDGUserDirectory(env.get(), "DOCUMENTS", "Documents");
323- return true;
324- }
325-
326--// We respect the user's preferred download location, unless it is
327--// ~ or their desktop directory, in which case we default to ~/Downloads.
328- bool GetUserDownloadsDirectory(FilePath* result) {
329- scoped_ptr<base::Environment> env(base::Environment::Create());
330- *result = base::nix::GetXDGUserDirectory(env.get(), "DOWNLOAD",
331- kDownloadsDir);
332--
333-- FilePath home = file_util::GetHomeDir();
334-- if (*result == home) {
335-- *result = home.Append(kDownloadsDir);
336-- return true;
337-- }
338--
339-- FilePath desktop;
340-- GetUserDesktop(&desktop);
341-- if (*result == desktop) {
342-- *result = home.Append(kDownloadsDir);
343-- }
344--
345- return true;
346- }
347-
348- bool GetUserDesktop(FilePath* result) {
349- scoped_ptr<base::Environment> env(base::Environment::Create());
350- *result = base::nix::GetXDGUserDirectory(env.get(), "DESKTOP", "Desktop");
351- return true;
352- }
353
354=== modified file 'debian/rules'
355--- debian/rules 2012-04-01 19:50:28 +0000
356+++ debian/rules 2012-07-24 14:10:28 +0000
357@@ -72,9 +72,13 @@
358 # Disable NaCl until we figure out what to do with the private toolchain
359 GYP_DEFINES += disable_nacl=1
360
361+# do not use third_party/gold as the linker.
362+GYP_DEFINES += linux_use_gold_binary=0 linux_use_gold_flags=0
363+
364 ifneq (,$(findstring armhf,$(DEB_BUILD_ARCH)))
365 GYP_DEFINES += \
366 v8_use_arm_eabi_hardfloat=true \
367+ arm_float_abi=hard \
368 $(NULL)
369 endif
370
371@@ -90,7 +94,7 @@
372 use_cups=0 \
373 $(NULL)
374 WANT_XZ_DEBS := 0
375-ifneq (,$(filter 10.10 11.04 unstable development,$(DEBIAN_DIST)))
376+ifneq (,$(filter 10.10 11.04 11.10 12.04 12.10 unstable development,$(DEBIAN_DIST)))
377 # on $(DEB_BUILD_ARCH) and $(DEBIAN_DIST), enforce an armv7 with thumb build (or not)
378 GYP_DEFINES += \
379 armv7=1 \
380@@ -143,6 +147,17 @@
381
382 CC_VERSION := $(shell gcc -dumpversion | cut -d. -f-2)
383
384+# Set this to use gcc 4.6 instead of 4.7
385+AVOID_GCC_47 ?= 1
386+ifeq (4.7,$(CC_VERSION))
387+GYP_DEFINES += werror=$(NULL)
388+ifeq (1,$(AVOID_GCC_47))
389+CC := gcc-4.6
390+CXX := g++-4.6
391+BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX) LINK.host=$(CXX)
392+endif
393+endif
394+
395 # Set this to use gcc 4.5 instead of 4.6
396 AVOID_GCC_46 ?= 0
397
398@@ -235,6 +250,14 @@
399 FFMPEG_MT_STD_GYP_DEFINES = $(NULL)
400 FFMPEG_MT_EXTRA_GYP_DEFINES = ffmpeg_branding=Chrome
401
402+ifneq (,$(filter 12.10 unstable development,$(DEBIAN_DIST)))
403+# enable compile-time dependency on gnome-keyring
404+GYP_DEFINES += use_gnome_keyring=1 linux_link_gnome_keyring=1
405+# controlling the use of GConf (the classic GNOME configuration
406+# and GIO, which contains GSettings (the new GNOME config system)
407+GYP_DEFINES += use_gconf=1 use_gio=1
408+endif
409+
410 USE_SYSTEM_SQLITE := $(shell pkg-config 'sqlite3 >= 3.6.1' && echo 1 || echo 0)
411 USE_SYSTEM_SQLITE := 0
412
413@@ -549,6 +572,7 @@
414 third_party/ffmpeg/binaries \
415 third_party/fuzzymatch \
416 third_party/gles_book_examples \
417+ third_party/gold \
418 third_party/hunspell/dictionaries \
419 third_party/icu/mac \
420 third_party/lcov \

Subscribers

People subscribed via source and target branches