diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-11-18 14:18:05 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-11-18 14:18:05 +0000 |
| commit | 4c5e286423c6dc406ff8c62daab0bd4163aa340f (patch) | |
| tree | 5db4d8f9e4900c8ac2f29e7941b44b81b75002ae /chromium-dev | |
| parent | 2a0193a0c836853682cf0c40104b9eab4efa8f0a (diff) | |
| download | asb-4c5e286423c6dc406ff8c62daab0bd4163aa340f.tar.gz asb-4c5e286423c6dc406ff8c62daab0bd4163aa340f.tar.xz | |
Forcibly disable pulseaudio; warn the user if Google API keys are missing; remove the faulty 'local' statement
Diffstat (limited to 'chromium-dev')
| -rwxr-xr-x | chromium-dev/build/chromium.SlackBuild | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/chromium-dev/build/chromium.SlackBuild b/chromium-dev/build/chromium.SlackBuild index e465c078..240b1c3d 100755 --- a/chromium-dev/build/chromium.SlackBuild +++ b/chromium-dev/build/chromium.SlackBuild @@ -50,18 +50,6 @@ BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} -# This package is built with Alien's Google API keys for Chromium. -# If you want to rebuild this package, either obtain your own, or else -# you can simply compile without API keys. This will disable stuff like -# browser sync and other functionality which accesses Google APIs. -# The following variables will be set: -# _google_api_key -# _google_default_client_id -# _google_default_client_secret -if [ -f ${HOME}/.chromium_apikeys ]; then - . ${HOME}/.chromium_apikeys -fi - DOCS="LICENSE README*" # Where do we look for sources? @@ -77,6 +65,30 @@ OUTPUT=${OUTPUT:-/tmp} # Official location (non-browsable) of the above is: # https://commondatastorage.googleapis.com/ +# This package is built with Alien's Google API keys for Chromium. +# If you want to rebuild this package, either obtain your own, or else +# you can simply compile without API keys. This will disable stuff like +# browser sync and other functionality which accesses Google APIs. +# The following variables will be set: +# _google_api_key +# _google_default_client_id +# _google_default_client_secret +if [ -f ${HOME}/.chromium_apikeys ]; then + . ${HOME}/.chromium_apikeys +elif [ -f ${SRCDIR}/chromium_apikeys ]; then + . ${SRCDIR}/chromium_apikeys +else + cat <<EOT +No values were defined for the following variables: + _google_api_key + _google_default_client_id + _google_default_client_secret +Please supply your own Google API keys for Chromium! +Press Ctrl-C to continue or wait 10 seconds... +EOT +sleep 10 +fi + SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz" SRCURL[0]="https://commondatastorage.googleapis.com/${PRGNAM}-browser-official/${PRGNAM}-${VERSION}.tar.xz" @@ -225,7 +237,7 @@ LDFLAGS="$SLKLDFLAGS" CXXFLAGS="$SLKCFLAGS" CFLAGS="$SLKCFLAGS -Wno-unused-local-typedefs" -local _chromium_conf=( +_chromium_conf=( -Dgoogle_api_key=$_google_api_key -Dgoogle_default_client_id=$_google_default_client_id -Dgoogle_default_client_secret=$_google_default_client_secret @@ -233,6 +245,7 @@ local _chromium_conf=( -Dlinux_sandbox_path=/usr/lib${LIBDIRSUFFIX}/chromium/chrome_sandbox -Dlinux_link_gsettings=1 -Dlinux_link_libpci=1 + -Dlinux_link_pulseaudio=0 -Dlinux_strip_binary=1 -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 @@ -242,6 +255,7 @@ local _chromium_conf=( -Dproprietary_codecs=1 -Ddisable_glibc=1 -Duse_kerberos=0 + -Duse_pulseaudio=0 -Duse_system_bzip2=1 -Duse_system_flac=1 -Duse_system_ffmpeg=0 |