← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/build-fix.patch

  • Committer: Chad Miller
  • Date: 2013-09-26 18:43:04 UTC
  • Revision ID: chad.miller@canonical.com-20130926184304-dbf45my755qknbss
* New release 29.0.1547.76.
* debian/tests/...: Make first real tests using sikuli. Probably quite
  fragile on changes to upstream. (LP: #1222895)
* debian/patches/4-chromeless-window-launch-option.patch: Make new windows
  use their own state instead of checking the parameters of the instance that
  started all processes for whether a window has chrome or not. (LP: #1223855)
* Update autopkgtest tests.
* debian/patches/series: Drop comment references to old patches.  Remove
  files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/build-fix.patch
1
 
Index: dev.trusty/tools/gn/secondary/skia/BUILD.gn
2
 
===================================================================
3
 
--- dev.trusty.orig/tools/gn/secondary/skia/BUILD.gn    2014-01-29 12:11:56.058107428 -0500
4
 
+++ dev.trusty/tools/gn/secondary/skia/BUILD.gn 2014-01-29 12:11:56.038106734 -0500
5
 
@@ -1232,7 +1232,7 @@
6
 
     }
7
 
 
8
 
     if (skia_support_pdf) {
9
 
-      deps += "//third_party/sfntly"
10
 
+      deps += [ "//third_party/sfntly" ]
11
 
     }
12
 
   }
13
 
 }
14
 
Index: dev.trusty/build/gyp_chromium
15
 
===================================================================
16
 
--- dev.trusty.orig/build/gyp_chromium  2014-01-29 08:38:39.047654491 -0500
17
 
+++ dev.trusty/build/gyp_chromium       2014-01-29 12:12:28.587235507 -0500
18
 
@@ -38,8 +38,6 @@
19
 
 sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
20
 
     'Source', 'build', 'scripts'))
21
 
 
22
 
-import find_depot_tools
23
 
-
24
 
 # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
25
 
 # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
26
 
 # seconds.  Conversely, memory usage of build/gyp_chromium with Psyco
27
 
@@ -332,6 +330,7 @@
28
 
   # TODO(bradnelson): take this out once this issue is fixed:
29
 
   #    http://code.google.com/p/gyp/issues/detail?id=177
30
 
   if sys.platform == 'cygwin':
31
 
+    import find_depot_tools
32
 
     depot_tools_path = find_depot_tools.add_depot_tools_to_path()
33
 
     python_dir = sorted(glob.glob(os.path.join(depot_tools_path,
34
 
                                                'python2*_bin')))[-1]
35
 
@@ -394,6 +393,7 @@
36
 
   # by depot_tools, then use it.
37
 
   if (sys.platform in ('win32', 'cygwin') and
38
 
       os.environ.get('GYP_GENERATORS') == 'ninja'):
39
 
+    import find_depot_tools
40
 
     depot_tools_path = find_depot_tools.add_depot_tools_to_path()
41
 
     toolchain = os.path.normpath(os.path.join(
42
 
         depot_tools_path, 'win_toolchain', 'vs2013_files'))