[arch-commits] Commit in chromium/repos (16 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Jan 9 21:11:34 UTC 2013
Date: Wednesday, January 9, 2013 @ 16:11:33
Author: foutrelis
Revision: 174987
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
chromium/repos/testing-i686/
chromium/repos/testing-i686/PKGBUILD
(from rev 174986, chromium/trunk/PKGBUILD)
chromium/repos/testing-i686/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
(from rev 174986, chromium/trunk/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch)
chromium/repos/testing-i686/chromium-ppapi-r0.patch
(from rev 174986, chromium/trunk/chromium-ppapi-r0.patch)
chromium/repos/testing-i686/chromium.default
(from rev 174986, chromium/trunk/chromium.default)
chromium/repos/testing-i686/chromium.desktop
(from rev 174986, chromium/trunk/chromium.desktop)
chromium/repos/testing-i686/chromium.install
(from rev 174986, chromium/trunk/chromium.install)
chromium/repos/testing-i686/chromium.sh
(from rev 174986, chromium/trunk/chromium.sh)
chromium/repos/testing-x86_64/
chromium/repos/testing-x86_64/PKGBUILD
(from rev 174986, chromium/trunk/PKGBUILD)
chromium/repos/testing-x86_64/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
(from rev 174986, chromium/trunk/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch)
chromium/repos/testing-x86_64/chromium-ppapi-r0.patch
(from rev 174986, chromium/trunk/chromium-ppapi-r0.patch)
chromium/repos/testing-x86_64/chromium.default
(from rev 174986, chromium/trunk/chromium.default)
chromium/repos/testing-x86_64/chromium.desktop
(from rev 174986, chromium/trunk/chromium.desktop)
chromium/repos/testing-x86_64/chromium.install
(from rev 174986, chromium/trunk/chromium.install)
chromium/repos/testing-x86_64/chromium.sh
(from rev 174986, chromium/trunk/chromium.sh)
--------------------------------------------------------------------+
testing-i686/PKGBUILD | 149 ++++++++++
testing-i686/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch | 35 ++
testing-i686/chromium-ppapi-r0.patch | 11
testing-i686/chromium.default | 4
testing-i686/chromium.desktop | 113 +++++++
testing-i686/chromium.install | 12
testing-i686/chromium.sh | 16 +
testing-x86_64/PKGBUILD | 149 ++++++++++
testing-x86_64/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch | 35 ++
testing-x86_64/chromium-ppapi-r0.patch | 11
testing-x86_64/chromium.default | 4
testing-x86_64/chromium.desktop | 113 +++++++
testing-x86_64/chromium.install | 12
testing-x86_64/chromium.sh | 16 +
14 files changed, 680 insertions(+)
Copied: chromium/repos/testing-i686/PKGBUILD (from rev 174986, chromium/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-01-09 21:11:33 UTC (rev 174987)
@@ -0,0 +1,149 @@
+# $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>
+
+pkgname=chromium
+pkgver=23.0.1271.97
+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' 'subversion' 'nacl-toolchain-newlib')
+optdepends=('kdebase-kdialog: needed for file dialogs in KDE')
+backup=('etc/chromium/default')
+install=chromium.install
+source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2
+ chromium.desktop
+ chromium.default
+ chromium.sh
+ chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
+ chromium-ppapi-r0.patch)
+sha256sums=('37ba1289b7066c3206d9b8f51c0a6acde0f3f5550e716a61af32485d8d0dc2e1'
+ '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
+ '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
+ '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
+ 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615'
+ '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd')
+
+# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+# Note: These are for Arch Linux use ONLY. For your own distribution, please
+# get your own set of keys.
+_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
+_google_default_client_id=413772536636.apps.googleusercontent.com
+_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
+
+build() {
+ cd "$srcdir/chromium-$pkgver"
+
+ # Fix build with glibc 2.16
+ patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch"
+
+ # Fix build without NaCl glibc toolchain (patch from Gentoo)
+ patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch"
+
+ # http://code.google.com/p/chromium/issues/detail?id=109527
+ sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
+
+ # Missing gyp files in tarball (http://crbug.com/144823)
+ sed -i '/nacl_test_data\.gyp/d' chrome/chrome_tests.gypi
+
+ # 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"
+
+ # Prepare NaCL toolchain
+ mkdir -p sdk native_client/toolchain/.tars
+ cp -a /usr/lib/nacl-toolchain-newlib sdk/nacl-sdk
+ tar czf native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk
+ rm -r sdk
+
+ # CFLAGS are passed through release_extra_cflags below
+ export -n CFLAGS CXXFLAGS
+
+ # Silence "identifier 'nullptr' is a keyword in C++11" warnings
+ CFLAGS+=' -Wno-c++0x-compat'
+
+ build/gyp_chromium --depth=. \
+ -Dgoogle_api_key=$_google_api_key \
+ -Dgoogle_default_client_id=$_google_default_client_id \
+ -Dgoogle_default_client_secret=$_google_default_client_secret \
+ -Dwerror= \
+ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+ -Dlinux_strip_binary=1 \
+ -Dlinux_use_gold_binary=0 \
+ -Dlinux_use_gold_flags=0 \
+ -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=0 \
+ -Duse_gconf=0 \
+ -Ddisable_glibc=1 \
+ -Ddisable_pnacl=1 \
+ -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/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \
+ out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
+ "$pkgdir/usr/lib/chromium/"
+
+ if [[ $CARCH == i686 ]]; then
+ rm "$pkgdir/usr/lib/chromium/nacl_irt_x86_64.nexe"
+ fi
+
+ # 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/"
+
+ 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 22 24 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
+
+ for size in 16 32; do
+ install -Dm644 "chrome/app/theme/default_100_percent/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/testing-i686/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch (from rev 174986, chromium/trunk/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch)
===================================================================
--- testing-i686/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch (rev 0)
+++ testing-i686/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch 2013-01-09 21:11:33 UTC (rev 174987)
@@ -0,0 +1,35 @@
+diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
+--- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300
++++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300
+@@ -243,14 +243,13 @@ struct kernel_rusage {
+ long ru_nivcsw;
+ };
+
+-struct siginfo;
+ #if defined(__i386__) || defined(__arm__) || defined(__PPC__)
+
+ /* include/asm-{arm,i386,mips,ppc}/signal.h */
+ struct kernel_old_sigaction {
+ union {
+ void (*sa_handler_)(int);
+- void (*sa_sigaction_)(int, struct siginfo *, void *);
++ void (*sa_sigaction_)(int, siginfo_t *, void *);
+ };
+ unsigned long sa_mask;
+ unsigned long sa_flags;
+@@ -287,13 +286,13 @@ struct kernel_sigaction {
+ unsigned long sa_flags;
+ union {
+ void (*sa_handler_)(int);
+- void (*sa_sigaction_)(int, struct siginfo *, void *);
++ void (*sa_sigaction_)(int, siginfo_t *, void *);
+ };
+ struct kernel_sigset_t sa_mask;
+ #else
+ union {
+ void (*sa_handler_)(int);
+- void (*sa_sigaction_)(int, struct siginfo *, void *);
++ void (*sa_sigaction_)(int, siginfo_t *, void *);
+ };
+ unsigned long sa_flags;
+ void (*sa_restorer)(void);
Copied: chromium/repos/testing-i686/chromium-ppapi-r0.patch (from rev 174986, chromium/trunk/chromium-ppapi-r0.patch)
===================================================================
--- testing-i686/chromium-ppapi-r0.patch (rev 0)
+++ testing-i686/chromium-ppapi-r0.patch 2013-01-09 21:11:33 UTC (rev 174987)
@@ -0,0 +1,11 @@
+--- ppapi/ppapi_untrusted.gyp.orig 2012-06-12 10:20:16.000000000 +0200
++++ ppapi/ppapi_untrusted.gyp 2012-06-12 10:20:52.000000000 +0200
+@@ -80,7 +80,7 @@
+ ],
+ },
+ 'conditions': [
+- ['target_arch!="arm"', {
++ ['target_arch!="arm" and disable_glibc==0', {
+ 'variables': {
+ 'build_glibc': 1,
+ # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
Copied: chromium/repos/testing-i686/chromium.default (from rev 174986, chromium/trunk/chromium.default)
===================================================================
--- testing-i686/chromium.default (rev 0)
+++ testing-i686/chromium.default 2013-01-09 21:11:33 UTC (rev 174987)
@@ -0,0 +1,4 @@
+# Default settings for chromium. This file is sourced by /usr/bin/chromium
+
+# Options to pass to chromium
+CHROMIUM_FLAGS=""
Copied: chromium/repos/testing-i686/chromium.desktop (from rev 174986, chromium/trunk/chromium.desktop)
===================================================================
--- testing-i686/chromium.desktop (rev 0)
+++ testing-i686/chromium.desktop 2013-01-09 21:11:33 UTC (rev 174987)
@@ -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/testing-i686/chromium.install (from rev 174986, chromium/trunk/chromium.install)
===================================================================
--- testing-i686/chromium.install (rev 0)
+++ testing-i686/chromium.install 2013-01-09 21:11:33 UTC (rev 174987)
@@ -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/testing-i686/chromium.sh (from rev 174986, chromium/trunk/chromium.sh)
===================================================================
--- testing-i686/chromium.sh (rev 0)
+++ testing-i686/chromium.sh 2013-01-09 21:11:33 UTC (rev 174987)
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Allow users to override command-line options
+# Based on Gentoo's chromium package (and by extension, Debian's)
+if [[ -f /etc/chromium/default ]]; then
+ . /etc/chromium/default
+fi
+
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
+# default CHROMIUM_FLAGS (from /etc/chromium/default)
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-$CHROMIUM_FLAGS}
+
+export CHROME_WRAPPER=$(readlink -f "$0")
+export CHROME_DESKTOP=chromium.desktop
+
+exec /usr/lib/chromium/chromium $CHROMIUM_FLAGS "$@"
Copied: chromium/repos/testing-x86_64/PKGBUILD (from rev 174986, chromium/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-01-09 21:11:33 UTC (rev 174987)
@@ -0,0 +1,149 @@
+# $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>
+
+pkgname=chromium
+pkgver=23.0.1271.97
+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' 'subversion' 'nacl-toolchain-newlib')
+optdepends=('kdebase-kdialog: needed for file dialogs in KDE')
+backup=('etc/chromium/default')
+install=chromium.install
+source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2
+ chromium.desktop
+ chromium.default
+ chromium.sh
+ chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
+ chromium-ppapi-r0.patch)
+sha256sums=('37ba1289b7066c3206d9b8f51c0a6acde0f3f5550e716a61af32485d8d0dc2e1'
+ '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
+ '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
+ '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
+ 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615'
+ '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd')
+
+# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+# Note: These are for Arch Linux use ONLY. For your own distribution, please
+# get your own set of keys.
+_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
+_google_default_client_id=413772536636.apps.googleusercontent.com
+_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
+
+build() {
+ cd "$srcdir/chromium-$pkgver"
+
+ # Fix build with glibc 2.16
+ patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch"
+
+ # Fix build without NaCl glibc toolchain (patch from Gentoo)
+ patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch"
+
+ # http://code.google.com/p/chromium/issues/detail?id=109527
+ sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
+
+ # Missing gyp files in tarball (http://crbug.com/144823)
+ sed -i '/nacl_test_data\.gyp/d' chrome/chrome_tests.gypi
+
+ # 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"
+
+ # Prepare NaCL toolchain
+ mkdir -p sdk native_client/toolchain/.tars
+ cp -a /usr/lib/nacl-toolchain-newlib sdk/nacl-sdk
+ tar czf native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk
+ rm -r sdk
+
+ # CFLAGS are passed through release_extra_cflags below
+ export -n CFLAGS CXXFLAGS
+
+ # Silence "identifier 'nullptr' is a keyword in C++11" warnings
+ CFLAGS+=' -Wno-c++0x-compat'
+
+ build/gyp_chromium --depth=. \
+ -Dgoogle_api_key=$_google_api_key \
+ -Dgoogle_default_client_id=$_google_default_client_id \
+ -Dgoogle_default_client_secret=$_google_default_client_secret \
+ -Dwerror= \
+ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+ -Dlinux_strip_binary=1 \
+ -Dlinux_use_gold_binary=0 \
+ -Dlinux_use_gold_flags=0 \
+ -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=0 \
+ -Duse_gconf=0 \
+ -Ddisable_glibc=1 \
+ -Ddisable_pnacl=1 \
+ -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/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \
+ out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
+ "$pkgdir/usr/lib/chromium/"
+
+ if [[ $CARCH == i686 ]]; then
+ rm "$pkgdir/usr/lib/chromium/nacl_irt_x86_64.nexe"
+ fi
+
+ # 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/"
+
+ 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 22 24 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
+
+ for size in 16 32; do
+ install -Dm644 "chrome/app/theme/default_100_percent/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/testing-x86_64/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch (from rev 174986, chromium/trunk/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch)
===================================================================
--- testing-x86_64/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch (rev 0)
+++ testing-x86_64/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch 2013-01-09 21:11:33 UTC (rev 174987)
@@ -0,0 +1,35 @@
+diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
+--- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300
++++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300
+@@ -243,14 +243,13 @@ struct kernel_rusage {
+ long ru_nivcsw;
+ };
+
+-struct siginfo;
+ #if defined(__i386__) || defined(__arm__) || defined(__PPC__)
+
+ /* include/asm-{arm,i386,mips,ppc}/signal.h */
+ struct kernel_old_sigaction {
+ union {
+ void (*sa_handler_)(int);
+- void (*sa_sigaction_)(int, struct siginfo *, void *);
++ void (*sa_sigaction_)(int, siginfo_t *, void *);
+ };
+ unsigned long sa_mask;
+ unsigned long sa_flags;
+@@ -287,13 +286,13 @@ struct kernel_sigaction {
+ unsigned long sa_flags;
+ union {
+ void (*sa_handler_)(int);
+- void (*sa_sigaction_)(int, struct siginfo *, void *);
++ void (*sa_sigaction_)(int, siginfo_t *, void *);
+ };
+ struct kernel_sigset_t sa_mask;
+ #else
+ union {
+ void (*sa_handler_)(int);
+- void (*sa_sigaction_)(int, struct siginfo *, void *);
++ void (*sa_sigaction_)(int, siginfo_t *, void *);
+ };
+ unsigned long sa_flags;
+ void (*sa_restorer)(void);
Copied: chromium/repos/testing-x86_64/chromium-ppapi-r0.patch (from rev 174986, chromium/trunk/chromium-ppapi-r0.patch)
===================================================================
--- testing-x86_64/chromium-ppapi-r0.patch (rev 0)
+++ testing-x86_64/chromium-ppapi-r0.patch 2013-01-09 21:11:33 UTC (rev 174987)
@@ -0,0 +1,11 @@
+--- ppapi/ppapi_untrusted.gyp.orig 2012-06-12 10:20:16.000000000 +0200
++++ ppapi/ppapi_untrusted.gyp 2012-06-12 10:20:52.000000000 +0200
+@@ -80,7 +80,7 @@
+ ],
+ },
+ 'conditions': [
+- ['target_arch!="arm"', {
++ ['target_arch!="arm" and disable_glibc==0', {
+ 'variables': {
+ 'build_glibc': 1,
+ # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
Copied: chromium/repos/testing-x86_64/chromium.default (from rev 174986, chromium/trunk/chromium.default)
===================================================================
--- testing-x86_64/chromium.default (rev 0)
+++ testing-x86_64/chromium.default 2013-01-09 21:11:33 UTC (rev 174987)
@@ -0,0 +1,4 @@
+# Default settings for chromium. This file is sourced by /usr/bin/chromium
+
+# Options to pass to chromium
+CHROMIUM_FLAGS=""
Copied: chromium/repos/testing-x86_64/chromium.desktop (from rev 174986, chromium/trunk/chromium.desktop)
===================================================================
--- testing-x86_64/chromium.desktop (rev 0)
+++ testing-x86_64/chromium.desktop 2013-01-09 21:11:33 UTC (rev 174987)
@@ -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/testing-x86_64/chromium.install (from rev 174986, chromium/trunk/chromium.install)
===================================================================
--- testing-x86_64/chromium.install (rev 0)
+++ testing-x86_64/chromium.install 2013-01-09 21:11:33 UTC (rev 174987)
@@ -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/testing-x86_64/chromium.sh (from rev 174986, chromium/trunk/chromium.sh)
===================================================================
--- testing-x86_64/chromium.sh (rev 0)
+++ testing-x86_64/chromium.sh 2013-01-09 21:11:33 UTC (rev 174987)
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Allow users to override command-line options
+# Based on Gentoo's chromium package (and by extension, Debian's)
+if [[ -f /etc/chromium/default ]]; then
+ . /etc/chromium/default
+fi
+
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
+# default CHROMIUM_FLAGS (from /etc/chromium/default)
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-$CHROMIUM_FLAGS}
+
+export CHROME_WRAPPER=$(readlink -f "$0")
+export CHROME_DESKTOP=chromium.desktop
+
+exec /usr/lib/chromium/chromium $CHROMIUM_FLAGS "$@"
More information about the arch-commits
mailing list