[arch-commits] Commit in chromium/trunk (PKGBUILD chromium.default chromium.sh)

[Evangelos Foutras]

    Date: Thursday, May 24, 2012 @ 03:55:40
  Author: foutrelis
Revision: 159424

upgpkg: chromium 19.0.1084.52-1

New upstream release. Implement FS#29955: Add support for global browser settings.

Added:
  chromium/trunk/chromium.default
Modified:
  chromium/trunk/PKGBUILD
  chromium/trunk/chromium.sh

------------------+
 PKGBUILD         |   16 +++++++++++-----
 chromium.default |    4 ++++
 chromium.sh      |   18 +++++++++++++++---
 3 files changed, 30 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-24 07:53:43 UTC (rev 159423)
+++ PKGBUILD	2012-05-24 07:55:40 UTC (rev 159424)
@@ -9,8 +9,8 @@
 # build time.
 
 pkgname=chromium
-pkgver=19.0.1084.46
-pkgrel=2
+pkgver=19.0.1084.52
+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/"
@@ -25,17 +25,20 @@
 [[ $CARCH == x86_64 ]] && makedepends+=('lib32-zlib')
 provides=('chromium-browser')
 conflicts=('chromium-browser')
+backup=('etc/chromium/default')
 install=chromium.install
 source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2
         naclsdk_linux-$pkgver.tar.bz2::http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/$pkgver/naclsdk_linux.bz2
         chromium.desktop
+        chromium.default
         chromium.sh
         chromium-gcc47.patch
         sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch)
-sha256sums=('2fb77e5d155343a828bd04b6b9d4469fce3033dc6b9f8b53e34a9d02c464639f'
-            '2256327dc58792309911fe88996527925b79ddc7729ec78548b4adf5e4983d42'
+sha256sums=('e725d4aa7608c9975b8989188d85d38846956db2f480a1a217bcab06419dab72'
+            'c9984d27b2ac80abd194199090cdb1803f0aab22b6b65518e2dcbd9136b70ee8'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
-            'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
+            '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
+            '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
             'f607347ba8477d3c8e60eb3803d26f3c9869f77fd49986c60887c59a6aa7d30d'
             'a700aa054800d1b21d84eaba27c38a703dfa023e9226d11a942690c2a0630aff')
 
@@ -119,6 +122,9 @@
   #ln -s /usr/lib/libavformat.so.52 "$pkgdir/usr/lib/chromium/"
   #ln -s /usr/lib/libavutil.so.50 "$pkgdir/usr/lib/chromium/"
 
+  # Allow users to override command-line options
+  install -Dm644 "$srcdir/chromium.default" "$pkgdir/etc/chromium/default"
+
   cp -a out/Release/locales out/Release/resources "$pkgdir/usr/lib/chromium/"
 
   find "$pkgdir/usr/lib/chromium/" -name '*.d' -type f -delete

Added: chromium.default
===================================================================
--- chromium.default	                        (rev 0)
+++ chromium.default	2012-05-24 07:55:40 UTC (rev 159424)
@@ -0,0 +1,4 @@
+# Default settings for chromium. This file is sourced by /usr/bin/chromium
+
+# Options to pass to chromium
+CHROMIUM_FLAGS=""

Modified: chromium.sh
===================================================================
--- chromium.sh	2012-05-24 07:53:43 UTC (rev 159423)
+++ chromium.sh	2012-05-24 07:55:40 UTC (rev 159424)
@@ -1,4 +1,16 @@
-#!/bin/sh
-export CHROME_WRAPPER=/usr/lib/chromium/chromium
+#!/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 "$@"
+
+exec /usr/lib/chromium/chromium $CHROMIUM_FLAGS "$@"