Date: Saturday, May 7, 2011 @ 12:44:47 Author: foutrelis Revision: 123036
upgpkg: chromium 11.0.696.65-1 New upstream release. Modified: chromium/trunk/PKGBUILD chromium/trunk/chromium.install ------------------+ PKGBUILD | 101 +++++++++++++++++++++++++++-------------------------- chromium.install | 2 - 2 files changed, 53 insertions(+), 50 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-05-07 16:08:21 UTC (rev 123035) +++ PKGBUILD 2011-05-07 16:44:47 UTC (rev 123036) @@ -1,49 +1,56 @@ # $Id$ +# Maintainer: Evangelos Foutras <[email protected]> # Contributor: Pierre Schmitz <[email protected]> # Contributor: Jan "heftig" Steffens <[email protected]> -# Maintainer: Daniel J Griffiths <[email protected]> +# Contributor: Daniel J Griffiths <[email protected]> pkgname=chromium -pkgver=11.0.696.57 +pkgver=11.0.696.65 pkgrel=1 -pkgdesc='The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser.' +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/' +url="http://www.chromium.org/"; license=('BSD') -depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libevent' 'libxss' 'libxtst' 'ttf-dejavu' 'desktop-file-utils') +depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' + 'libxss' 'libxtst' 'ttf-dejavu' 'desktop-file-utils' + 'hicolor-icon-theme') makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring') provides=('chromium-browser') conflicts=('chromium-browser') install=chromium.install -source=("http://build.chromium.org/buildbot/official/chromium-${pkgver}.tar.bz2"; - 'chromium.desktop' 'chromium.sh' 'gcc-4.6.patch') -md5sums=('f17a37a2d4a2f344f0a11288600e296c' +source=(http://build.chromium.org/official/chromium-$pkgver.tar.bz2 + chromium.desktop + chromium.sh + gcc-4.6.patch) +md5sums=('0d7b777cf0cc2fcc1517d99c38feea1c' '075c3c2fa5902e16b8547dd31d437191' '096a46ef386817988250d2d7bddd1b34' 'ab7934b4a57206707cca69be0d18638e') build() { - cd ${srcdir}/chromium-${pkgver} + cd "$srcdir/chromium-$pkgver" - # patches to fix gcc 4.6 compilation from + # Patches to fix gcc 4.6 compilation from # http://code.google.com/p/chromium/issues/detail?id=80071 # http://code.google.com/p/chromium/issues/detail?id=70746 # http://code.google.com/p/chromium/issues/detail?id=46411 - patch -p0 -i ${srcdir}/gcc-4.6.patch + patch -Np0 -i "$srcdir/gcc-4.6.patch" ### Configure - echo 'Use python2 instead of python...' - find . -type f -exec \ - sed -E 's#(/usr/bin/python)$#\12#g;s#(/usr/bin/python2)\.4$#\1#g' -i {} \; + # Use Python 2 + find . -type f -exec sed -i -r \ + -e 's|/usr/bin/python$|\02|g' \ + -e 's|(/usr/bin/python2)\.4$|\1|g' \ + {} + # There are still a lot of relative calls which need a workaround - mkdir ${srcdir}/python2-path - ln -s /usr/bin/python2 ${srcdir}/python2-path/python - export PATH="${srcdir}/python2-path/:${PATH}" + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + export PATH="$srcdir/python2-path:$PATH" - # we need to disable system_ssl until "next protocol negotiation" support - # is available in our nss package - # see https://bugzilla.mozilla.org/show_bug.cgi?id=547312 + # We need to disable system_ssl until "next protocol negotiation" support is + # available in our nss package. + # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312) build/gyp_chromium -f make build/all.gyp --depth=. \ -Dgcc_version=45 \ @@ -51,7 +58,7 @@ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ -Dlinux_strip_binary=1 \ - -Drelease_extra_cflags="${CFLAGS}" \ + -Drelease_extra_cflags="$CFLAGS" \ -Dffmpeg_branding=Chrome \ -Dproprietary_codecs=1 \ -Duse_system_libjpeg=1 \ @@ -65,7 +72,7 @@ -Duse_system_libevent=1 \ -Duse_system_ssl=0 \ -Duse_gconf=0 \ - $([ "${CARCH}" == 'i686' ] && echo '-Ddisable_sse2=1') + $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1') ### Build @@ -73,47 +80,43 @@ } package() { - cd ${srcdir}/chromium-${pkgver} + cd "$srcdir/chromium-$pkgver" - install -m 0755 -D out/Release/chrome ${pkgdir}/usr/lib/chromium/chromium + install -D out/Release/chrome ${pkgdir}/usr/lib/chromium/chromium - install -m 4555 -o root -g root -D out/Release/chrome_sandbox \ - ${pkgdir}/usr/lib/chromium/chromium-sandbox + install -Dm4755 -o root -g root out/Release/chrome_sandbox \ + "$pkgdir/usr/lib/chromium/chromium-sandbox" - install -m 0644 -D out/Release/chrome.pak \ - ${pkgdir}/usr/lib/chromium/chrome.pak + install -Dm644 out/Release/chrome.pak "$pkgdir/usr/lib/chromium/chrome.pak" - install -m 0644 -D out/Release/resources.pak \ - ${pkgdir}/usr/lib/chromium/resources.pak + install -Dm644 out/Release/resources.pak \ + "$pkgdir/usr/lib/chromium/resources.pak" - install -m 0755 -D out/Release/libffmpegsumo.so \ - ${pkgdir}/usr/lib/chromium/libffmpegsumo.so + install -D out/Release/libffmpegsumo.so \ + "$pkgdir/usr/lib/chromium/libffmpegsumo.so" -# these links are only needed when building with system ffmpeg -# ln -s /usr/lib/libavcodec.so.52 ${pkgdir}/usr/lib/chromium/ -# ln -s /usr/lib/libavformat.so.52 ${pkgdir}/usr/lib/chromium/ -# ln -s /usr/lib/libavutil.so.50 ${pkgdir}/usr/lib/chromium/ + # These links are only needed when building with system ffmpeg + #ln -s /usr/lib/libavcodec.so.52 ${pkgdir}/usr/lib/chromium/ + #ln -s /usr/lib/libavformat.so.52 ${pkgdir}/usr/lib/chromium/ + #ln -s /usr/lib/libavutil.so.50 ${pkgdir}/usr/lib/chromium/ - cp -a out/Release/locales out/Release/resources \ - ${pkgdir}/usr/lib/chromium/ + cp -a out/Release/locales out/Release/resources "$pkgdir/usr/lib/chromium/" - find ${pkgdir}/usr/lib/chromium/ -name '*.d' -type f -delete + find "$pkgdir/usr/lib/chromium/" -name '*.d' -type f -delete - install -m 0644 -D out/Release/chrome.1 \ - ${pkgdir}/usr/share/man/man1/chromium.1 + install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1" - install -m 0644 -D ${srcdir}/chromium.desktop \ - ${pkgdir}/usr/share/applications/chromium.desktop + install -Dm644 "$srcdir/chromium.desktop" \ + "$pkgdir/usr/share/applications/chromium.desktop" for size in 16 22 24 32 48 64 128 256; do - install -m 0644 -D \ - chrome/app/theme/chromium/product_logo_${size}.png \ - ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png + install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ + "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" done - install -m 0755 -D ${srcdir}/chromium.sh ${pkgdir}/usr/bin/chromium + install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium" - install -m 0644 -D LICENSE ${pkgdir}/usr/share/licenses/chromium/LICENSE + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE" } -# vim:set sw=2 sts=2 et: +# vim:set ts=2 sw=2 et: Modified: chromium.install =================================================================== --- chromium.install 2011-05-07 16:08:21 UTC (rev 123035) +++ chromium.install 2011-05-07 16:44:47 UTC (rev 123036) @@ -1,5 +1,5 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &>/dev/null update-desktop-database -q }
