Update to 37.0.2062.94

1 files changed, 47 insertions, 17 deletions

diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild
index c58f7684..74b65d37 100755
--- a/chromium/build/chromium.SlackBuild
+++ b/chromium/build/chromium.SlackBuild
@@ -88,6 +88,9 @@
 #              12/aug/2014 by Eric Hameleers <alien@slackware.com>
 #              * Update comes with security fixes, Chrome also comes with an
 #                updated Flash plugin: 14.0.0.177.
+# 37.0.2062.94-1:
+#              27/aug/2014 by Eric Hameleers <alien@slackware.com>
+#              * Update comes with security fixes, New: an embedded PDF viewer.
 # 
 # Run 'sh chromium.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -96,7 +99,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=chromium
-VERSION=${VERSION:-36.0.1985.143}
+VERSION=${VERSION:-37.0.2062.94}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -265,11 +268,16 @@ cd ${PRGNAM}-${VERSION}
 
 # Patches:
 touch $OUTPUT/patch-${PRGNAM}.log
-# Un-confuse find_depot_tools:
-cat $SRCDIR/patches/chromium-depot_tools.patch | patch -Np0 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+## Un-confuse find_depot_tools:
+#cat $SRCDIR/patches/chromium-depot_tools.patch | patch -Np0 --verbose \
+#  2>&1 | tee -a $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
+# 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 \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
@@ -291,23 +299,26 @@ _chromium_conf=(
     -Dgoogle_default_client_id=$_google_default_client_id
     -Dgoogle_default_client_secret=$_google_default_client_secret
     -Dwerror=
-    -Dlinux_sandbox_path=/usr/lib${LIBDIRSUFFIX}/chromium/chrome_sandbox
+    -Dlinux_sandbox_path=/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/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
-    -Dlinux_use_tcmalloc=0
     -Dlogging_like_official_build=1
     -Dffmpeg_branding=Chrome
     -Dproprietary_codecs=1
     -Ddisable_glibc=1
+    -Dusb_ids_path=/usr/share/hwdata/usb.ids
+    -Duse_allocator=none
     -Duse_gconf=0
     -Duse_kerberos=0
     -Duse_pulseaudio=0
     -Duse_system_bzip2=1
     -Duse_system_flac=1
     -Duse_system_ffmpeg=0
-    -Duse_system_harfbuzz=1
-    -Duse_system_icu=1
+    -Duse_system_harfbuzz=0
+    -Duse_system_icu=0
     -Duse_system_libevent=1
     -Duse_system_libjpeg=0
     -Duse_system_libpng=0
@@ -329,16 +340,24 @@ _chromium_conf=(
     #-Dlinux_link_libpci=1
     #-Dlinux_link_pulseaudio=0
 
-build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" \
-  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-build/gyp_chromium --depth=. "${_chromium_conf[@]}" \
-  2>&1 | tee $OUTPUT/gyp-${PRGNAM}.log
+# Download the NaCL toolchains:
 if [ ${USE_NACL} -eq 1 ]; then
   # We do not need arm_trusted on x86:
   build/download_nacl_toolchains.py --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator \
   2>&1 | tee $OUTPUT/nacl_dl-${PRGNAM}.log
 fi
 
+# Do not make the build fail, see Chromium issue #386097:
+third_party/libaddressinput/chromium/tools/update-strings.py \
+  2>&1 | tee $OUTPUT/update_strings-${PRGNAM}.log
+
+# Unbundle the libraries which we use from the system:
+build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" \
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+# Generate the ninja build files:
+build/gyp_chromium --depth=. "${_chromium_conf[@]}" \
+  2>&1 | tee $OUTPUT/gyp-${PRGNAM}.log
+
 ninja $NUMJOBS  -C out/Release chrome chrome_sandbox chromedriver
   2>&1 | tee $OUTPUT/ninja-${PRGNAM}.log
 
@@ -357,25 +376,36 @@ install -D out/Release/chromedriver $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromed
 
 # Copy over the remaining binaries:
 cp -a \
-  out/Release/{*.pak,libffmpegsumo.so} \
+  out/Release/{*.pak,libffmpegsumo.so,libpdf.so} \
   $PKG/usr/lib${LIBDIRSUFFIX}/chromium/
 if [ ${USE_NACL} -eq 1 ]; then
   # Native Client files:
   cp -a \
     out/Release/nacl_helper{,_bootstrap} \
-    out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
+    out/Release/nacl_irt_*.nexe \
     $PKG/usr/lib${LIBDIRSUFFIX}/chromium/
+  if [ -f out/Release/libppGoogleNaClPluginChrome.so ]
+  then
+    cp -a \
+      out/Release/libppGoogleNaClPluginChrome.so \
+      $PKG/usr/lib${LIBDIRSUFFIX}/chromium/
+  fi
 fi
 
 # Manually strip binaries so that 'nacl_irt_*.nexe' is left intact
 strip  --strip-unneeded \
   $PKG/usr/lib${LIBDIRSUFFIX}/chromium/{chromium,chrome-sandbox} \
   $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromedriver \
-  $PKG/usr/lib${LIBDIRSUFFIX}/chromium/libffmpegsumo.so
+  $PKG/usr/lib${LIBDIRSUFFIX}/chromium/libffmpegsumo.so \
+  $PKG/usr/lib${LIBDIRSUFFIX}/chromium/libpdf.so
 if [ ${USE_NACL} -eq 1 ]; then
   strip  --strip-unneeded \
-    $PKG/usr/lib${LIBDIRSUFFIX}/chromium/nacl_helper{,_bootstrap} \
-    $PKG/usr/lib${LIBDIRSUFFIX}/chromium/libppGoogleNaClPluginChrome.so
+    $PKG/usr/lib${LIBDIRSUFFIX}/chromium/nacl_helper{,_bootstrap}
+  if [ -f $PKG/usr/lib${LIBDIRSUFFIX}/chromium/libppGoogleNaClPluginChrome.so ]
+  then
+    strip  --strip-unneeded \
+      $PKG/usr/lib${LIBDIRSUFFIX}/chromium/libppGoogleNaClPluginChrome.so
+  fi
 fi
 
 # Add locales: