Update to use STEAM_RUNTIME_HEAVY=1.

5 files changed, 6 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15d386bed6be..813e45f2f4e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,12 @@
 pkgbase = steam-native-webhelper
 	pkgdesc = hack to make steamwebhelper behave
-	pkgver = 20190722
+	pkgver = 20190821
 	pkgrel = 1
 	arch = any
 	license = BSD
 	depends = steam-native-runtime
 	source = steam-native-webhelper
-	source = steamwebhelper.sh
-	source = steamwebhelper.sh.override.2bf679560fac2ed8
-	sha512sums = f7f44322e3eb783b97f4348abf443df38a1f6a182f2c10d5174d08f56552bb25ee15f7536f51e45a7765de8b89e1be8d16ae7a8f2ccfb12b754fefa99cf52987
-	sha512sums = e8d71d8cf88c1720ec93a3f1a6f7cb177e2763c21ee2e1d4e039b7f5fd0e860dc4659fcedef8eb4957016e533fedbe8fc2452c024c0c0c5a8becaa278d52b5e4
-	sha512sums = ba7b72a7efdf53d10e202f2d652efeccc986910672117810899d2873f13b9b2e3f73c4d3398cb150ff2825dc945b7e95f6d9871156ca980aaa6dc4c81dd1120c
+	sha512sums = 606ee8e5a85252c392ac14d1033574ff911b22db84b0bc397ca9b960dd7427445ed12985ca7786f6178f1c6eb650798d3b6bf43be8540aceff8d13329b2ac411
 
 pkgname = steam-native-webhelper
 
diff --git a/PKGBUILD b/PKGBUILD
index 1227e7bba76a..12a148eaca5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Maarten de Vries <maarten@de-vri.es>
 
 pkgname=steam-native-webhelper
-pkgver=20190722
+pkgver=20190821
 pkgrel=1
 pkgdesc="hack to make steamwebhelper behave"
 license=(BSD)
@@ -11,18 +11,10 @@ depends=(steam-native-runtime)
 
 source=(
 	steam-native-webhelper
-	steamwebhelper.sh
-	steamwebhelper.sh.override.2bf679560fac2ed8
 )
 
-sha512sums=(
-	'f7f44322e3eb783b97f4348abf443df38a1f6a182f2c10d5174d08f56552bb25ee15f7536f51e45a7765de8b89e1be8d16ae7a8f2ccfb12b754fefa99cf52987'
-	'e8d71d8cf88c1720ec93a3f1a6f7cb177e2763c21ee2e1d4e039b7f5fd0e860dc4659fcedef8eb4957016e533fedbe8fc2452c024c0c0c5a8becaa278d52b5e4'
-	'ba7b72a7efdf53d10e202f2d652efeccc986910672117810899d2873f13b9b2e3f73c4d3398cb150ff2825dc945b7e95f6d9871156ca980aaa6dc4c81dd1120c'
-)
+sha512sums=('606ee8e5a85252c392ac14d1033574ff911b22db84b0bc397ca9b960dd7427445ed12985ca7786f6178f1c6eb650798d3b6bf43be8540aceff8d13329b2ac411')
 
 package() {
-	install -m 755 -D "steamwebhelper.sh" "$pkgdir/usr/lib/steam/steamwebhelper.sh"
 	install -m 755 -D "steam-native-webhelper" "$pkgdir/usr/bin/steam-native-webhelper"
-	install -m 755 -D "steamwebhelper.sh.override.2bf679560fac2ed8" "$pkgdir/usr/lib/steam/steamwebhelper.sh.override.2bf679560fac2ed8"
 }
diff --git a/steam-native-webhelper b/steam-native-webhelper
index a6dcc1990ad4..9ea8a36f3880 100644
--- a/steam-native-webhelper
+++ b/steam-native-webhelper
@@ -1,10 +1,3 @@
-#!/bin/bash
+#!/bin/sh
 
-WEBHELPER_SHA256=($(sha256sum "$HOME/.local/share/Steam/ubuntu12_64/steamwebhelper.sh"))
-WEBHELPER_SHA256="${WEBHELPER_SHA256[0]}"
-
-if [[ $WEBHELPER_SHA256 == "2bf679560fac2ed8acca4522416cac9812420ac5b53c5a7fd1fac67f05ef5fa6" ]]; then
-	cp /usr/lib/steam/steamwebhelper.sh.override.2bf679560fac2ed8 "$HOME/.local/share/Steam/ubuntu12_64/steamwebhelper.sh"
-fi
-
-exec steam-native "$@"
+STEAM_RUNTIME_HEAVY=1 exec steam-native "$@"
diff --git a/steamwebhelper.sh b/steamwebhelper.sh
deleted file mode 100644
index 607eac40d602..000000000000
--- a/steamwebhelper.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-old_arg_0="$1"
-shift
-
-DIR="$(dirname "$old_arg_0")"
-cd ${DIR}
-
-# Steam runtime 'heavy' is a newer runtime than the default Steam runtime (scout)
-# steamwebhelper and libcef.so are built in this newer environment,
-# and the needed libraries from heavy are provided here.
-# steamwebhelper is compiled to run in the composite runtime made up of heavy+scout(+host)
-# See http://repo.steampowered.com/steamrt/steamrt-heavy/ for details
-
-# STEAM_RUNTIME_HEAVY is a debug tool that can be used in the same way as STEAM_RUNTIME in steam.sh,
-# to override the location of the heavy runtime libraries
-
-if [ -z "$STEAM_RUNTIME_HEAVY" ]; then
-	export STEAM_RUNTIME_HEAVY=./steam-runtime-heavy
-
-fi
-echo "STEAM_RUNTIME_HEAVY: ${STEAM_RUNTIME_HEAVY}"
-
-# Steam client update on June 13 2019 moved the steamrt:heavy libraries into a steam-runtime-heavy/ folder
-# Unfortunately the update process left the old libraries in the current folder
-# We need to keep the current folder in LD_LIBRARY_PATH for some non steamrt:heavy libs,
-# but we don't want these old libraries to cause problems .. so remove them here.
-# We will disable this code once we are confident the vast majority of users no longer have these libraries.
-rm -f libatk-1.0.so.0
-rm -f libatk-bridge-2.0.so.0
-rm -f libatspi.so.0
-rm -f libdatrie.so.1
-rm -f libgio-2.0.so.0
-rm -f libglib-2.0.so.0
-rm -f libgobject-2.0.so.0
-rm -f libgraphite2.so.3
-rm -f libharfbuzz.so.0
-rm -f libpango-1.0.so.0
-rm -f libpangocairo-1.0.so.0
-rm -f libpangoft2-1.0.so.0
-rm -f libthai.so.0
-
-export LD_LIBRARY_PATH=".:${STEAM_RUNTIME_HEAVY}:${LD_LIBRARY_PATH}:${DIR}"
-
-# Give precedence to system libraries when running in native mode
-if [[ "${STEAM_RUNTIME}" = "0" ]]; then
-	export LD_LIBRARY_PATH="/usr/lib:/usr/lib32:${LD_LIBRARY_PATH}"
-fi
-
-./steamwebhelper "$@"
diff --git a/steamwebhelper.sh.override.2bf679560fac2ed8 b/steamwebhelper.sh.override.2bf679560fac2ed8
deleted file mode 100644
index a82dca2088a5..000000000000
--- a/steamwebhelper.sh.override.2bf679560fac2ed8
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-exec /usr/lib/steam/steamwebhelper.sh "$0" "$@"
-####†ã{#####################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################