Update ninja and bump Chromium version to 33.0.1750.170

This patch also changes the way we handle our patches.
We'll always take a new snapshot without patching Chromium
and rebase our patches on top of the snapshot. This removes
the need for separate patch files for the ustream repository
since we can use the patches of the snapshot and apply them
on the upstream checkout if we want to use an upstream build.
This makes it easier for us to have branches for the release
and maintain and minimize the number of patches we need on
top of upstream Chromium.
For now a snapshot checkout is needed to be able to prepare
the patches for an upstream build but in future we cold improve
this to fetch the patches from the remote snapshot repository
if needed.

Change-Id: I6280ffbe2d50d25d252734bc76d19bfaaa081637
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/init-repository.py b/init-repository.py
index 7870515e3..5ab0c9e7a 100755
--- a/init-repository.py
+++ b/init-repository.py
@@ -130,16 +130,10 @@ def installGitHooks():
     os.chdir(qtwebengine_root)
     subprocess.call(['scp', '-p', '-P', '29418', 'codereview.qt-project.org:hooks/commit-msg', '.git/hooks'])
 
-def applyPatches():
-    if use_external_chromium:
-        return
-    os.chdir(qtwebengine_root)
-    subprocess.call(['sh', './patches/patch-chromium.sh'])
-
 def initUpstreamSubmodules():
     ninja_url = 'https://github.com/martine/ninja.git'
     chromium_url = 'https://chromium.googlesource.com/chromium/src.git'
-    ninja_shasum = '84986af6fdeae3f649f2bf884b20f644bc370e48'
+    ninja_shasum = '7103c32646df958b0287c65b1c660bf528a191d6'
     chromium_ref = 'refs/branch-heads/' + resolver.currentBranch()
     os.chdir(qtwebengine_root)
 
@@ -184,7 +178,7 @@ subprocess.call(['git', 'update-index', '--assume-unchanged', '.gitmodules'])
 if args.upstream:
     initUpstreamSubmodules()
     updateLastChange()
-    if not args.baseline_upstream:
-        applyPatches()
+    if not args.baseline_upstream and not use_external_chromium:
+        subprocess.call([os.path.join(qtwebengine_root, 'tools', 'scripts', 'patch_upstream.py')])
 if args.snapshot:
     initSnapshot()