[arch-commits] Commit in chromium/repos (16 files)

Thu Jan 19 03:24:08 UTC 2012

Date: Wednesday, January 18, 2012 @ 22:24:07
  Author: foutrelis
Revision: 146883

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  chromium/repos/staging-i686/
  chromium/repos/staging-i686/PKGBUILD
    (from rev 146882, chromium/trunk/PKGBUILD)
  chromium/repos/staging-i686/chromium.desktop
    (from rev 146882, chromium/trunk/chromium.desktop)
  chromium/repos/staging-i686/chromium.install
    (from rev 146882, chromium/trunk/chromium.install)
  chromium/repos/staging-i686/chromium.sh
    (from rev 146882, chromium/trunk/chromium.sh)
  chromium/repos/staging-i686/fix-downloads-on-ntfs.patch
    (from rev 146882, chromium/trunk/fix-downloads-on-ntfs.patch)
  chromium/repos/staging-i686/gcc-4.6.patch
    (from rev 146882, chromium/trunk/gcc-4.6.patch)
  chromium/repos/staging-i686/nacl-cflags-remove-fstack-protector.patch
    (from rev 146882, chromium/trunk/nacl-cflags-remove-fstack-protector.patch)
  chromium/repos/staging-x86_64/
  chromium/repos/staging-x86_64/PKGBUILD
    (from rev 146882, chromium/trunk/PKGBUILD)
  chromium/repos/staging-x86_64/chromium.desktop
    (from rev 146882, chromium/trunk/chromium.desktop)
  chromium/repos/staging-x86_64/chromium.install
    (from rev 146882, chromium/trunk/chromium.install)
  chromium/repos/staging-x86_64/chromium.sh
    (from rev 146882, chromium/trunk/chromium.sh)
  chromium/repos/staging-x86_64/fix-downloads-on-ntfs.patch
    (from rev 146882, chromium/trunk/fix-downloads-on-ntfs.patch)
  chromium/repos/staging-x86_64/gcc-4.6.patch
    (from rev 146882, chromium/trunk/gcc-4.6.patch)
  chromium/repos/staging-x86_64/nacl-cflags-remove-fstack-protector.patch
    (from rev 146882, chromium/trunk/nacl-cflags-remove-fstack-protector.patch)

----------------------------------------------------------+
 staging-i686/PKGBUILD                                    |  147 +++++++++++++
 staging-i686/chromium.desktop                            |  113 +++++++++
 staging-i686/chromium.install                            |   12 +
 staging-i686/chromium.sh                                 |    4 
 staging-i686/fix-downloads-on-ntfs.patch                 |   26 ++
 staging-i686/gcc-4.6.patch                               |   99 ++++++++
 staging-i686/nacl-cflags-remove-fstack-protector.patch   |   11 
 staging-x86_64/PKGBUILD                                  |  147 +++++++++++++
 staging-x86_64/chromium.desktop                          |  113 +++++++++
 staging-x86_64/chromium.install                          |   12 +
 staging-x86_64/chromium.sh                               |    4 
 staging-x86_64/fix-downloads-on-ntfs.patch               |   26 ++
 staging-x86_64/gcc-4.6.patch                             |   99 ++++++++
 staging-x86_64/nacl-cflags-remove-fstack-protector.patch |   11 
 14 files changed, 824 insertions(+)

Copied: chromium/repos/staging-i686/PKGBUILD (from rev 146882, chromium/trunk/PKGBUILD)
===================================================================

