Update chromium to 114.0.5735.106-0

mariux64 · Jun 15, 2023 · d3bba13 · d3bba13
1 parent 4dcb8d1
commit d3bba13
Showing 1 changed file with 22 additions and 9 deletions.
diff --git a/chromium-114.0.5735.106-0.build.sh b/chromium-114.0.5735.106-0.build.sh
@@ -1,11 +1,10 @@
 #! /bin/bash -x
-
 set -xe
 
 #COOKIE=$(mcookie|cut -c-8); grep -v V_GREP_ME $0 > /dev/shm/runme-$COOKIE.sh ; sleep 0.3; exec bash /dev/shm/runme-$COOKIE.sh
 
 PKG=chromium
-VERSION=108.0.5359.94
+VERSION=114.0.5735.106
 BUILD=0
 
 PREFIX=/pkg/$PKG-$VERSION-$BUILD
@@ -28,7 +27,8 @@ cat >$PREFIX/profile <<-EOF
 EOF
 . $PREFIX/profile
 
-export MAKEFLAGS="-j $(nproc)"
+NPROC=$(( $(nproc) * 4 / 5 + 1 ))
+export MAKEFLAGS="-j ${NPROC}"
 
 BUILDDIR=$PREFIX/build
 
@@ -57,6 +57,10 @@ fi
 test -e ${PKG}-${VERSION}.tar.xz || wget https://commondatastorage.googleapis.com/${PKG}-browser-official/${PKG}-${VERSION}.tar.xz
 test -d ${PKG}-${VERSION}        || tar xf ${PKG}-${VERSION}.tar.xz
 
+PATCHURL+=("https://beehive.molgen.mpg.de/b1aeb5cb6cfeb1d7ecf3e522a85a1f26/chromium_gcc10.patch https://beehive.molgen.mpg.de/b1aeb5cb6cfeb1d7ecf3e522a85a1f26/chromium_gcc10.patch")
+test -e *.patch || wget $PATCHURL
+
+
 cd ${PKG}-${VERSION}
 
 #Create Directories for Build and Install
@@ -65,19 +69,27 @@ test -d out || mkdir out
 
 mkdir -p third_party/node/linux/node-linux-x64/bin
 if [ ! -e third_party/node/linux/node-linux-x64/bin/node ]; then
-	ln -s /pkg/node-16.16.0-0/bin/node third_party/node/linux/node-linux-x64/bin/
+	ln -s /pkg/node-18.16.0-0/bin/node third_party/node/linux/node-linux-x64/bin/
 fi
 
 # Add essential proprietary codecs to the "chrome" branding of ffmpeg:
-  cat /src/mariux/patches/chromium_ffmpeg_prop.patch | patch -p1
+  cat ${BUILDDIR}/chromium_ffmpeg_prop.patch | patch -p1
+
+# Be compatible with gcc 10
+  cat ${BUILDDIR}/chromium_gcc10.patch |patch -p1
+
+	# Allow building against system libraries in official builds:
+	sed -e 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+	  -i tools/generate_shim_headers/generate_shim_headers.py
 
 # Do not make the build fail, see Chromium issue #386097:
 python3 third_party/libaddressinput/chromium/tools/update-strings.py
 
 # Fix for: ERROR at //build/config/sysroot.gni:57:5: Assertion failed
 python3 build/linux/sysroot_scripts/install-sysroot.py --arch=amd64
 
-# Generate the ninja build files:
+# trouble with bootstrap rust trigger download manual
+python3 tools/rust/update_rust.py
 
 python3 tools/clang/scripts/update.py
 
@@ -96,6 +108,8 @@ python3 chromium/scripts/generate_gn.py
 
 cd ${BUILDDIR}/${PKG}-${VERSION}
 
+# Generate the ninja build files:
+
 python3 tools/gn/bootstrap/bootstrap.py
 
 _chromium_conf=(
@@ -123,12 +137,11 @@ _chromium_conf=(
 )
 
 # make sure to use python3
-source /pkg/python-3.9.7-0/profile
+source /pkg/python-3.10.10-1/profile
 
-out/Release/gn gen out/Release --args="${_chromium_conf[*]}"
+out/Release/gn gen out/Release -v --args="${_chromium_conf[*]}"
 
 ninja -C out/Release pdf chrome chromedriver chrome_sandbox
-#ninja -C out/Release chrome
 
 install -D out/Release/chrome ${PREFIX}/bin/chrome2
 install -m755 out/Release/chromedriver ${PREFIX}/bin/