[arch-commits] Commit in chromium/trunk (PKGBUILD chromium-webkit-version.patch)

[Ionut Biru]

    Date: Wednesday, March 9, 2011 @ 16:43:46
  Author: ibiru
Revision: 113601

upgpkg: chromium 10.0.648.127-1
update to chromium-10.0.648.127

Added:
  chromium/trunk/chromium-webkit-version.patch
Modified:
  chromium/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   14 +++++++++-----
 chromium-webkit-version.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-09 21:37:09 UTC (rev 113600)
+++ PKGBUILD	2011-03-09 21:43:46 UTC (rev 113601)
@@ -4,26 +4,30 @@
 # Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=chromium
-pkgver=9.0.597.107
+pkgver=10.0.648.127
 pkgrel=1
 pkgdesc='The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser.'
 arch=('i686' 'x86_64')
 url='http://www.chromium.org/'
 license=('BSD')
 depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libevent' 'libxss' 'libxtst' 'ttf-dejavu' 'desktop-file-utils')
-makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring')
+makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'namcap')
 provides=('chromium-browser')
 conflicts=('chromium-browser')
 install=chromium.install
 source=("http://build.chromium.org/buildbot/official/chromium-${pkgver}.tar.bz2"
-        'chromium.desktop' 'chromium.sh')
-md5sums=('4541f2b84df581618262efe158901b2f'
+        'chromium.desktop' 'chromium.sh' chromium-webkit-version.patch)
+md5sums=('71fd72aced3df932b7b3cecc7bb6c64b'
          '075c3c2fa5902e16b8547dd31d437191'
-         '096a46ef386817988250d2d7bddd1b34')
+         '096a46ef386817988250d2d7bddd1b34'
+         'dee3e8798f8916d23fce203478094822')
 
 build() {
   cd ${srcdir}/chromium-${pkgver}
 
+  #http://code.google.com/p/chromium/issues/detail?id=70537
+  patch -Np1 -i ${srcdir}/chromium-webkit-version.patch
+
 ### Configure
 
   echo 'Use python2 instead of python...'

Added: chromium-webkit-version.patch
===================================================================
--- chromium-webkit-version.patch	                        (rev 0)
+++ chromium-webkit-version.patch	2011-03-09 21:43:46 UTC (rev 113601)
@@ -0,0 +1,40 @@
+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)
+