Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing

1 files changed, 69 insertions, 52 deletions

diff --git a/abs/extra/community/chromium/PKGBUILD b/abs/extra/community/chromium/PKGBUILD
index eba588c..013f1cc 100644
--- a/abs/extra/community/chromium/PKGBUILD
+++ b/abs/extra/community/chromium/PKGBUILD
@@ -1,42 +1,62 @@
-# $Id: PKGBUILD 109507 2011-02-10 15:37:06Z ibiru $
+# $Id$
+# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=chromium
-pkgver=9.0.597.94
-pkgrel=3
-pkgdesc='The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser.'
+pkgver=12.0.742.112
+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/'
+url="http://www.chromium.org/"
 license=('BSD')
-depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libevent' 'libxss' 'libxtst' 'ttf-dejavu' 'libcups')
-makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'libcups')
+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')
-md5sums=('41386b3df743575f2325c4c64d6d7bc7'
-         'c5e849fcb1101149977355c99d8ff78f'
-         '096a46ef386817988250d2d7bddd1b34')
+source=(http://build.chromium.org/official/chromium-$pkgver.tar.bz2
+        chromium.desktop
+        chromium.sh
+        gcc-4.6.patch
+        glibc-2.14.patch)
+md5sums=('8a5b7b4b30f5fe8de10fcf7d984321b8'
+         '075c3c2fa5902e16b8547dd31d437191'
+         '096a46ef386817988250d2d7bddd1b34'
+         '0ea28c80c49a0a4440786e05b5251678'
+         '543a32b09f138fd47858b9a4a7c82dfb')
 
 build() {
-  cd ${srcdir}/chromium-${pkgver}
+  cd "$srcdir/chromium-$pkgver"
+
+  # 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 -Np0 -i "$srcdir/gcc-4.6.patch"
+  
+  # Fix build with glibc 2.14
+  # http://code.google.com/p/chromium/issues/detail?id=86646
+  patch -Np2 -i "$srcdir/glibc-2.14.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 \
@@ -44,7 +64,7 @@ build() {
     -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 \
@@ -57,7 +77,8 @@ build() {
     -Duse_system_yasm=1 \
     -Duse_system_libevent=1 \
     -Duse_system_ssl=0 \
-    $([ "${CARCH}" == 'i686' ] && echo '-Ddisable_sse2=1')
+    -Duse_gconf=0 \
+    $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1')
 
 ### Build
 
@@ -65,47 +86,43 @@ build() {
 }
 
 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: