Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a34f900f3fa09f2204f2ec7ec751db0b8260a856
commit a34f900f3fa09f2204f2ec7ec751db0b8260a856 Author: Devil505 <devil505li...@gmail.com> Date: Tue May 3 18:19:05 2011 +0200 chromium-browser-11.0.696.61-1-i686 * version bump * removed webkit patch diff --git a/source/gnome-extra/chromium-browser/FrugalBuild b/source/gnome-extra/chromium-browser/FrugalBuild index 2fd2fba..f314edc 100644 --- a/source/gnome-extra/chromium-browser/FrugalBuild +++ b/source/gnome-extra/chromium-browser/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Devil505 <devil505li...@gmail.com> pkgname=chromium-browser -pkgver=10.0.648.204 -pkgrel=2 +pkgver=11.0.696.61 +pkgrel=1 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web' url='http://www.chromium.org/' depends=('nss' 'gconf' 'alsa-lib' 'hicolor-icon-theme' 'libxslt' 'ffmpeg' \ @@ -17,11 +17,10 @@ Finclude gnome-scriptlet _F_archive_name="chromium" up2date="Flasttar http://build.chromium.org/buildbot/official/"; source=(http://build.chromium.org/buildbot/official/$_F_archive_name-$pkgver.tar.bz2 \ - $pkgname.desktop $pkgname.sh webkit.patch Preferences) -sha1sums=('3ce5f3c356b09d524c6a9c2e8b75726b51dac84e' \ + $pkgname.desktop $pkgname.sh Preferences) +sha1sums=('20c81a373ec93c3a8d1dc137cc018e1bff9cb62d' \ '78ed8913b8a598de6a9e45d206973a846dbe8a51' \ 'e06de4aee77b3deb77e3b08ebb175ec02da42ced' \ - '91c02d5fbe805e95184f24662ffaffca2d79fd5a' \ '6a80491ff3b77f1ff8b34f296971e36e21a46ddf') build() { diff --git a/source/gnome-extra/chromium-browser/webkit.patch b/source/gnome-extra/chromium-browser/webkit.patch deleted file mode 100644 index 16bd2ea..0000000 --- a/source/gnome-extra/chromium-browser/webkit.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- /webkit/build/webkit_version.py.old 2011-03-23 09:01:08.000000000 +0100 -+++ /webkit/build/webkit_version.py 2011-03-25 09:31:28.000000000 +0100 -@@ -45,21 +45,24 @@ - - # "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) - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
