Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=c82cab0dd02d40bfecce32b43e62e2a12fca44f0
commit c82cab0dd02d40bfecce32b43e62e2a12fca44f0 Author: jercel <jerce...@gmail.com> Date: Sat Mar 26 10:24:28 2011 +0100 chromium-browser-10.0.648.204-1-x86_64 * Version bump (latest stable version) * Add patch for webkit version diff --git a/source/gnome-extra/chromium-browser/FrugalBuild b/source/gnome-extra/chromium-browser/FrugalBuild index 96f42c1..da239e4 100644 --- a/source/gnome-extra/chromium-browser/FrugalBuild +++ b/source/gnome-extra/chromium-browser/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: 2.50 SBU +# Compiling Time: 20.50 SBU # Maintainer: Devil505 <devil505li...@gmail.com> pkgname=chromium-browser -pkgver=10.0.643.0 -pkgrel=2 +pkgver=10.0.648.204 +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,20 +17,22 @@ 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) -sha1sums=('31bdd0bd51b70e07b4f58b6e8b71d94577d6b892' \ + $pkgname.desktop $pkgname.sh webkit.patch) +sha1sums=('3ce5f3c356b09d524c6a9c2e8b75726b51dac84e' \ '78ed8913b8a598de6a9e45d206973a846dbe8a51' \ - 'e06de4aee77b3deb77e3b08ebb175ec02da42ced') + 'e06de4aee77b3deb77e3b08ebb175ec02da42ced' \ + '91c02d5fbe805e95184f24662ffaffca2d79fd5a') build() { Fcd + Fpatchall # workaround for gcc 4.5 # see http://code.google.com/p/chromium/issues/detail?id=41887 export CFLAGS="${CFLAGS} -fno-ipa-cp" build/gyp_chromium -f make build/all.gyp --depth=. \ - -Dgcc_version=44 \ + -Dgcc_version=45 \ -Dno_strict_aliasing=1 \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ diff --git a/source/gnome-extra/chromium-browser/webkit.patch b/source/gnome-extra/chromium-browser/webkit.patch new file mode 100644 index 0000000..16bd2ea --- /dev/null +++ b/source/gnome-extra/chromium-browser/webkit.patch @@ -0,0 +1,37 @@ +--- /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
