packages: chromium-browser/get-webkit_revision.patch - update from Ubuntu, ...

[glen]

Author: glen                         Date: Fri Mar  4 15:43:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update from Ubuntu, accepts branch too

---- Files affected:
packages/chromium-browser:
   get-webkit_revision.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/chromium-browser/get-webkit_revision.patch
diff -u packages/chromium-browser/get-webkit_revision.patch:1.1 packages/chromium-browser/get-webkit_revision.patch:1.2
--- packages/chromium-browser/get-webkit_revision.patch:1.1	Sun Jan 23 22:22:45 2011
+++ packages/chromium-browser/get-webkit_revision.patch	Fri Mar  4 16:43:09 2011
@@ -1,30 +1,34 @@
---- chromium-browser-10.0.647.0~svn20110123r72286/src/webkit/build/webkit_version.py.orig	2011-01-22 04:01:31.000000000 +0100
-+++ chromium-browser-10.0.647.0~svn20110123r72286/src/webkit/build/webkit_version.py	2011-01-23 21:01:47.000000000 +0100
-@@ -64,6 +64,18 @@
-   return "%s@%s" % (webkit_url, version_info.revision)
+---
+ webkit/build/webkit_version.py |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+Index: src/webkit/build/webkit_version.py
+===================================================================
+--- ./src.orig/webkit/build/webkit_version.py
++++ ./src/webkit/build/webkit_version.py
+@@ -46,16 +46,25 @@
+   # "svn info" tells us what we want, but third_party/WebKit does *not*
+   # point at the upstream repo.  So instead we run svn info on the directory
+   # containing the versioning file (which is some subdirectory of WebKit).
+   version_file_dir = os.path.dirname(version_file)
+   version_info = lastchange.FetchVersionInfo(
+       default_lastchange=None,
+       directory=os.path.join(webkit_dir, version_file_dir))
  
- 
-+def GetWebKitRevisionFromDEPS():
-+  result = "trunk"
-+  f = open('../../DEPS', 'rb')
-+  try:
-+    m = re.search(r'webkit_revision":\s*"(\d+?)"', ''.join(f.readlines()), re.MULTILINE)
-+    if m:
-+      result = "trunk@%s" % (m.group(1))
-+  finally:
-+    f.close()
-+  return result
-+
++  if version_info.url is None or version_info.url == 'unknown':
++    # parse the DEPS file
++    data = open("../../DEPS", "rb").read()
++    x = re.search(r'"webkit_revision": "(\d+)",', data)
++    rev = x.group(1) if x else "n-a"
++    x = re.search(r'"webkit_trunk": "(.*?)",', data)
++    branch = os.path.basename(x.group(1)) if x else "n-a"
++    return "%s@%s" % (branch, rev)
 +
- def EmitVersionHeader(webkit_dir, version_file, output_dir):
-   '''Given webkit's version file, emit a header file that we can use from
-   within webkit_glue.cc.
-@@ -75,7 +87,7 @@
- 
-   major, minor = ReadVersionFile(os.path.join(webkit_dir, version_file))
- 
--  webkit_revision = GetWebKitRevision(webkit_dir, version_file)
-+  webkit_revision = GetWebKitRevisionFromDEPS()
- 
-   fname = os.path.join(output_dir, "webkit_version.h")
-   f = open(fname, 'wb')
+   if (version_info.url.startswith(version_info.root) and
+       version_info.url.endswith(version_file_dir)):
+     # Now compute the real WebKit URL by stripping off the version file
+     # directory from the URL we get out of version_info.
+     # Further, we want to strip off the "http://svn..." from the left.
+     # This is the root URL from the repository.
+     webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)]
+     webkit_url = webkit_url.strip('/')
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/get-webkit_revision.patch?r1=1.1&r2=1.2&f=u