[arch-commits] Commit in chromium/trunk (PKGBUILD gcc-4.6.patch)

[Evangelos Foutras]

    Date: Tuesday, August 2, 2011 @ 14:37:17
  Author: foutrelis
Revision: 134279

upgpkg: chromium 13.0.782.107-1
New upstream release.

Modified:
  chromium/trunk/PKGBUILD
  chromium/trunk/gcc-4.6.patch

---------------+
 PKGBUILD      |   39 ++++++++++++++-------------------------
 gcc-4.6.patch |   21 ---------------------
 2 files changed, 14 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-02 18:37:12 UTC (rev 134278)
+++ PKGBUILD	2011-08-02 18:37:17 UTC (rev 134279)
@@ -5,14 +5,14 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=chromium
-pkgver=12.0.742.124
+pkgver=13.0.782.107
 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/"
 license=('BSD')
 depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent'
-         'libxss' 'libxtst' 'ttf-dejavu' 'desktop-file-utils'
+         'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils'
          'hicolor-icon-theme')
 makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring')
 provides=('chromium-browser')
@@ -24,20 +24,18 @@
         gcc-4.6.patch
         glibc-2.14.patch
         make-hash-tools-use-if-instead-of-switch.patch)
-md5sums=('37a53e0dd2ba031c508cdd4f94b4912e'
+md5sums=('21b510e818d6943e20cfd114e9319d27'
          '075c3c2fa5902e16b8547dd31d437191'
          '096a46ef386817988250d2d7bddd1b34'
-         'ec0b4e4ca4cf970a18a080ec2776c252'
+         '690f2be42bf2a31755753a466653eb33'
          '543a32b09f138fd47858b9a4a7c82dfb'
          '9d9e66c8365d7333e55305796b49fd77')
 
 build() {
   cd "$srcdir/chromium-$pkgver"
 
-  # Patches to fix gcc 4.6 compilation from
+  # Fix build with gcc 4.6
   # 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
@@ -48,8 +46,6 @@
   patch -d third_party/WebKit -Np2 -i \
     "$srcdir/make-hash-tools-use-if-instead-of-switch.patch"
 
-### Configure
-
   # Use Python 2
   find . -type f -exec sed -i -r \
     -e 's|/usr/bin/python$|\02|g' \
@@ -65,7 +61,6 @@
   # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312)
 
   build/gyp_chromium -f make build/all.gyp --depth=. \
-    -Dgcc_version=45 \
     -Dno_strict_aliasing=1 \
     -Dwerror= \
     -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
@@ -73,21 +68,19 @@
     -Drelease_extra_cflags="$CFLAGS" \
     -Dffmpeg_branding=Chrome \
     -Dproprietary_codecs=1 \
-    -Duse_system_libjpeg=1 \
-    -Duse_system_libxslt=0 \
-    -Duse_system_libxml=0 \
     -Duse_system_bzip2=1 \
-    -Duse_system_zlib=1 \
-    -Duse_system_libpng=1 \
     -Duse_system_ffmpeg=0 \
-    -Duse_system_yasm=1 \
     -Duse_system_libevent=1 \
+    -Duse_system_libjpeg=1 \
+    -Duse_system_libpng=1 \
+    -Duse_system_libxml=0 \
     -Duse_system_ssl=0 \
+    -Duse_system_yasm=1 \
+    -Duse_system_zlib=1 \
     -Duse_gconf=0 \
+    -Ddisable_sse2=1 \
     $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1')
 
-### Build
-
   make chrome chrome_sandbox BUILDTYPE=Release
 }
 
@@ -99,14 +92,10 @@
   install -Dm4755 -o root -g root out/Release/chrome_sandbox \
     "$pkgdir/usr/lib/chromium/chromium-sandbox"
 
-  install -Dm644 out/Release/chrome.pak "$pkgdir/usr/lib/chromium/chrome.pak"
+  cp out/Release/{{chrome,resources}.pak,libffmpegsumo.so} \
+    out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_x86_*.nexe} \
+    "$pkgdir/usr/lib/chromium/"
 
-  install -Dm644 out/Release/resources.pak \
-    "$pkgdir/usr/lib/chromium/resources.pak"
-
-  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/

Modified: gcc-4.6.patch
===================================================================
--- gcc-4.6.patch	2011-08-02 18:37:12 UTC (rev 134278)
+++ gcc-4.6.patch	2011-08-02 18:37:17 UTC (rev 134279)
@@ -31,17 +31,6 @@
  
  namespace pp {
  
-diff -u -r third_party/libjingle/source/talk/base/sigslot.h third_party/libjingle/source/talk/base/sigslot.h
---- third_party/libjingle/source/talk/base/sigslot.h	2011-04-13 13:25:41.000000000 +0400
-+++ third_party/libjingle/source/talk/base/sigslot.h	2011-04-20 20:00:43.000000000 +0400
-@@ -80,6 +80,7 @@
- 
- #include <set>
- #include <list>
-+#include <cstddef>
- 
- // On our copy of sigslot.h, we force single threading
- #define SIGSLOT_PURE_ISO
 diff -u -r third_party/ots/src/os2.cc third_party/ots/src/os2.cc
 --- third_party/ots/src/os2.cc	2011-04-13 13:24:06.000000000 +0400
 +++ third_party/ots/src/os2.cc	2011-04-20 19:45:44.000000000 +0400
@@ -119,13 +108,3 @@
  
  class SkBitmap;
  
---- ppapi/cpp/paint_aggregator.h	2010-12-23 18:10:27.000000000 -0600
-+++ ppapi/cpp/paint_aggregator.h~	2011-04-19 05:34:56.085582885 -0500
-@@ -5,6 +5,7 @@
- #ifndef PPAPI_CPP_PAINT_AGGREGATOR_H_
- #define PPAPI_CPP_PAINT_AGGREGATOR_H_
- 
-+#include <cstddef>
- #include <vector>
- 
- #include "ppapi/cpp/point.h"