From f30402c2f425acc20ca7f21b2cbc95c520e8b39a Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 7 Dec 2018 18:56:20 +0000
Subject: chromium: fix the compile for 71.0.3578.80 and widevine support

---
 chromium/build/chromium.SlackBuild | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'chromium/build/chromium.SlackBuild')

diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild
index 4657c4dd..2d46fe98 100755
--- a/chromium/build/chromium.SlackBuild
+++ b/chromium/build/chromium.SlackBuild
@@ -602,16 +602,16 @@ cd ${SRCNAM}-${VERSION}
 # Patches:
 touch $OUTPUT/patch-${PRGNAM}.log
 # Bug fixes:
-# Fix bootstrapping gn (patch taken from debian):
-cat $SRCDIR/patches/chromium-gn-bootstrap-libcxx.patch | patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+## Fix bootstrapping gn (patch taken from debian):
+#cat $SRCDIR/patches/chromium-gn-bootstrap-libcxx.patch | patch -p1 --verbose \
+#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 # CRBUG #904350 (https://crbug.com/904350):
 cat $SRCDIR/patches/gn_bootstrap_remove_sysroot-options.patch \
   | patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-# CRBUG #879900 (https://crbug.com/879900):
-cat $SRCDIR/patches/chromium_pdfium_gcc82.patch | patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+## CRBUG #879900 (https://crbug.com/879900):
+#cat $SRCDIR/patches/chromium_pdfium_gcc82.patch | patch -p1 --verbose \
+#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 # Slackware specific:
 # When compiling google's clang on 32bit Slackware use 'i586' in the triplet.
 # I am a python noob so this is clumsy, better implementation is welcome :-)
@@ -676,10 +676,13 @@ if [ $USE_CDM -eq 1 ]; then
   # proprietary Widevine CDM, only the adapter library which is built from OSS.
   # To compile, we just add one #define - see https://crbug.com/473866
   sed '14i#define WIDEVINE_CDM_VERSION_STRING "'$WIDEVINE_VERSION'"' \
-    -i third_party/widevine/cdm/stub/widevine_cdm_version.h
-  # And from M67 to M70 we also need to explicitly enable linux as supported OS:
+    -i third_party/widevine/cdm/widevine_cdm_version.h
+  # From M67 to M70 we also need to explicitly enable linux as supported OS:
   #sed -e 's/assert(!enable_widevine || is_win || is_mac || is_chromecast/& || is_linux/' \
   #  -i third_party/widevine/cdm/BUILD.gn
+  # From M71 we need to change another #define:
+  sed 's/BUILDFLAG(BUNDLE_WIDEVINE_CDM)/BUILDFLAG(ENABLE_WIDEVINE)/' \
+    -i chrome/common/chrome_content_client.cc
 fi
 
 if [ "x$SRCEXT" = "x-dev" ]; then
@@ -849,6 +852,7 @@ if [ ${USE_CLANG} -eq 1 -o ${USE_NACL} -eq 1 ]; then
     --use-system-cmake \
     --if-needed \
     --without-android \
+    --without-fuchsia \
     2>&1 | tee $OUTPUT/clang_build-${PRGNAM}.log
 fi
 
-- 
cgit v1.2.3-65-gdbad