extra/chromium to 34.0.1847.116-1.1

extra/chromium/PKGBUILD

@@ -22,19 +22,22 @@
 buildarch=4
 
 pkgname=chromium
-pkgver=33.0.1750.152
-pkgrel=1
+pkgver=34.0.1847.116
+pkgrel=1.1
 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
 arch=('armv6h' 'armv7h')
 url="http://www.chromium.org/"
 license=('BSD')
-depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'icu'
+depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss'
          'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'flac' 'opus' 'snappy'
          'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'harfbuzz-icu'
          'desktop-file-utils' 'hicolor-icon-theme' 'protobuf')
 makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
              'elfutils' 'subversion')
-optdepends=('kdebase-kdialog: needed for file dialogs in KDE')
+optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
+            'gnome-keyring: for storing passwords in GNOME keyring'
+            'libgnome-keyring: for storing passwords in GNOME keyring'
+            'kdeutils-kwallet: for storing passwords in KWallet')
 provides=('chromium-browser')
 conflicts=('chromium-browser')
 backup=('etc/chromium/default')
@@ -42,18 +45,24 @@ install=chromium.install
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
         chromium.desktop
         chromium.default
-        chromium-gn-r0.patch
+        chromium-gn-r1.patch
+        chromium-depot-tools-r0.patch
         chromium.sh
         arm-webrtc-fix.patch
+        chromium-arm-r0.patch
         skia.patch
+        chromium-system-ffmpeg-r8.patch
         v6-ffmpeg.patch)
-sha256sums=('9fd462840bee3ae205b0548e8a483f7589beecdb7c6309d4d65425cbf710cc2f'
+sha256sums=('dd6579c170eecd8d1f366461575e9754e44200e0b9fefde20941e15cb6729711'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
-            'a1145e83d775101b28dcdceb3ca076fc7e9a4b9f69a1a2236d0c97ad39afb3d3'
+            'b1ca3f17959be4fb6c031563b1ee587b7e990166c41b9d5b9dce2f91bf01fe1c'
+            '14d86770eaaead42e244007ebe5a94d188f8668c2598fa6042ada87a90cae671'
             '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
             '9db0f01517c52e3236ff52e8a664840542a19144a54923ae6aabea3dcfa92c52'
-            '0567b09b91c13389d430630a8dfcda06d5f1a12d6b07f0b48dd418d2543a28d8'
+            '3c6138787d83390100fa6b7571759e975c9011e3ae345c6bbbb1e00a9e611e60'
+            'd53c0af6636611ee190083361d100cbbdc18515d94f59c2750da121022554226'
+            '9c3a31ce42860edce5e2bbae52ccb377f0442ed2e161ed477103f69c3cb7d6b4'
             '3fbabcbd512494b529e0a0e17560735887acf2291a74653750f9b29f5d45774d')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -68,17 +77,20 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -Np0 -i "$srcdir/chromium-gn-r0.patch"
+  # Build fixes (patches from Gentoo)
+  patch -Np0 -i "$srcdir/chromium-gn-r1.patch"
+  patch -Np0 -i "$srcdir/chromium-depot-tools-r0.patch"
+
+  # Temp fix for skia
+  patch -Np0 -i "$srcdir/skia.patch"
 
   # Fix WebRTC for ARM
   patch -Np0 -i "$srcdir/arm-webrtc-fix.patch"
 
-  # Fix ffmpeg build for armv6
-  [ "$CARCH" == "armv6h" ] && patch -Np1 -i "$srcdir/v6-ffmpeg.patch"
+  # Fix icu build on ARm
+  patch -Np0 -i ../chromium-arm-r0.patch
 
-  # Temp fix for skia
-  patch -Np0 -i "$srcdir/skia.patch"
-MAKEFLAGS=-j3
+  MAKEFLAGS=-j4
 
   # Use Python 2
   find . -type f -exec sed -i -r \
@@ -140,14 +152,13 @@ fi
     -Duse_system_protobuf=1
     -Duse_system_ffmpeg=0
     -Duse_system_harfbuzz=1
-    -Duse_system_icu=1
     -Duse_system_libevent=1
     -Duse_system_libjpeg=1
     -Duse_system_libpng=1
     -Duse_system_libxml=0
     -Duse_system_opus=1
     -Duse_system_snappy=1
-    -Duse_system_ssl=0
+    -Duse_system_ssl=1
     -Duse_system_xdg_utils=1
     -Duse_system_yasm=1
     -Duse_system_zlib=0
@@ -164,6 +175,12 @@ fi
     -Dsysroot=
     ${arch_specific_flags})
 
