Author: glen Date: Sun May 20 17:53:55 2012 GMT Module: packages Tag: HEAD ---- Log message: - add way to setup runtime flag options globally (similar to gentoo/debian)
---- Files affected: packages/chromium-browser: chromium-browser.sh (1.9 -> 1.10) , chromium-browser.spec (1.197 -> 1.198) , chromium-browser.default (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.sh diff -u packages/chromium-browser/chromium-browser.sh:1.9 packages/chromium-browser/chromium-browser.sh:1.10 --- packages/chromium-browser/chromium-browser.sh:1.9 Sun Jan 15 22:21:39 2012 +++ packages/chromium-browser/chromium-browser.sh Sun May 20 19:53:49 2012 @@ -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 @@ 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 "$@" ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.197 packages/chromium-browser/chromium-browser.spec:1.198 --- packages/chromium-browser/chromium-browser.spec:1.197 Sun May 20 14:23:07 2012 +++ packages/chromium-browser/chromium-browser.spec Sun May 20 19:53:49 2012 @@ -58,6 +58,7 @@ 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 @@ -290,9 +291,10 @@ %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} @@ -358,6 +360,8 @@ %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 @@ -398,6 +402,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.198 2012/05/20 17:53:49 glen +- add way to setup runtime flag options globally (similar to gentoo/debian) + Revision 1.197 2012/05/20 12:23:07 glen - Disable tcmalloc, it causes problems with e.g. NVIDIA drivers, http://bugs.gentoo.org/413637 ================================================================ Index: packages/chromium-browser/chromium-browser.default diff -u /dev/null packages/chromium-browser/chromium-browser.default:1.1 --- /dev/null Sun May 20 19:53:55 2012 +++ packages/chromium-browser/chromium-browser.default Sun May 20 19:53:49 2012 @@ -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="" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/chromium-browser/chromium-browser.sh?r1=1.9&r2=1.10 http://cvs.pld-linux.org/packages/chromium-browser/chromium-browser.spec?r1=1.197&r2=1.198 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
