aboutsummaryrefslogtreecommitdiff
path: root/network/chromium
diff options
context:
space:
mode:
authorFrancisco Ambrozio <sbo@franciscoambrozio.com>2016-01-21 23:35:35 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-26 18:59:17 +0700
commit314148fbb844272615af8077b3cf5b9c9b49f6cf (patch)
treec5d6f2dc10e176441e9a885fc74f150945cf9c5c /network/chromium
parenta4c5e089d28c388d0f7464f407187767edcb86e2 (diff)
network/chromium: Updated for version 48.0.2564.82.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network/chromium')
-rw-r--r--network/chromium/README5
-rw-r--r--network/chromium/chromium.SlackBuild182
-rw-r--r--network/chromium/chromium.default5
-rw-r--r--network/chromium/chromium.desktop136
-rw-r--r--network/chromium/chromium.info8
-rw-r--r--network/chromium/chromium.sh16
-rw-r--r--network/chromium/doinst.sh32
-rw-r--r--network/chromium/slack-desc10
8 files changed, 262 insertions, 132 deletions
diff --git a/network/chromium/README b/network/chromium/README
index 4d9741b273223..79e14e9d5b854 100644
--- a/network/chromium/README
+++ b/network/chromium/README
@@ -1,5 +1,6 @@
-Google Chromium is a browser that combines a minimal design with
-sophisticated technology to make the web faster, safer, and easier.
+Chromium is an open-source browser project that aims to build
+a safer, faster, and more stable way for all users to experience
+the web.
The Google API keys provided in the SlackBuild are for this build
use ONLY. If you intend to use this build script for your own
diff --git a/network/chromium/chromium.SlackBuild b/network/chromium/chromium.SlackBuild
index 2954e62a639c9..6121cb5cbb9c8 100644
--- a/network/chromium/chromium.SlackBuild
+++ b/network/chromium/chromium.SlackBuild
@@ -1,9 +1,9 @@
#!/bin/sh
-# Slackware build script for Google Chromium
+# Slackware build script for Chromium Web Browser
#
-# Copyright 2010 Yucatan "Kenjiro" Costa, Alegrete, RS, Brasil
-# Copyright 2013 Francisco Ambrozio <sbo@franciscoambrozio.com>
+# Copyright 2010 Yucatan "Kenjiro" Costa, Alegrete, RS, Brasil
+# Copyright 2013,2016 Francisco Ambrozio <sbo@franciscoambrozio.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=chromium
-VERSION=${VERSION:-31.0.1650.57}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-48.0.2564.82}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -41,7 +41,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-DDSSE=" -Ddisable_sse2=1 "
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
# Here we following the same way of Arch Linux and Gentoo.
@@ -53,17 +52,24 @@ GOOGLE_DEFAULT_CLIENT_SECRET=XU4b-j0Ssy-XkTvSVmiFMvNY
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKLDFLAGS=""
LIBDIRSUFFIX=""
+ TARGETARCH="ia32"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKLDFLAGS=""
LIBDIRSUFFIX=""
+ TARGETARCH="ia32"
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ SLKLDFLAGS="-L/usr/lib64"
LIBDIRSUFFIX="64"
- DDSSE=""
+ TARGETARCH="x64"
else
SLKCFLAGS="-O2"
+ SLKLDFLAGS=""
LIBDIRSUFFIX=""
+ TARGETARCH="ia32"
fi
set -e
@@ -72,73 +78,113 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Change "-Dproprietary_codecs" to "0" if you don't want to use proprietary codecs
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
SLKCFLAGS="${SLKCFLAGS} -Wno-unused-local-typedefs"
-export -n CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
-build/gyp_chromium -f make build/all.gyp --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_link_gnome_keyring=0 \
- -Dlinux_sandbox_path=/usr/lib${LIBDIRSUFFIX}/chromium/chrome-sandbox \
- -Dlinux_strip_binary=1 \
- -Dlinux_use_gold_binary=0 \
- -Dlinux_use_gold_flags=0 \
- -Dno_strict_aliasing=1 \
- -Dffmpeg_branding=Chrome \
- -Dproprietary_codecs=1 \
- -Duse_gconf=0 \
- -Duse_gnome_keyring=0 \
- -Duse_kerberos=0 \
- -Duse_pulseaudio=1 \
- -Duse_system_bzip2=1 \
- -Duse_system_ffmpeg=0 \
- -Duse_system_libevent=1 \
- -Duse_system_libpng=1 \
- -Duse_system_libjpeg=1 \
- -Duse_system_libxslt=1 \
- -Duse_system_libxml=1 \
- -Duse_system_ssl=0 \
- -Duse_system_zlib=1 \
- -Duse_system_yasm=1 \
- -Ddisable_nacl=1 \
- -Drelease_extra_cflags="$CFLAGS" \
- -Dsystem_libdir=lib64 \
- -Dpython_ver=2.7 \
- $DDSSE
-
-make chrome chrome_sandbox BUILDTYPE=Release V=1
-
-# Creating the package
-cd out/Release/
- mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/chromium
- mkdir -p $PKG/usr/bin
- install -m 0755 -D chrome $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromium
- install -m 4755 -o root -g root -D chrome_sandbox $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chrome-sandbox
- install -m 0755 -D libffmpegsumo.so $PKG/usr/lib${LIBDIRSUFFIX}/chromium
- cp *.pak $PKG/usr/lib${LIBDIRSUFFIX}/chromium
- cp -a locales/ $PKG/usr/lib${LIBDIRSUFFIX}/chromium
- cp -a resources/ $PKG/usr/lib${LIBDIRSUFFIX}/chromium
- find $PKG -name '*.d' -type f -delete
-
- mkdir -p $PKG/usr/man/man1
- install -m 0644 -D chrome.1 $PKG/usr/man/man1/chromium.1
- mkdir -p $PKG/usr/share/pixmaps
- cp product_logo_48.png $PKG/usr/share/pixmaps/chromium.png
- mkdir -p $PKG/usr/share/applications
- install -m 0644 $CWD/chromium.desktop $PKG/usr/share/applications
-cd ../../
+export -n LDFLAGS="$SLKLDFLAGS" CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+
+_conf=(
+ -Dclang=0
+ -Ddisable_glibc=1
+ -Dffmpeg_branding=Chrome
+ -Dffmpeg_component=shared_library
+ -Dgoogle_api_key=$GOOGLE_API_KEY
+ -Dgoogle_default_client_id=$GOOGLE_DEFAULT_CLIENT_ID
+ -Dgoogle_default_client_secret=$GOOGLE_DEFAULT_CLIENT_SECRET
+ -Dicu_use_data_file_flag=0
+ -Dlinux_sandbox_path=/usr/lib${LIBDIRSUFFIX}/chromium/chrome_sandbox
+ -Dlinux_strip_binary=1
+ -Dlinux_use_bundled_binutils=0
+ -Dlinux_use_bundled_gold=0
+ -Dlinux_use_gold_binary=0
+ -Dlinux_use_gold_flags=0
+ -Dlogging_like_official_build=1
+ -Dproprietary_codecs=1
+ -Dremove_webcore_debug_symbols=1
+ -Dusb_ids_path=/usr/share/hwdata/usb.ids
+ -Duse_allocator=none
+ -Duse_gconf=0
+ -Duse_kerberos=0
+ -Duse_pulseaudio=0
+ -Duse_system_bzip2=0
+ -Duse_system_flac=1
+ -Duse_system_ffmpeg=0
+ -Duse_system_harfbuzz=0
+ -Duse_system_icu=0
+ -Duse_system_libevent=1
+ -Duse_system_libjpeg=0
+ -Duse_system_libpng=0
+ -Duse_system_libxml=0
+ -Duse_system_libxslt=0
+ -Duse_system_nspr=1
+ -Duse_system_opus=0
+ -Duse_system_snappy=0
+ -Duse_system_openssl=1
+ -Duse_system_xdg_utils=1
+ -Duse_system_yasm=1
+ -Duse_system_zlib=0
+ -Dwerror=
+ -Drelease_extra_cflags="$CFLAGS"
+ -Dtarget_arch=$TARGETARCH
+ -Ddisable_nacl=1
+ -Ddisable_sse2=1
+)
+
+# Steps needed to build
+third_party/libaddressinput/chromium/tools/update-strings.py
+touch chrome/test/data/webui/i18n_process_css_test.html
+build/linux/unbundle/replace_gyp_files.py "${_conf[@]}"
+build/gyp_chromium --depth=. "${_conf[@]}"
+ninja -C out/Release chrome chrome_sandbox chromedriver
+
+# "Install" process
+install -D out/Release/chrome $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromium
+install -D -m4755 -o root -g root out/Release/chrome_sandbox \
+ $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chrome-sandbox
+install -D out/Release/chromedriver \
+ $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromedriver
+
+cp out/Release/*.pak $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+cp -a out/Release/locales $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+cp -a out/Release/pseudo_locales $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+ln -s locales $PKG/usr/lib${LIBDIRSUFFIX}/chromium/remoting_locales
+cp -a out/Release/resources $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/chromium/lib
+cp out/Release/lib/libffmpeg.so $PKG/usr/lib${LIBDIRSUFFIX}/chromium/lib
+
+cp out/Release/natives_blob.bin $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+cp out/Release/snapshot_blob.bin $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+
+cp -a third_party/icu/source/data/in/icudtl.dat $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+
+mkdir -p $PKG/usr/man/man1
+install -m 0644 -D out/Release/chrome.1 $PKG/usr/man/man1/chromium.1
+
+install -D -m0755 $CWD/chromium.sh $PKG/usr/bin/chromium
+ln -s ../lib${LIBDIRSUFFIX}/chromium/chromedriver $PKG/usr/bin/chromedriver
+
+for size in 16 32; do
+ install -D -m0644 \
+ chrome/app/theme/default_100_percent/chromium/product_logo_$size.png \
+ $PKG/usr/share/icons/hicolor/${size}x${size}/apps/${PRGNAM}.png
+done
+for size in 22 24 48 64 128 256; do
+ install -D -m0644 \
+ chrome/app/theme/chromium/product_logo_$size.png \
+ $PKG/usr/share/icons/hicolor/${size}x${size}/apps/${PRGNAM}.png
+done
+
+install -D -m 0644 $CWD/chromium.desktop $PKG/usr/share/applications/chromium.desktop
+mkdir -p $PKG/etc/chromium
+cat $CWD/chromium.default > $PKG/etc/chromium/00-default.conf.new
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/ || true
@@ -149,10 +195,6 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-cd $PKG
- ln -s /usr/lib${LIBDIRSUFFIX}/chromium/chromium $PKG/usr/bin/chromium
- ln -s /usr/lib${LIBDIRSUFFIX}/chromium/chrome-sandbox $PKG/usr/bin/chrome-sandbox
-
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/network/chromium/chromium.default b/network/chromium/chromium.default
new file mode 100644
index 0000000000000..429f58e21338a
--- /dev/null
+++ b/network/chromium/chromium.default
@@ -0,0 +1,5 @@
+# Default settings for chromium.
+# This file is sourced by /usr/bin/chromium
+
+# Options to pass to chromium:
+#CHROMIUM_FLAGS=""
diff --git a/network/chromium/chromium.desktop b/network/chromium/chromium.desktop
index 847b631bccdcc..ebdabd9b04cbf 100644
--- a/network/chromium/chromium.desktop
+++ b/network/chromium/chromium.desktop
@@ -1,75 +1,113 @@
[Desktop Entry]
-Exec=/usr/bin/chromium %U
-Icon=/usr/share/pixmaps/chromium.png
-Type=Application
-Categories=Network;
+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[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
+GenericName[ar]=متصفح الشبكة
+GenericName[bg]=Уеб браузър
+GenericName[ca]=Navegador web
GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
GenericName[da]=Browser
GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
+GenericName[el]=Περιηγητής ιστού
+GenericName[en_GB]=Web Browser
GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
+GenericName[et]=Veebibrauser
GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
+GenericName[fr]=Navigateur Web
+GenericName[gu]=વેબ બ્રાઉઝર
GenericName[he]=דפדפן אינטרנט
GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
GenericName[it]=Browser Web
GenericName[ja]=ウェブブラウザ
+GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет
-GenericName[mn]=Веб-Хөтөч
+GenericName[lv]=Tīmekļa pārlūks
+GenericName[ml]=വെബ് ബ്രൌസര്‍
+GenericName[mr]=वेब ब्राऊजर
GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
GenericName[pl]=Przeglądarka WWW
GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
+GenericName[pt_BR]=Navegador da Internet
+GenericName[ro]=Navigator de Internet
GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb
GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
+GenericName[ta]=இணைய உலாவி
+GenericName[th]=เว็บเบราว์เซอร์
GenericName[tr]=Web Tarayıcı
GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
GenericName[zh_CN]=网页浏览器
+GenericName[zh_HK]=網頁瀏覽器
GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html;
-X-KDE-StartupNotify=true
+# 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;x-scheme-handler/ftp;x-scheme-handler/mailto;x-scheme-handler/webcal;
diff --git a/network/chromium/chromium.info b/network/chromium/chromium.info
index 70c29ef3c7d67..c949823c0ed26 100644
--- a/network/chromium/chromium.info
+++ b/network/chromium/chromium.info
@@ -1,10 +1,10 @@
PRGNAM="chromium"
-VERSION="31.0.1650.57"
+VERSION="48.0.2564.82"
HOMEPAGE="http://www.chromium.org/"
-DOWNLOAD="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1650.57.tar.xz"
-MD5SUM="80bca9ce0d419ac1f7ff8621d8534fc8"
+DOWNLOAD="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-48.0.2564.82.tar.xz"
+MD5SUM="c121aff107f2d8565352b67ee97a0c47"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="ninja"
MAINTAINER="Francisco Ambrozio"
EMAIL="sbo@franciscoambrozio.com"
diff --git a/network/chromium/chromium.sh b/network/chromium/chromium.sh
new file mode 100644
index 0000000000000..c6e00532ab321
--- /dev/null
+++ b/network/chromium/chromium.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Allow users to override command-line options
+# Based on Gentoo's chromium package (and by extension, Debian's)
+for FILE in /etc/chromium/*.conf ; do
+ [[ -f ${FILE} ]] && source "${FILE}"
+done
+
+# Prefer user defined CHROMIUM_USER_FLAGS flags (from environment) over
+# system default CHROMIUM_FLAGS (from /etc/chromium)/)
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-$CHROMIUM_FLAGS}
+
+export CHROME_WRAPPER=$(readlink -f "$0")
+export CHROME_DESKTOP=chromium.desktop
+
+exec /usr/lib64/chromium/chromium $CHROMIUM_FLAGS "$@"
diff --git a/network/chromium/doinst.sh b/network/chromium/doinst.sh
index 5fb28930db0b9..6be00738b7748 100644
--- a/network/chromium/doinst.sh
+++ b/network/chromium/doinst.sh
@@ -1,3 +1,31 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+config() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+ # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/chromium/00-default.conf.new
+
+# Update the desktop database:
+if [ -x usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
+fi
+
+# Update hicolor theme cache:
+if [ -d usr/share/icons/hicolor ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null
+ fi
+fi
+
+# Update the mime database:
+if [ -x usr/bin/update-mime-database ]; then
+ /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi
diff --git a/network/chromium/slack-desc b/network/chromium/slack-desc
index 2b22972eb4e2e..d7c2168a55698 100644
--- a/network/chromium/slack-desc
+++ b/network/chromium/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-chromium: Google Chromium (Open Source Web Browser)
-chromium:
-chromium: Google Chromium is a browser that combines a minimal design with
-chromium: sophisticated technology to make the web faster, safer, and easier.
-chromium:
+chromium: chromium (Open Source Web Browser)
chromium:
+chromium: Chromium is an open-source browser project that aims to build
+chromium: a safer, faster, and more stable way for all Internet users
+chromium: to experience the web.
chromium:
chromium:
+chromium: Homepage: https://www.chromium.org
chromium:
chromium:
chromium: