diff options
Diffstat (limited to 'www-client/chromium/files/chromium-webkit-version.patch')
| -rw-r--r-- | www-client/chromium/files/chromium-webkit-version.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/www-client/chromium/files/chromium-webkit-version.patch b/www-client/chromium/files/chromium-webkit-version.patch deleted file mode 100644 index 5bcba7ec2a2b..000000000000 --- a/www-client/chromium/files/chromium-webkit-version.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: webkit/build/webkit_version.py -diff --git a/webkit/build/webkit_version.py b/webkit/build/webkit_version.py -index 58110727fee9250058c4318e8f50eb402008f741..f488a2ed8242891542925b6aa21e38748268b253 100755 ---- a/webkit/build/webkit_version.py -+++ b/webkit/build/webkit_version.py -@@ -45,21 +45,24 @@ def GetWebKitRevision(webkit_dir, version_file): - - # "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), -- # then strip that path back off of the resulting URL. -+ # 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)) - -- # 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. -- assert version_info.url.startswith(version_info.root) -- assert version_info.url.endswith(version_file_dir) -- webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)] -- webkit_url = webkit_url.strip('/') -+ 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('/') -+ else: -+ # The data isn't as we expect: perhaps they're using git without svn? -+ # Just dump the output directly. -+ webkit_url = version_info.url - - return "%s@%s" % (webkit_url, version_info.revision) - |