- add way to setup runtime flag options globally (similar to gentoo/debian)

Changed files:
    chromium-browser.default -> 1.1
    chromium-browser.sh -> 1.10
    chromium-browser.spec -> 1.198

diff --git a/chromium-browser.default b/chromium-browser.default
new file mode 100644 (file)
index 0000000..453aa69
--- /dev/null
+++ b/chromium-browser.default
@@ -0,0 +1,5 @@
+# Default settings for Chromium Browser.
+# This file is sourced by /bin/sh from the chromium-browser launcher.
+
+# Options to pass to Chromium Browser
+CHROMIUM_FLAGS=""

diff --git a/chromium-browser.sh b/chromium-browser.sh
index 5cbddc0f1d9b01f60f0fa80532342145fea10fbf..60c46a01590e61b10690e5723e0049e7509522d9 100644 (file)
--- a/chromium-browser.sh
+++ b/chromium-browser.sh
@@ -1,8 +1,11 @@
 #!/bin/sh
 
-# Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Allow the user to override command-line flags, http://bugs.gentoo.org/357629
+# This is based on Debian's chromium-browser package, and is intended
+# to be consistent with Debian.
+if [ -f /etc/chromium-browser/default ] ; then
+       . /etc/chromium-browser/default
+fi
 
 # Always use our ffmpeg libs.
 export LD_LIBRARY_PATH=@libdir@${LD_LIBRARY_PATH:+:"$LD_LIBRARY_PATH"}
@@ -34,11 +37,15 @@ export CHROME_WRAPPER="$(readlink -f "$0")"
 CHROME_FLAGS_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/chromium/Chrome Flags"
 if [ -f "$CHROME_FLAGS_FILE" ]; then
        # All lines starting with # are ignored
-       CHROME_FLAGS=$(grep -v '^#' "$CHROME_FLAGS_FILE")
+       CHROMIUM_USER_FLAGS=$(grep -v '^#' "$CHROME_FLAGS_FILE")
 fi
 
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
+# default CHROMIUM_FLAGS (from /etc/chromium-browser/default).
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
+
 # Google guys cannot properly handle comma, so download speed/est is shown
 # as not a number (NaN). Workaround that with LC_NUMERIC=C
 export LC_NUMERIC=C
 
-exec @libdir@/chromium-browser $CHROME_FLAGS "$@"
+exec @libdir@/chromium-browser $CHROMIUM_FLAGS "$@"

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 1a55e6e175a1220c25adcca31072aa7a64409084..aeac61cf003bf9ea6565fd0b094325a6febc9265 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -57,6 +57,7 @@ License:      BSD, LGPL v2+ (ffmpeg)
 Group:         X11/Applications/Networking
 Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz
 # Source0-md5: 6119a345de59252ba219f8b2ed9d71a4
+Source1:       %{name}.default
 Source2:       %{name}.sh
 Source3:       %{name}.desktop
 Source5:       find-lang.sh
@@ -289,9 +290,10 @@ test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp \
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/{themes,plugins,extensions} \
-       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir}}
+       $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/%{name},%{_mandir}/man1,%{_desktopdir}}
 
 cd src/out/%{!?debug:Release}%{?debug:Debug}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
 %{__sed} -i -e 's,@libdir@,%{_libdir}/%{name},' $RPM_BUILD_ROOT%{_bindir}/%{name}
 cp -a *.pak locales resources $RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -357,6 +359,8 @@ fi
 %defattr(644,root,root,755)
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
 %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/default
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 %{_desktopdir}/*.desktop