| 1 |
phajdan.jr 11/01/27 10:46:25 |
| 2 |
|
| 3 |
Added: chromium-webkit-version.patch |
| 4 |
Log: |
| 5 |
Version bump for dev channel release. Remove old. |
| 6 |
|
| 7 |
(Portage version: 2.1.9.25/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-client/chromium/files/chromium-webkit-version.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-webkit-version.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-webkit-version.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: chromium-webkit-version.patch |
| 16 |
=================================================================== |
| 17 |
Index: webkit/build/webkit_version.py |
| 18 |
diff --git a/webkit/build/webkit_version.py b/webkit/build/webkit_version.py |
| 19 |
index 58110727fee9250058c4318e8f50eb402008f741..f488a2ed8242891542925b6aa21e38748268b253 100755 |
| 20 |
--- a/webkit/build/webkit_version.py |
| 21 |
+++ b/webkit/build/webkit_version.py |
| 22 |
@@ -45,21 +45,24 @@ def GetWebKitRevision(webkit_dir, version_file): |
| 23 |
|
| 24 |
# "svn info" tells us what we want, but third_party/WebKit does *not* |
| 25 |
# point at the upstream repo. So instead we run svn info on the directory |
| 26 |
- # containing the versioning file (which is some subdirectory of WebKit), |
| 27 |
- # then strip that path back off of the resulting URL. |
| 28 |
+ # containing the versioning file (which is some subdirectory of WebKit). |
| 29 |
version_file_dir = os.path.dirname(version_file) |
| 30 |
version_info = lastchange.FetchVersionInfo( |
| 31 |
default_lastchange=None, |
| 32 |
directory=os.path.join(webkit_dir, version_file_dir)) |
| 33 |
|
| 34 |
- # Now compute the real WebKit URL by stripping off the version file |
| 35 |
- # directory from the URL we get out of version_info. |
| 36 |
- # Further, we want to strip off the "http://svn..." from the left. |
| 37 |
- # This is the root URL from the repository. |
| 38 |
- assert version_info.url.startswith(version_info.root) |
| 39 |
- assert version_info.url.endswith(version_file_dir) |
| 40 |
- webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)] |
| 41 |
- webkit_url = webkit_url.strip('/') |
| 42 |
+ if (version_info.url.startswith(version_info.root) and |
| 43 |
+ version_info.url.endswith(version_file_dir)): |
| 44 |
+ # Now compute the real WebKit URL by stripping off the version file |
| 45 |
+ # directory from the URL we get out of version_info. |
| 46 |
+ # Further, we want to strip off the "http://svn..." from the left. |
| 47 |
+ # This is the root URL from the repository. |
| 48 |
+ webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)] |
| 49 |
+ webkit_url = webkit_url.strip('/') |
| 50 |
+ else: |
| 51 |
+ # The data isn't as we expect: perhaps they're using git without svn? |
| 52 |
+ # Just dump the output directly. |
| 53 |
+ webkit_url = version_info.url |
| 54 |
|
| 55 |
return "%s@%s" % (webkit_url, version_info.revision) |
Archives