--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,147 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+# Building for x86_64 requires lib32-glibc & lib32-zlib from [multilib]. These
+# libraries are linked from the NaCl toolchain, and are only needed during
+# build time.
+
+pkgname=chromium
+pkgver=16.0.912.75
+pkgrel=2
+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' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils'
+         'hicolor-icon-theme')
+makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
+             'elfutils')
+optdepends=('kdebase-kdialog: needed for file dialogs in KDE')
+# Needed for the NaCl toolchain
+[[ $CARCH == x86_64 ]] && makedepends+=('lib32-zlib')
+provides=('chromium-browser')
+conflicts=('chromium-browser')
+install=chromium.install
+source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2
+        http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip
+        chromium.desktop
+        chromium.sh
+        gcc-4.6.patch
+        fix-downloads-on-ntfs.patch
+        nacl-cflags-remove-fstack-protector.patch)
+sha256sums=('88c931479ae2f92c7fb31e14c044e9732a5f765dd872b27d449efd6c99c83e95'
+            '964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01'
+            '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
+            'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
+            '9c5e0803904d1a0e71ab7444c92a7046a34a9518eeba7a70f2eec7abecb8bf4e'
+            '6364c464d1885b2ec21076f01f993725925ccc066805f1ecbbeaf6f79b93c209'
+            '406f06a1a18fad4ba9e5d4e142509f1ac1512d176cc36c1744a7abf949991e2e')
+
+build() {
+  cd "$srcdir/chromium-$pkgver"
+
+  # Fix build with gcc 4.6
+  # http://code.google.com/p/chromium/issues/detail?id=80071
+  patch -Np0 -i "$srcdir/gcc-4.6.patch"
+
+  # Fix build with CUPS 1.5
+  sed -i '/#include <cups\/cups.h>/ a #include <cups/ppd.h>' \
+    chrome/browser/ui/webui/print_preview_handler.cc
+
+  # Fix downloading on NTFS partitions
+  # http://code.google.com/p/chromium/issues/detail?id=102200
+  patch -Np2 -i "$srcdir/fix-downloads-on-ntfs.patch"
+
+  # Filter -fstack-protector out of cflags for nacl_helper_bootstrap
+  # http://code.google.com/p/chromium/issues/detail?id=104569
+  patch -Np2 -i "$srcdir/nacl-cflags-remove-fstack-protector.patch"
+
+  # Use Python 2
+  find . -type f -exec sed -i -r \
+    -e 's|/usr/bin/python$|&2|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"
+
+  pushd "$srcdir/nacl_sdk"
+  ./naclsdk update pepper_15
+  popd
+
+  ln -s "$srcdir/nacl_sdk/pepper_15/toolchain/linux_x86_newlib" \
+    native_client/toolchain/linux_x86_newlib
+
+  # 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)
+
+  # CFLAGS are passed through release_extra_cflags below
+  export -n CFLAGS CXXFLAGS
+
+  build/gyp_chromium -f make build/all.gyp --depth=. \
+    -Dno_strict_aliasing=1 \
+    -Dwerror= \
+    -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+    -Dlinux_strip_binary=1 \
+    -Drelease_extra_cflags="$CFLAGS" \
+    -Dffmpeg_branding=Chrome \
+    -Dproprietary_codecs=1 \
+    -Duse_system_bzip2=1 \
+    -Duse_system_ffmpeg=0 \
+    -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 \
+    $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1')
+
+  make chrome chrome_sandbox BUILDTYPE=Release
+}
+
+package() {
+  cd "$srcdir/chromium-$pkgver"
+
+  install -D out/Release/chrome ${pkgdir}/usr/lib/chromium/chromium
+
+  install -Dm4755 -o root -g root out/Release/chrome_sandbox \
+    "$pkgdir/usr/lib/chromium/chromium-sandbox"
+
+  cp out/Release/{{chrome,resources}.pak,libffmpegsumo.so} \
+    out/Release/nacl_helper{,_bootstrap} \
+    out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_x86_*.nexe} \
+    "$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/"
+
+  find "$pkgdir/usr/lib/chromium/" -name '*.d' -type f -delete
+
+  install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
+
+  install -Dm644 "$srcdir/chromium.desktop" \
+    "$pkgdir/usr/share/applications/chromium.desktop"
+
+  for size in 16 22 24 32 48 64 128 256; do
+    install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
+      "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+  done
+
+  install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium"
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: chromium/repos/staging-i686/chromium.desktop (from rev 146882, chromium/trunk/chromium.desktop)
===================================================================
--- staging-i686/chromium.desktop	                        (rev 0)
+++ staging-i686/chromium.desktop	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,113 @@
+[Desktop Entry]
+Version=1.0
+Name=Chromium
+# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
+# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
+GenericName=Web Browser
+GenericName[ar]=متصفح الشبكة
+GenericName[bg]=Уеб браузър
+GenericName[ca]=Navegador web
+GenericName[cs]=WWW prohlížeč
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής ιστού
+GenericName[en_GB]=Web Browser
+GenericName[es]=Navegador web
+GenericName[et]=Veebibrauser
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[gu]=વેબ બ્રાઉઝર
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
+GenericName[ko]=웹 브라우저
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Tīmekļa pārlūks
+GenericName[ml]=വെബ് ബ്രൌസര്‍
+GenericName[mr]=वेब ब्राऊजर
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador da Internet
+GenericName[ro]=Navigator de Internet
+GenericName[ru]=Веб-браузер
+GenericName[sl]=Spletni brskalnik
+GenericName[sv]=Webbläsare
+GenericName[ta]=இணைய உலாவி
+GenericName[th]=เว็บเบราว์เซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_HK]=網頁瀏覽器
+GenericName[zh_TW]=網頁瀏覽器
+# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[fil]=Web Browser
+GenericName[hr]=Web preglednik
+GenericName[id]=Browser Web
+GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
+GenericName[sk]=WWW prehliadač
+GenericName[sr]=Интернет прегледник
+GenericName[te]=మహాతల అన్వేషి
+GenericName[vi]=Bộ duyệt Web
+# Gnome and KDE 3 uses Comment.
+Comment=Access the Internet
+Comment[ar]=الدخول إلى الإنترنت
+Comment[bg]=Достъп до интернет
+Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
+Comment[ca]=Accedeix a Internet
+Comment[cs]=Přístup k internetu
+Comment[da]=Få adgang til internettet
+Comment[de]=Internetzugriff
+Comment[el]=Πρόσβαση στο Διαδίκτυο
+Comment[en_GB]=Access the Internet
+Comment[es]=Accede a Internet.
+Comment[et]=Pääs Internetti
+Comment[fi]=Käytä internetiä
+Comment[fil]=I-access ang Internet
+Comment[fr]=Accéder à Internet
+Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
+Comment[he]=גישה אל האינטרנט
+Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
+Comment[hr]=Pristup Internetu
+Comment[hu]=Internetelérés
+Comment[id]=Akses Internet
+Comment[it]=Accesso a Internet
+Comment[ja]=インターネットにアクセス
+Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
+Comment[ko]=인터넷 연결
+Comment[lt]=Interneto prieiga
+Comment[lv]=Piekļūt internetam
+Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
+Comment[mr]=इंटरनेटमध्ये प्रवेश करा
+Comment[nb]=Gå til Internett
+Comment[nl]=Verbinding maken met internet
+Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
+Comment[pl]=Skorzystaj z internetu
+Comment[pt]=Aceder à Internet
+Comment[pt_BR]=Acessar a internet
+Comment[ro]=Accesaţi Internetul
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prístup do siete Internet
+Comment[sl]=Dostop do interneta
+Comment[sr]=Приступите Интернету
+Comment[sv]=Gå ut på Internet
+Comment[ta]=இணையத்தை அணுகுதல்
+Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
+Comment[th]=เข้าถึงอินเทอร์เน็ต
+Comment[tr]=İnternet'e erişin
+Comment[uk]=Доступ до Інтернету
+Comment[vi]=Truy cập Internet
+Comment[zh_CN]=访问互联网
+Comment[zh_HK]=連線到網際網路
+Comment[zh_TW]=連線到網際網路
+Exec=chromium %U
+Terminal=false
+Icon=chromium
+Type=Application
+Categories=GTK;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;

