From dc7e22c1f9e8b4147210071a05ac655aba35139d Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 31 Aug 2014 16:03:04 +0000
Subject: Some fixes after having tested the script

---
 chromium-dev/build/chromium-dev.SlackBuild | 17 +++++++++--------
 chromium/build/chromium-dev.SlackBuild     | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/chromium-dev/build/chromium-dev.SlackBuild b/chromium-dev/build/chromium-dev.SlackBuild
index 23dad8b0..c388ca33 100755
--- a/chromium-dev/build/chromium-dev.SlackBuild
+++ b/chromium-dev/build/chromium-dev.SlackBuild
@@ -60,7 +60,7 @@ USE_NACL=${USE_NACL:-1}
 # I default this to "off" because it is untested:
 USE_CLANG=${USE_CLANG:-0}
 
-DOCS="AUTHORS LICENSE README*"
+DOCS="AUTHORS DEPS LICENSE README*"
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -220,9 +220,10 @@ cd ${SRCNAM}-${VERSION}
 
 # Patches:
 touch $OUTPUT/patch-${PRGNAM}.log
-# Slackware specific patch:
-cat $SRCDIR/patches/chromium_libelf_includes.patch | patch -p0 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+## Slackware specific patch:
+## (no longer applies)
+#cat $SRCDIR/patches/chromium_libelf_includes.patch | patch -p0 --verbose \
+#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 # Prevent crashes when accessing google.com and youtube.com just because
 # this is not an official build:
 cat $SRCDIR/patches/chromium_secure_referrer.patch | patch -p1 --verbose \
@@ -349,7 +350,7 @@ install -D out/Release/chromedriver $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chrome
 
 # Copy over the remaining binaries:
 cp -a \
-  out/Release/{*.pak,libffmpegsumo.so, libpdf.so} \
+  out/Release/{*.pak,libffmpegsumo.so,libpdf.so} \
   $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
 if [ ${USE_NACL} -eq 1 ]; then
   # Native Client files:
@@ -385,13 +386,13 @@ install -D -m0644 out/Release/chrome.1 $PKG/usr/man/man1/${PRGNAM}.1
 # Without this file, chromium refuses to start:
 cp -a third_party/icu/source/data/in/icudtl.dat $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
 
-# Make the chromedriver available in the $PATH :
-ln -s ../lib${LIBDIRSUFFIX}/${PRGNAM}/chromedriver $PKG/usr/bin/chromedriver-dev
-
 # Install a wrapper script:
 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
+
 # Install desktop icons:
 for size in 16 32; do
   install -D -m0644 \
diff --git a/chromium/build/chromium-dev.SlackBuild b/chromium/build/chromium-dev.SlackBuild
index 23dad8b0..c388ca33 100755
--- a/chromium/build/chromium-dev.SlackBuild
+++ b/chromium/build/chromium-dev.SlackBuild
@@ -60,7 +60,7 @@ USE_NACL=${USE_NACL:-1}
 # I default this to "off" because it is untested:
 USE_CLANG=${USE_CLANG:-0}
 
-DOCS="AUTHORS LICENSE README*"
+DOCS="AUTHORS DEPS LICENSE README*"
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -220,9 +220,10 @@ cd ${SRCNAM}-${VERSION}
 
 # Patches:
 touch $OUTPUT/patch-${PRGNAM}.log
-# Slackware specific patch:
-cat $SRCDIR/patches/chromium_libelf_includes.patch | patch -p0 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+## Slackware specific patch:
+## (no longer applies)
+#cat $SRCDIR/patches/chromium_libelf_includes.patch | patch -p0 --verbose \
+#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 # Prevent crashes when accessing google.com and youtube.com just because
 # this is not an official build:
 cat $SRCDIR/patches/chromium_secure_referrer.patch | patch -p1 --verbose \
@@ -349,7 +350,7 @@ install -D out/Release/chromedriver $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chrome
 
 # Copy over the remaining binaries:
 cp -a \
-  out/Release/{*.pak,libffmpegsumo.so, libpdf.so} \
+  out/Release/{*.pak,libffmpegsumo.so,libpdf.so} \
   $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
 if [ ${USE_NACL} -eq 1 ]; then
   # Native Client files:
@@ -385,13 +386,13 @@ install -D -m0644 out/Release/chrome.1 $PKG/usr/man/man1/${PRGNAM}.1
 # Without this file, chromium refuses to start:
 cp -a third_party/icu/source/data/in/icudtl.dat $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
 
-# Make the chromedriver available in the $PATH :
-ln -s ../lib${LIBDIRSUFFIX}/${PRGNAM}/chromedriver $PKG/usr/bin/chromedriver-dev
-
 # Install a wrapper script:
 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
+
 # Install desktop icons:
 for size in 16 32; do
   install -D -m0644 \
-- 
cgit v1.2.3-65-gdbad