packages: chromium-browser/get-webkit_revision.patch - updated for 15.0.845.0

[charles]

Author: charles                      Date: Fri Aug  5 19:43:29 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 15.0.845.0

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

---- Diffs:

================================================================
Index: packages/chromium-browser/get-webkit_revision.patch
diff -u packages/chromium-browser/get-webkit_revision.patch:1.2 packages/chromium-browser/get-webkit_revision.patch:1.3
--- packages/chromium-browser/get-webkit_revision.patch:1.2	Fri Mar  4 16:43:09 2011
+++ packages/chromium-browser/get-webkit_revision.patch	Fri Aug  5 21:43:24 2011
@@ -6,15 +6,12 @@
 ===================================================================
 --- ./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))
+@@ -61,8 +61,15 @@
+       directory=os.path.join(webkit_dir, version_file_dir),
+       directory_regex_prior_to_src_url='webkit')
  
+-  if version_info.url == None:
+-    version_info.url = 'Unknown URL'
 +  if version_info.url is None or version_info.url == 'unknown':
 +    # parse the DEPS file
 +    data = open("../../DEPS", "rb").read()
@@ -24,11 +21,6 @@
 +    branch = os.path.basename(x.group(1)) if x else "n-a"
 +    return "%s@%s" % (branch, rev)
 +
-   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('/')
+   version_info.url = version_info.url.strip('/')
+ 
+   if version_info.revision == None:
================================================================

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