Copied: chromium/repos/staging-i686/chromium.install (from rev 146882, chromium/trunk/chromium.install)
===================================================================
--- staging-i686/chromium.install	                        (rev 0)
+++ staging-i686/chromium.install	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: chromium/repos/staging-i686/chromium.sh (from rev 146882, chromium/trunk/chromium.sh)
===================================================================
--- staging-i686/chromium.sh	                        (rev 0)
+++ staging-i686/chromium.sh	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,4 @@
+#!/bin/sh
+export CHROME_WRAPPER=/usr/lib/chromium/chromium
+export CHROME_DESKTOP=chromium.desktop
+exec /usr/lib/chromium/chromium "$@"

Copied: chromium/repos/staging-i686/fix-downloads-on-ntfs.patch (from rev 146882, chromium/trunk/fix-downloads-on-ntfs.patch)
===================================================================
--- staging-i686/fix-downloads-on-ntfs.patch	                        (rev 0)
+++ staging-i686/fix-downloads-on-ntfs.patch	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,26 @@
+--- trunk/src/content/browser/download/base_file.cc	2011/11/03 00:57:14	108379
++++ trunk/src/content/browser/download/base_file.cc	2011/11/03 00:57:22	108380
+@@ -332,16 +332,19 @@
+     int stat_error = stat(new_path.value().c_str(), &st);
+     bool stat_succeeded = (stat_error == 0);
+     if (!stat_succeeded)
+-      return LOG_ERROR("stat", net::MapSystemError(errno));
++      LOG_ERROR("stat", net::MapSystemError(errno));
+ 
+     // TODO(estade): Move() falls back to copying and deleting when a simple
+     // rename fails. Copying sucks for large downloads. crbug.com/8737
+     if (!file_util::Move(full_path_, new_path))
+       return LOG_ERROR("Move", net::MapSystemError(errno));
+ 
+-    int chmod_error = chmod(new_path.value().c_str(), st.st_mode);
+-    if (chmod_error < 0)
+-      return LOG_ERROR("chmod", net::MapSystemError(errno));
++    if (stat_succeeded) {
++      // On Windows file systems (FAT, NTFS), chmod fails.  This is OK.
++      int chmod_error = chmod(new_path.value().c_str(), st.st_mode);
++      if (chmod_error < 0)
++        LOG_ERROR("chmod", net::MapSystemError(errno));
++    }
+   }
+ #endif
+ 

