Gentoo Archives: gentoo-commits

From: Donnie Berkholz <dberkholz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/dberkholz:master commit in: www-client/chromium/files/
Date: Tue, 31 May 2011 02:41:04
Message-Id: 7a0405e77257d021e90ccda892427e62db75f864.dberkholz@gentoo
1 commit: 7a0405e77257d021e90ccda892427e62db75f864
2 Author: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 31 02:40:36 2011 +0000
4 Commit: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org>
5 CommitDate: Tue May 31 02:40:36 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dberkholz.git;a=commit;h=7a0405e7
7
8 chromium: pull in missing files from main tree.
9
10 ---
11 www-client/chromium/files/chromium-launcher-r2.sh | 32 +++++++++++++++++++++
12 www-client/chromium/files/chromium.default | 5 +++
13 2 files changed, 37 insertions(+), 0 deletions(-)
14
15 diff --git a/www-client/chromium/files/chromium-launcher-r2.sh b/www-client/chromium/files/chromium-launcher-r2.sh
16 new file mode 100644
17 index 0000000..e20bcea
18 --- /dev/null
19 +++ b/www-client/chromium/files/chromium-launcher-r2.sh
20 @@ -0,0 +1,32 @@
21 +#!/bin/bash
22 +
23 +# Allow the user to override command-line flags, bug #357629.
24 +# This is based on Debian's chromium-browser package, and is intended
25 +# to be consistent with Debian.
26 +if [ -f /etc/chromium/default ] ; then
27 + . /etc/chromium/default
28 +fi
29 +
30 +# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
31 +# default CHROMIUM_FLAGS (from /etc/chromium/default).
32 +CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
33 +
34 +# Let the wrapped binary know that it has been run through the wrapper
35 +export CHROME_WRAPPER="`readlink -f "$0"`"
36 +
37 +PROGDIR="`dirname "$CHROME_WRAPPER"`"
38 +
39 +case ":$PATH:" in
40 + *:$PROGDIR:*)
41 + # $PATH already contains $PROGDIR
42 + ;;
43 + *)
44 + # Append $PROGDIR to $PATH
45 + export PATH="$PATH:$PROGDIR"
46 + ;;
47 +esac
48 +
49 +# Set the .desktop file name
50 +export CHROME_DESKTOP="chromium-browser-chromium.desktop"
51 +
52 +exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
53
54 diff --git a/www-client/chromium/files/chromium.default b/www-client/chromium/files/chromium.default
55 new file mode 100644
56 index 0000000..45f1f38
57 --- /dev/null
58 +++ b/www-client/chromium/files/chromium.default
59 @@ -0,0 +1,5 @@
60 +# Default settings for chromium. This file is sourced by /bin/bash from
61 +# the chromium launcher.
62 +
63 +# Options to pass to chromium.
64 +CHROMIUM_FLAGS=""