diff options
| author |   Eric Hameleers <alien@slackware.com> | 2014-09-03 06:57:53 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2014-09-03 06:57:53 +0000 |
| commit | 1e40644bad95e26021395bf57776efc6556f27e6 (patch) | |
| tree | 663592424d6d43e21fe4cea2f389fd586451b3e2 /chromium-dev | |
| parent | 292a0f3a7549ca5522604a65826a7d7bbbb8d980 (diff) | |
| download | asb-1e40644bad95e26021395bf57776efc6556f27e6.tar.gz asb-1e40644bad95e26021395bf57776efc6556f27e6.tar.xz | |
Fix the incorrect config directory naming. Parametrize the script a bit more
Diffstat (limited to 'chromium-dev')
| -rwxr-xr-x | chromium-dev/build/chromium-dev.SlackBuild | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/chromium-dev/build/chromium-dev.SlackBuild b/chromium-dev/build/chromium-dev.SlackBuild index c388ca33..74f2517e 100755 --- a/chromium-dev/build/chromium-dev.SlackBuild +++ b/chromium-dev/build/chromium-dev.SlackBuild @@ -37,7 +37,9 @@ # Changelog: # 39.0.2138.3-1: # 31/aug/2014 by Eric Hameleers <alien@slackware.com> -# * First build of the development channel of chromium. +# 39.0.2138.3-2: +# 31/aug/2014 by Eric Hameleers <alien@slackware.com> +# * Fixed the the use of .config/chromium-dev directory name. # # Run 'sh chromium-dev.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -45,10 +47,11 @@ # # ----------------------------------------------------------------------------- -PRGNAM=chromium-dev SRCNAM=chromium +SRCEXT=${SRCEXT:-"-dev"} +PRGNAM=${SRCNAM}${SRCEXT} # chromium-dev VERSION=${VERSION:-39.0.2138.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -233,8 +236,8 @@ cat $SRCDIR/patches/chromium_secure_referrer.patch | patch -p1 --verbose \ sed -e "s|'filename': 'chromium-browser'|'filename': '${PRGNAM}'|" \ -e "s|'confdir': 'chromium'|'confdir': '${PRGNAM}'|" \ -i chrome/chrome_exe.gypi -sed -e 's|config_dir.Append("chromium")|config_dir.Append("${PRGNAM}")|' \ - -e 's|config_dir.Append("chrome-frame")|config_dir.Append("chrome-frame-dev")|' \ +sed -e 's|config_dir.Append("chromium")|config_dir.Append("'${PRGNAM}'")|' \ + -e 's|config_dir.Append("chrome-frame")|config_dir.Append("'chrome-frame$SRCEXT}'")|' \ -i chrome/common/chrome_paths_linux.cc if [ "$USE_CLANG" = "1" ]; then @@ -391,7 +394,7 @@ install -D -m0755 $SRCDIR/${PRGNAM}.sh $PKG/usr/bin/${PRGNAM} sed -i -e "s/@LIBDIRSUFFIX@/${LIBDIRSUFFIX}/g" $PKG/usr/bin/${PRGNAM} # Make the chromedriver available in the $PATH : -ln -s ../lib${LIBDIRSUFFIX}/${PRGNAM}/chromedriver $PKG/usr/bin/chromedriver-dev +ln -s ../lib${LIBDIRSUFFIX}/${PRGNAM}/chromedriver $PKG/usr/bin/chromedriver${SRCEXT} # Install desktop icons: for size in 16 32; do @@ -468,7 +471,7 @@ fi # Add a package description: mkdir -p $PKG/install -cat $SRCDIR/slack-desc-dev > $PKG/install/slack-desc +cat $SRCDIR/slack-desc${SRCEXT} > $PKG/install/slack-desc # Build the package: cd $PKG |