+  # Re-configure bundled ffmpeg.
+  pushd third_party/ffmpeg > /dev/null || die
+  chromium/scripts/build_ffmpeg.sh linux arm "${PWD}" config-only || die
+  chromium/scripts/copy_config.sh || die
+  popd > /dev/null || die
+
   build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}"
   build/gyp_chromium -f make --depth=. "${_chromium_conf[@]}"
 
@@ -184,7 +201,7 @@ package() {
   # Allow users to override command-line options
   install -Dm644 "$srcdir/chromium.default" "$pkgdir/etc/chromium/default"
 
-  cp -a out/Release/locales "$pkgdir/usr/lib/chromium/"
+  cp -a out/Release/locales out/Release/icudtl.dat "$pkgdir/usr/lib/chromium/"
 
   install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
 

extra/chromium/chromium-arm-r0.patch

@@ -0,0 +1,11 @@
+--- third_party/icu/icu.gyp.orig	2014-03-16 17:49:02.561203814 -0500
++++ third_party/icu/icu.gyp	2014-03-16 17:49:23.191037086 -0500
+@@ -30,7 +30,7 @@
+       }],
+       ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
+          or OS=="netbsd" or OS=="mac" or OS=="android") and \
+-        (target_arch=="arm" or target_arch=="ia32" or \
++        (target_arch=="ia32" or \
+          target_arch=="mipsel")', {
+         'target_conditions': [
+           ['_toolset=="host"', {

extra/chromium/chromium-depot-tools-r0.patch

@@ -0,0 +1,11 @@
+--- build/gyp_chromium.orig	2014-01-29 01:22:52.527247671 +0000
++++ build/gyp_chromium	2014-01-29 01:23:49.857623290 +0000
+@@ -38,8 +38,6 @@
+ sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
+     'Source', 'build', 'scripts'))
+ 
+-import find_depot_tools
+-
+ # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
+ # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
+ # seconds.  Conversely, memory usage of build/gyp_chromium with Psyco

extra/chromium/chromium-gn-r1.patch

@@ -1,12 +1,11 @@
---- build/gyp_chromium.orig	2013-12-11 03:07:03.941915587 +0000
-+++ build/gyp_chromium	2013-12-11 03:07:29.812073301 +0000
-@@ -221,9 +221,6 @@
+--- build/gyp_chromium.orig	2014-01-16 22:55:50.292718339 +0000
++++ build/gyp_chromium	2014-01-16 23:15:17.890248708 +0000
+@@ -370,8 +370,6 @@
+     args.append('--check')
  
    supplemental_includes = GetSupplementalFiles()
- 
 -  if not RunGN(supplemental_includes):
 -    sys.exit(1)
--
    args.extend(
        ['-I' + i for i in additional_include_files(supplemental_includes, args)])
  

extra/chromium/skia.patch

@@ -1,10 +1,10 @@
---- skia/skia_library_opts.gyp.orig	2014-01-15 18:36:06.947606588 -0700
-+++ skia/skia_library_opts.gyp	2014-01-15 18:38:07.942123899 -0700
-@@ -117,6 +117,7 @@
-             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
-             '../third_party/skia/src/opts/SkBlitRow_opts_arm.h',
-             '../third_party/skia/src/opts/opts_check_arm.cpp',
-+            '../third_party/skia/src/opts/memset.arm.S',
+--- skia/skia_library_opts.gyp.orig	2014-04-10 07:06:03.181637221 -0600
++++ skia/skia_library_opts.gyp	2014-04-10 07:06:55.256436603 -0600
+@@ -123,6 +123,7 @@
+             '../third_party/skia/src/opts/SkMorphology_opts_arm.cpp',
+             '../third_party/skia/src/opts/SkUtils_opts_arm.cpp',
              '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
-             '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
++            '../third_party/skia/src/opts/memset.arm.S',
            ],
+         }],
+         [ 'target_arch == "mipsel"',{