Copied: chromium/repos/staging-i686/gcc-4.6.patch (from rev 146882, chromium/trunk/gcc-4.6.patch)
===================================================================
--- staging-i686/gcc-4.6.patch	                        (rev 0)
+++ staging-i686/gcc-4.6.patch	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,99 @@
+diff -u -r chrome/browser/search_engines/template_url_prepopulate_data.h chrome/browser/search_engines/template_url_prepopulate_data.h
+--- chrome/browser/search_engines/template_url_prepopulate_data.h	2011-04-13 13:23:41.000000000 +0400
++++ chrome/browser/search_engines/template_url_prepopulate_data.h	2011-04-20 19:32:58.000000000 +0400
+@@ -7,6 +7,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class GURL;
+ class PrefService;
+diff -u -r gpu/command_buffer/common/types.h gpu/command_buffer/common/types.h
+--- gpu/command_buffer/common/types.h	2011-04-13 13:22:57.000000000 +0400
++++ gpu/command_buffer/common/types.h	2011-04-20 19:32:58.000000000 +0400
+@@ -11,6 +11,7 @@
+ #include <stdint.h>
+ #endif
+ #include <string>
++#include <cstddef>
+ 
+ typedef signed char         schar;
+ typedef signed char         int8;
+diff -u -r ppapi/cpp/paint_aggregator.h ppapi/cpp/paint_aggregator.h
+--- ppapi/cpp/paint_aggregator.h	2011-04-13 13:22:58.000000000 +0400
++++ ppapi/cpp/paint_aggregator.h	2011-04-20 20:11:44.000000000 +0400
+@@ -9,6 +9,7 @@
+ 
+ #include "ppapi/cpp/point.h"
+ #include "ppapi/cpp/rect.h"
++#include <cstddef>
+ 
+ namespace pp {
+ 
+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
+@@ -5,6 +5,7 @@
+ #include "os2.h"
+ 
+ #include "head.h"
++#include <cstddef>
+ 
+ // OS/2 - OS/2 and Windows Metrics
+ // http://www.microsoft.com/opentype/otspec/os2.htm
+diff -u -r third_party/tcmalloc/chromium/src/base/stl_allocator.h third_party/tcmalloc/chromium/src/base/stl_allocator.h
+--- third_party/tcmalloc/chromium/src/base/stl_allocator.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/base/stl_allocator.h	2011-04-20 19:32:58.000000000 +0400
+@@ -38,6 +38,7 @@
+ #include <config.h>
+ 
+ #include <limits>
++#include <cstddef>
+ 
+ #include "base/basictypes.h"
+ #include "base/logging.h"
+diff -u -r third_party/tcmalloc/chromium/src/base/vdso_support.h third_party/tcmalloc/chromium/src/base/vdso_support.h
+--- third_party/tcmalloc/chromium/src/base/vdso_support.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/base/vdso_support.h	2011-04-20 19:32:58.000000000 +0400
+@@ -37,6 +37,7 @@
+ 
+ #define HAVE_VDSO_SUPPORT 1
+ 
++#include <cstddef>
+ #include <stdlib.h>     // for NULL
+ #include <link.h>  // for ElfW
+ #include "base/basictypes.h"
+diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chromium/src/common.cc
+--- third_party/tcmalloc/chromium/src/common.cc	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/common.cc	2011-04-20 19:32:58.000000000 +0400
+@@ -34,6 +34,7 @@
+ #include "config.h"
+ #include "common.h"
+ #include "system-alloc.h"
++#include <cstddef>
+ 
+ namespace tcmalloc {
+ 
+diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/chromium/src/symbolize.h
+--- third_party/tcmalloc/chromium/src/symbolize.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/symbolize.h	2011-04-20 19:32:58.000000000 +0400
+@@ -38,6 +38,7 @@
+ #include <stdint.h>  // for uintptr_t
+ #endif
+ #include <map>
++#include <cstddef>
+ 
+ using std::map;
+ 
+diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h
+--- ui/gfx/codec/jpeg_codec.h	2011-04-13 13:23:45.000000000 +0400
++++ ui/gfx/codec/jpeg_codec.h	2011-04-20 19:32:58.000000000 +0400
+@@ -7,6 +7,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class SkBitmap;
+ 

Copied: chromium/repos/staging-i686/nacl-cflags-remove-fstack-protector.patch (from rev 146882, chromium/trunk/nacl-cflags-remove-fstack-protector.patch)
===================================================================
--- staging-i686/nacl-cflags-remove-fstack-protector.patch	                        (rev 0)
+++ staging-i686/nacl-cflags-remove-fstack-protector.patch	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,11 @@
+--- src/chromium-16.0.912.63/chrome/nacl.gypi.orig	2011-12-28 19:10:42.000000000 +0200
++++ src/chromium-16.0.912.63/chrome/nacl.gypi	2011-12-28 19:11:09.000000000 +0200
+@@ -275,6 +275,8 @@
+               'cflags!': [
+                 '-fasan',
+                 '-w',
++                '-fstack-protector',
++                '-fstack-protector-all',
+               ],
+               'conditions': [
+                 ['clang==1', {

Copied: chromium/repos/staging-x86_64/PKGBUILD (from rev 146882, chromium/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,147 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+# Building for x86_64 requires lib32-glibc & lib32-zlib from [multilib]. These
+# libraries are linked from the NaCl toolchain, and are only needed during
+# build time.
+
+pkgname=chromium
+pkgver=16.0.912.75
+pkgrel=2
+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' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils'
+         'hicolor-icon-theme')
+makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
+             'elfutils')
+optdepends=('kdebase-kdialog: needed for file dialogs in KDE')
+# Needed for the NaCl toolchain
+[[ $CARCH == x86_64 ]] && makedepends+=('lib32-zlib')
+provides=('chromium-browser')
+conflicts=('chromium-browser')
+install=chromium.install
+source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2
+        http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip
+        chromium.desktop
+        chromium.sh
+        gcc-4.6.patch
+        fix-downloads-on-ntfs.patch
+        nacl-cflags-remove-fstack-protector.patch)
+sha256sums=('88c931479ae2f92c7fb31e14c044e9732a5f765dd872b27d449efd6c99c83e95'
+            '964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01'
+            '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
+            'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
+            '9c5e0803904d1a0e71ab7444c92a7046a34a9518eeba7a70f2eec7abecb8bf4e'
+            '6364c464d1885b2ec21076f01f993725925ccc066805f1ecbbeaf6f79b93c209'
+            '406f06a1a18fad4ba9e5d4e142509f1ac1512d176cc36c1744a7abf949991e2e')
+
+build() {
+  cd "$srcdir/chromium-$pkgver"
+
+  # Fix build with gcc 4.6
+  # http://code.google.com/p/chromium/issues/detail?id=80071
+  patch -Np0 -i "$srcdir/gcc-4.6.patch"
+
+  # Fix build with CUPS 1.5
+  sed -i '/#include <cups\/cups.h>/ a #include <cups/ppd.h>' \
+    chrome/browser/ui/webui/print_preview_handler.cc
+
+  # Fix downloading on NTFS partitions
+  # http://code.google.com/p/chromium/issues/detail?id=102200
+  patch -Np2 -i "$srcdir/fix-downloads-on-ntfs.patch"
+
+  # Filter -fstack-protector out of cflags for nacl_helper_bootstrap
+  # http://code.google.com/p/chromium/issues/detail?id=104569
+  patch -Np2 -i "$srcdir/nacl-cflags-remove-fstack-protector.patch"
+
+  # Use Python 2
+  find . -type f -exec sed -i -r \
+    -e 's|/usr/bin/python$|&2|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"
+
+  pushd "$srcdir/nacl_sdk"
+  ./naclsdk update pepper_15
+  popd
+
+  ln -s "$srcdir/nacl_sdk/pepper_15/toolchain/linux_x86_newlib" \
+    native_client/toolchain/linux_x86_newlib
+
+  # 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)
+
+  # CFLAGS are passed through release_extra_cflags below
+  export -n CFLAGS CXXFLAGS
+
+  build/gyp_chromium -f make build/all.gyp --depth=. \
+    -Dno_strict_aliasing=1 \
+    -Dwerror= \
+    -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+    -Dlinux_strip_binary=1 \
+    -Drelease_extra_cflags="$CFLAGS" \
+    -Dffmpeg_branding=Chrome \
+    -Dproprietary_codecs=1 \
+    -Duse_system_bzip2=1 \
+    -Duse_system_ffmpeg=0 \
+    -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 \
+    $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1')
+
+  make chrome chrome_sandbox BUILDTYPE=Release
+}
+
+package() {
+  cd "$srcdir/chromium-$pkgver"
+
+  install -D out/Release/chrome ${pkgdir}/usr/lib/chromium/chromium
+
+  install -Dm4755 -o root -g root out/Release/chrome_sandbox \
+    "$pkgdir/usr/lib/chromium/chromium-sandbox"
+
+  cp out/Release/{{chrome,resources}.pak,libffmpegsumo.so} \
+    out/Release/nacl_helper{,_bootstrap} \
+    out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_x86_*.nexe} \
+    "$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/"
+
+  find "$pkgdir/usr/lib/chromium/" -name '*.d' -type f -delete
+
+  install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
+
+  install -Dm644 "$srcdir/chromium.desktop" \
+    "$pkgdir/usr/share/applications/chromium.desktop"
+
+  for size in 16 22 24 32 48 64 128 256; do
+    install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
+      "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+  done
+
+  install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium"
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: chromium/repos/staging-x86_64/chromium.desktop (from rev 146882, chromium/trunk/chromium.desktop)
===================================================================
--- staging-x86_64/chromium.desktop	                        (rev 0)
+++ staging-x86_64/chromium.desktop	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,113 @@
+[Desktop Entry]
+Version=1.0
+Name=Chromium
+# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
+# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
+GenericName=Web Browser
+GenericName[ar]=متصفح الشبكة
+GenericName[bg]=Уеб браузър
+GenericName[ca]=Navegador web
+GenericName[cs]=WWW prohlížeč
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής ιστού
+GenericName[en_GB]=Web Browser
+GenericName[es]=Navegador web
+GenericName[et]=Veebibrauser
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[gu]=વેબ બ્રાઉઝર
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
+GenericName[ko]=웹 브라우저
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Tīmekļa pārlūks
+GenericName[ml]=വെബ് ബ്രൌസര്‍
+GenericName[mr]=वेब ब्राऊजर
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador da Internet
+GenericName[ro]=Navigator de Internet
+GenericName[ru]=Веб-браузер
+GenericName[sl]=Spletni brskalnik
+GenericName[sv]=Webbläsare
+GenericName[ta]=இணைய உலாவி
+GenericName[th]=เว็บเบราว์เซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_HK]=網頁瀏覽器
+GenericName[zh_TW]=網頁瀏覽器
+# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[fil]=Web Browser
+GenericName[hr]=Web preglednik
+GenericName[id]=Browser Web
+GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
+GenericName[sk]=WWW prehliadač
+GenericName[sr]=Интернет прегледник
+GenericName[te]=మహాతల అన్వేషి
+GenericName[vi]=Bộ duyệt Web
+# Gnome and KDE 3 uses Comment.
+Comment=Access the Internet
+Comment[ar]=الدخول إلى الإنترنت
+Comment[bg]=Достъп до интернет
+Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
+Comment[ca]=Accedeix a Internet
+Comment[cs]=Přístup k internetu
+Comment[da]=Få adgang til internettet
+Comment[de]=Internetzugriff
+Comment[el]=Πρόσβαση στο Διαδίκτυο
+Comment[en_GB]=Access the Internet
+Comment[es]=Accede a Internet.
+Comment[et]=Pääs Internetti
+Comment[fi]=Käytä internetiä
+Comment[fil]=I-access ang Internet
+Comment[fr]=Accéder à Internet
+Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
+Comment[he]=גישה אל האינטרנט
+Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
+Comment[hr]=Pristup Internetu
+Comment[hu]=Internetelérés
+Comment[id]=Akses Internet
+Comment[it]=Accesso a Internet
+Comment[ja]=インターネットにアクセス
+Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
+Comment[ko]=인터넷 연결
+Comment[lt]=Interneto prieiga
+Comment[lv]=Piekļūt internetam
+Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
+Comment[mr]=इंटरनेटमध्ये प्रवेश करा
+Comment[nb]=Gå til Internett
+Comment[nl]=Verbinding maken met internet
+Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
+Comment[pl]=Skorzystaj z internetu
+Comment[pt]=Aceder à Internet
+Comment[pt_BR]=Acessar a internet
+Comment[ro]=Accesaţi Internetul
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prístup do siete Internet
+Comment[sl]=Dostop do interneta
+Comment[sr]=Приступите Интернету
+Comment[sv]=Gå ut på Internet
+Comment[ta]=இணையத்தை அணுகுதல்
+Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
+Comment[th]=เข้าถึงอินเทอร์เน็ต
+Comment[tr]=İnternet'e erişin
+Comment[uk]=Доступ до Інтернету
+Comment[vi]=Truy cập Internet
+Comment[zh_CN]=访问互联网
+Comment[zh_HK]=連線到網際網路
+Comment[zh_TW]=連線到網際網路
+Exec=chromium %U
+Terminal=false
+Icon=chromium
+Type=Application
+Categories=GTK;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;

Copied: chromium/repos/staging-x86_64/chromium.install (from rev 146882, chromium/trunk/chromium.install)
===================================================================
--- staging-x86_64/chromium.install	                        (rev 0)
+++ staging-x86_64/chromium.install	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: chromium/repos/staging-x86_64/chromium.sh (from rev 146882, chromium/trunk/chromium.sh)
===================================================================
--- staging-x86_64/chromium.sh	                        (rev 0)
+++ staging-x86_64/chromium.sh	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,4 @@
+#!/bin/sh
+export CHROME_WRAPPER=/usr/lib/chromium/chromium
+export CHROME_DESKTOP=chromium.desktop
+exec /usr/lib/chromium/chromium "$@"

Copied: chromium/repos/staging-x86_64/fix-downloads-on-ntfs.patch (from rev 146882, chromium/trunk/fix-downloads-on-ntfs.patch)
===================================================================
--- staging-x86_64/fix-downloads-on-ntfs.patch	                        (rev 0)
+++ staging-x86_64/fix-downloads-on-ntfs.patch	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,26 @@
+--- trunk/src/content/browser/download/base_file.cc	2011/11/03 00:57:14	108379
++++ trunk/src/content/browser/download/base_file.cc	2011/11/03 00:57:22	108380
+@@ -332,16 +332,19 @@
+     int stat_error = stat(new_path.value().c_str(), &st);
+     bool stat_succeeded = (stat_error == 0);
+     if (!stat_succeeded)
+-      return LOG_ERROR("stat", net::MapSystemError(errno));
++      LOG_ERROR("stat", net::MapSystemError(errno));
+ 
+     // TODO(estade): Move() falls back to copying and deleting when a simple
+     // rename fails. Copying sucks for large downloads. crbug.com/8737
+     if (!file_util::Move(full_path_, new_path))
+       return LOG_ERROR("Move", net::MapSystemError(errno));
+ 
+-    int chmod_error = chmod(new_path.value().c_str(), st.st_mode);
+-    if (chmod_error < 0)
+-      return LOG_ERROR("chmod", net::MapSystemError(errno));
++    if (stat_succeeded) {
++      // On Windows file systems (FAT, NTFS), chmod fails.  This is OK.
++      int chmod_error = chmod(new_path.value().c_str(), st.st_mode);
++      if (chmod_error < 0)
++        LOG_ERROR("chmod", net::MapSystemError(errno));
++    }
+   }
+ #endif
+ 

Copied: chromium/repos/staging-x86_64/gcc-4.6.patch (from rev 146882, chromium/trunk/gcc-4.6.patch)
===================================================================
--- staging-x86_64/gcc-4.6.patch	                        (rev 0)
+++ staging-x86_64/gcc-4.6.patch	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,99 @@
+diff -u -r chrome/browser/search_engines/template_url_prepopulate_data.h chrome/browser/search_engines/template_url_prepopulate_data.h
+--- chrome/browser/search_engines/template_url_prepopulate_data.h	2011-04-13 13:23:41.000000000 +0400
++++ chrome/browser/search_engines/template_url_prepopulate_data.h	2011-04-20 19:32:58.000000000 +0400
+@@ -7,6 +7,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class GURL;
+ class PrefService;
+diff -u -r gpu/command_buffer/common/types.h gpu/command_buffer/common/types.h
+--- gpu/command_buffer/common/types.h	2011-04-13 13:22:57.000000000 +0400
++++ gpu/command_buffer/common/types.h	2011-04-20 19:32:58.000000000 +0400
+@@ -11,6 +11,7 @@
+ #include <stdint.h>
+ #endif
+ #include <string>
++#include <cstddef>
+ 
+ typedef signed char         schar;
+ typedef signed char         int8;
+diff -u -r ppapi/cpp/paint_aggregator.h ppapi/cpp/paint_aggregator.h
+--- ppapi/cpp/paint_aggregator.h	2011-04-13 13:22:58.000000000 +0400
++++ ppapi/cpp/paint_aggregator.h	2011-04-20 20:11:44.000000000 +0400
+@@ -9,6 +9,7 @@
+ 
+ #include "ppapi/cpp/point.h"
+ #include "ppapi/cpp/rect.h"
++#include <cstddef>
+ 
+ namespace pp {
+ 
+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
+@@ -5,6 +5,7 @@
+ #include "os2.h"
+ 
+ #include "head.h"
++#include <cstddef>
+ 
+ // OS/2 - OS/2 and Windows Metrics
+ // http://www.microsoft.com/opentype/otspec/os2.htm
+diff -u -r third_party/tcmalloc/chromium/src/base/stl_allocator.h third_party/tcmalloc/chromium/src/base/stl_allocator.h
+--- third_party/tcmalloc/chromium/src/base/stl_allocator.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/base/stl_allocator.h	2011-04-20 19:32:58.000000000 +0400
+@@ -38,6 +38,7 @@
+ #include <config.h>
+ 
+ #include <limits>
++#include <cstddef>
+ 
+ #include "base/basictypes.h"
+ #include "base/logging.h"
+diff -u -r third_party/tcmalloc/chromium/src/base/vdso_support.h third_party/tcmalloc/chromium/src/base/vdso_support.h
+--- third_party/tcmalloc/chromium/src/base/vdso_support.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/base/vdso_support.h	2011-04-20 19:32:58.000000000 +0400
+@@ -37,6 +37,7 @@
+ 
+ #define HAVE_VDSO_SUPPORT 1
+ 
++#include <cstddef>
+ #include <stdlib.h>     // for NULL
+ #include <link.h>  // for ElfW
+ #include "base/basictypes.h"
+diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chromium/src/common.cc
+--- third_party/tcmalloc/chromium/src/common.cc	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/common.cc	2011-04-20 19:32:58.000000000 +0400
+@@ -34,6 +34,7 @@
+ #include "config.h"
+ #include "common.h"
+ #include "system-alloc.h"
++#include <cstddef>
+ 
+ namespace tcmalloc {
+ 
+diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/chromium/src/symbolize.h
+--- third_party/tcmalloc/chromium/src/symbolize.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/symbolize.h	2011-04-20 19:32:58.000000000 +0400
+@@ -38,6 +38,7 @@
+ #include <stdint.h>  // for uintptr_t
+ #endif
+ #include <map>
++#include <cstddef>
+ 
+ using std::map;
+ 
+diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h
+--- ui/gfx/codec/jpeg_codec.h	2011-04-13 13:23:45.000000000 +0400
++++ ui/gfx/codec/jpeg_codec.h	2011-04-20 19:32:58.000000000 +0400
+@@ -7,6 +7,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class SkBitmap;
+ 

Copied: chromium/repos/staging-x86_64/nacl-cflags-remove-fstack-protector.patch (from rev 146882, chromium/trunk/nacl-cflags-remove-fstack-protector.patch)
===================================================================
--- staging-x86_64/nacl-cflags-remove-fstack-protector.patch	                        (rev 0)
+++ staging-x86_64/nacl-cflags-remove-fstack-protector.patch	2012-01-19 03:24:07 UTC (rev 146883)
@@ -0,0 +1,11 @@
+--- src/chromium-16.0.912.63/chrome/nacl.gypi.orig	2011-12-28 19:10:42.000000000 +0200
++++ src/chromium-16.0.912.63/chrome/nacl.gypi	2011-12-28 19:11:09.000000000 +0200
+@@ -275,6 +275,8 @@
+               'cflags!': [
+                 '-fasan',
+                 '-w',
++                '-fstack-protector',
++                '-fstack-protector-all',
+               ],
+               'conditions': [
+                 ['clang==1', {


