Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=deb24efaba7686cc8fd106246fa8fa7049d64fbe
commit deb24efaba7686cc8fd106246fa8fa7049d64fbe Author: DeX77 <[email protected]> Date: Wed Jan 15 19:24:53 2014 +0100 chromium-browser-32.0.1700.95-1-x86_64 * fix build diff --git a/source/xapps-extra/chromium-browser/FrugalBuild b/source/xapps-extra/chromium-browser/FrugalBuild index f96ffbe..ac46269 100644 --- a/source/xapps-extra/chromium-browser/FrugalBuild +++ b/source/xapps-extra/chromium-browser/FrugalBuild @@ -12,7 +12,7 @@ depends=('nss>=3.15.2' 'alsa-lib' 'hicolor-icon-theme' 'libxslt' 'ffmpeg>=1.0' \ 'libevent>=2.0.21' 'libxscrnsaver' 'libpng=1.4.8-1' 'gtk+2-libs' 'libxtst' \ 'libgcrypt' 'dejavu-ttf' 'gnutls>=2.12.12' 'libtasn1' 'gdk-pixbuf2' \ 'systemd>=188' 'libcups' 'openssl' 'libxml2' 'speech-dispatcher' \ - 'protobuf' 'gconf' 'opus' 'libmtp' 'nspr>=4.10.1') + 'gconf' 'opus' 'libmtp' 'nspr>=4.10.1') makedepends=('python' 'perl' 'gperf' 'yasm' 'libgl' 'libgnome-keyring' 'cups' 'krb5' \ 'elfutils' 'subversion' 'gtk+2') license=('BSD') @@ -25,11 +25,9 @@ up2date="lynx -dump 'http://googlechromereleases.blogspot.de/search/label/Stable egrep -o -m 1 'Stable channel has been updated to ([0123456789.]*)' | \ egrep -o '([0123456789.]*)'" source=(http://commondatastorage.googleapis.com/chromium-browser-official/$_F_archive_name-$pkgver.tar.xz \ - fix_embed_version.patch \ $pkgname.desktop \ $pkgname.sh) sha1sums=('4054e2f8f9f7e7c00c540a9b4a0da67331bd598a' \ - 'd5558133fe7ba50591fdb6daef710900adf61011' \ '78ed8913b8a598de6a9e45d206973a846dbe8a51' \ 'e06de4aee77b3deb77e3b08ebb175ec02da42ced') @@ -86,7 +84,7 @@ build() { -Duse_system_libxslt=1 -Duse_system_libyuv=1 -Duse_system_nspr=1 - -Duse_system_protobuf=1 + -Duse_system_protobuf=0 -Duse_system_yasm=1" myconf+=" -Duse_pulseaudio=1 diff --git a/source/xapps-extra/chromium-browser/fix_embed_version.patch b/source/xapps-extra/chromium-browser/fix_embed_version.patch deleted file mode 100644 index ebf61b7..0000000 --- a/source/xapps-extra/chromium-browser/fix_embed_version.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/chrome/test/chromedriver/embed_version_in_cpp.py 2013/10/10 00:32:56 227841 -+++ src/chrome/test/chromedriver/embed_version_in_cpp.py 2013/10/10 00:33:17 227842 -@@ -25,9 +25,12 @@ - options, args = parser.parse_args() - - version = open(options.version_file, 'r').read().strip() -- revision = lastchange.FetchVersionInfo(None).revision.strip() -+ revision = lastchange.FetchVersionInfo(None).revision -+ if revision: -+ version += '.' + revision.strip() -+ - global_string_map = { -- 'kChromeDriverVersion': version + '.' + revision -+ 'kChromeDriverVersion': version - } - cpp_source.WriteSource('version', - 'chrome/test/chromedriver', _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
