Chromium:Add version 104.0.5112.101

mariux64 · Aug 18, 2022 · 533dc1c · 533dc1c
1 parent 84c3f23
commit 533dc1c
Showing 1 changed file with 22 additions and 21 deletions.
diff --git a/chromium-104.0.5112.101-0.build.sh b/chromium-104.0.5112.101-0.build.sh
@@ -1,13 +1,16 @@
 #! /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=100.0.4896.60
+VERSION=104.0.5112.101
 BUILD=0
 
 PREFIX=/pkg/$PKG-$VERSION-$BUILD
 if [ -n "$TESTING" ]; then PREFIX=/scratch/local2/$PKG-$VERSION-$BUILD ; fi
 
-set -xe
 umask 022
 
 BUILD_TMPDIR=/scratch/local2/$PKG-$VERSION-$BUILD.build.tmp
@@ -32,7 +35,11 @@ BUILDDIR=$PREFIX/build
 #source google API Zeug; wird benoetigt damit browser sync funktioniert
 dirname="$(dirname $0)"
 if [ -f ${dirname}/google_api_zeug ]; then
+	#geht nur ohne COOKIE
 	. ${dirname}/google_api_zeug
+elif [[ $0 == "/dev/shm/runme-"*".sh" ]]; then
+	#muss ich mir nich was besseres ueberlegen
+	. /home/schrader/git_zeug/pkg-scripts/google_api_zeug
 else
 	echo "google_default_client_id, google_api_key und google_default_client_secret wird benoetigt, damit Browser Sync funktioniert(siehe HelmutSchmidtSeite)."
 	exit 1
@@ -48,7 +55,7 @@ if [ -d ${PKG}-${VERSION} ];then
 fi
 
 test -e ${PKG}-${VERSION}.tar.xz || wget https://commondatastorage.googleapis.com/${PKG}-browser-official/${PKG}-${VERSION}.tar.xz
-test -d ${PKG}-${VERSION}        || tar xvf ${PKG}-${VERSION}.tar.xz
+test -d ${PKG}-${VERSION}        || tar xf ${PKG}-${VERSION}.tar.xz
 
 cd ${PKG}-${VERSION}
 
@@ -58,7 +65,7 @@ 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-14.17.1-0/bin/node third_party/node/linux/node-linux-x64/bin/
+	ln -s /pkg/node-16.16.0-0/bin/node third_party/node/linux/node-linux-x64/bin/
 fi
 
 # Add essential proprietary codecs to the "chrome" branding of ffmpeg:
@@ -71,19 +78,8 @@ python3 third_party/libaddressinput/chromium/tools/update-strings.py
 python3 build/linux/sysroot_scripts/install-sysroot.py --arch=amd64
 
 # Generate the ninja build files:
-python3 tools/gn/bootstrap/bootstrap.py
 
-if [ -d $BUILDDIR/llvm-build ]; then
-	rm -r third_party/llvm-build
-	ln -sf $BUILDDIR/llvm-build third_party/llvm-build
-else
-	python3 tools/clang/scripts/build.py \
-    	--skip-checkout \
-    	--use-system-cmake \
-    	--without-android \
-    	--without-fuchsia
-	cp -avr third_party/llvm-build $BUILDDIR
-fi
+python3 tools/clang/scripts/update.py
 
 #Ensure that only this clang version is used
 export PATH=${BUILDDIR}/${PKG}-${VERSION}/third_party/llvm-build/Release+Asserts/bin:$PATH
@@ -100,6 +96,8 @@ python3 chromium/scripts/generate_gn.py
 
 cd ${BUILDDIR}/${PKG}-${VERSION}
 
+python3 tools/gn/bootstrap/bootstrap.py
+
 _chromium_conf=(
 	'blink_enable_generated_code_formatting=false'
 	'blink_symbol_level=0'
@@ -124,22 +122,26 @@ _chromium_conf=(
 	'enable_vulkan=true'
 )
 
-# make sure to use python2
+# make sure to use python3
 source /pkg/python-3.9.7-0/profile
 
 out/Release/gn gen out/Release --args="${_chromium_conf[*]}"
 
-#ninja -C out/Release pdf chrome chromedriver chrome_sandbox
-ninja -C out/Release chrome
+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/
+install -m755 out/Release/chrome_sandbox ${PREFIX}/bin/
+install -m755 out/Release/chrome_crashpad_handler ${PREFIX}/bin/
+
 
 cp -a out/Release/*.pak ${PREFIX}/bin/
 cp -a out/Release/*.so ${PREFIX}/bin/
 cp -a out/Release/libvulkan.so.1 ${PREFIX}/bin/
 cp -a out/Release/icudtl.dat ${PREFIX}/bin/
 cp -a out/Release/locales ${PREFIX}/bin/
-cp -a out/Release/{swiftshader,angledata} ${PREFIX}/bin/
+cp -a out/Release/angledata ${PREFIX}/bin/
 install -m755 out/Release/vk_swiftshader_icd.json ${PREFIX}/bin/
 
 for i in out/Release/{natives_blob.bin,snapshot_blob.bin,v8_context_snapshot.bin}; do
@@ -150,7 +152,6 @@ done
 
 strip --strip-unneeded ${PREFIX}/bin/*.so
 strip --strip-unneeded ${PREFIX}/bin/chrome2
-strip --strip-unneeded ${PREFIX}/bin/swiftshader/*.so
 
 cat >$PREFIX/bin/chromium <<-EOF
 	#!/usr/bin/bash