Update for new steam version.

6 files changed, 40 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 386c9bbc3105..921b30e8bec1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = steam-native-webhelper
 	pkgdesc = hack to make steamwebhelper behave
-	pkgver = 20190419
+	pkgver = 20190530
 	pkgrel = 1
 	arch = any
 	license = BSD
 	depends = steam-native-runtime
 	source = steam-native-webhelper
 	source = steamwebhelper.sh
-	source = steamwebhelper.sh.override
-	sha512sums = 6648380ec91664f49b33422e45cc952be50532759b5eab0cc10733d535c4d659e82a6f0dc6f32fd3906bf04e10e7adeaa8cc377eda011c39258c1c202c40fc56
-	sha512sums = d917d0b7f1666cc899e5d2e7765fbe532f7c679dec4b24fc35b7fb6954a714b93c32e7e58fd3c58f2b21278f117ef5b08774d4258dab726405528c3c9375e1bf
+	source = steamwebhelper.sh.override.f60cb3818ca4cb71
+	source = steamwebhelper.sh.override.8625e67eb3a5c5df
+	sha512sums = ee8ed713289727b0d304459f4ccce349cae37343a68fcfe4314797b52000f514c3933e09531b1dcefb9210fa4695a5a5811b16aa65f0f5f7f9b9f1f2cc06891a
+	sha512sums = 816f6661d574cfbcd7d9fa76cfebe80701450b3357f1b5b92b62cdf8cea6f2bd186f6fb4beecd334523521f97f3e8f9327c0c8c3d8ba16f3a9a29d10640b5e50
 	sha512sums = 238c955f4b1e1157998af1f4c91f51adc6d0c71a5ca4a1494d11b7e881dabd336f0363310bde7256b5bfc8a520d4c2adbf30ffcab4fb8291875700fb4071e7fb
+	sha512sums = 5593ccf428c43ddc4202a4f1b83624beed285bd250e038e46a17379d5ce25f95c43df6515204df6bab69b28fc329386b93d90d1283f29b200ecbdec7fcf705ce
 
 pkgname = steam-native-webhelper
 
diff --git a/PKGBUILD b/PKGBUILD
index 081a57f4f00b..82ce1feb75a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Maarten de Vries <maarten@de-vri.es>
 
 pkgname=steam-native-webhelper
-pkgver=20190419
+pkgver=20190530
 pkgrel=1
 pkgdesc="hack to make steamwebhelper behave"
 license=(BSD)
@@ -12,17 +12,20 @@ depends=(steam-native-runtime)
 source=(
 	steam-native-webhelper
 	steamwebhelper.sh
-	steamwebhelper.sh.override
+	steamwebhelper.sh.override.f60cb3818ca4cb71
+	steamwebhelper.sh.override.8625e67eb3a5c5df
 )
 
 sha512sums=(
-	'6648380ec91664f49b33422e45cc952be50532759b5eab0cc10733d535c4d659e82a6f0dc6f32fd3906bf04e10e7adeaa8cc377eda011c39258c1c202c40fc56'
-	'd917d0b7f1666cc899e5d2e7765fbe532f7c679dec4b24fc35b7fb6954a714b93c32e7e58fd3c58f2b21278f117ef5b08774d4258dab726405528c3c9375e1bf'
+	'ee8ed713289727b0d304459f4ccce349cae37343a68fcfe4314797b52000f514c3933e09531b1dcefb9210fa4695a5a5811b16aa65f0f5f7f9b9f1f2cc06891a'
+	'816f6661d574cfbcd7d9fa76cfebe80701450b3357f1b5b92b62cdf8cea6f2bd186f6fb4beecd334523521f97f3e8f9327c0c8c3d8ba16f3a9a29d10640b5e50'
 	'238c955f4b1e1157998af1f4c91f51adc6d0c71a5ca4a1494d11b7e881dabd336f0363310bde7256b5bfc8a520d4c2adbf30ffcab4fb8291875700fb4071e7fb'
+	'5593ccf428c43ddc4202a4f1b83624beed285bd250e038e46a17379d5ce25f95c43df6515204df6bab69b28fc329386b93d90d1283f29b200ecbdec7fcf705ce'
 )
 
 package() {
-	install -m 755 -D "steamwebhelper.sh"          "$pkgdir/usr/lib/steam/steamwebhelper.sh"
-	install -m 755 -D "steamwebhelper.sh.override" "$pkgdir/usr/lib/steam/steamwebhelper.sh.override"
-	install -m 755 -D "steam-native-webhelper"     "$pkgdir/usr/bin/steam-native-webhelper"
+	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.f60cb3818ca4cb71" "$pkgdir/usr/lib/steam/steamwebhelper.sh.override.f60cb3818ca4cb71"
+	install -m 755 -D "steamwebhelper.sh.override.8625e67eb3a5c5df" "$pkgdir/usr/lib/steam/steamwebhelper.sh.override.8625e67eb3a5c5df"
 }
diff --git a/steam-native-webhelper b/steam-native-webhelper
index 7b4612bd47ec..f9a9a6ef5f2c 100644
--- a/steam-native-webhelper
+++ b/steam-native-webhelper
@@ -4,7 +4,9 @@ WEBHELPER_SHA256=($(sha256sum "$HOME/.local/share/Steam/ubuntu12_64/steamwebhelp
 WEBHELPER_SHA256="${WEBHELPER_SHA256[0]}"
 
 if [[ $WEBHELPER_SHA256 == "f60cb3818ca4cb716a8adf09ed7f1454aa6cdf775d8321f6ab1944db424d8790" ]]; then
-	cp /usr/lib/steam/steamwebhelper.sh.override "$HOME/.local/share/Steam/ubuntu12_64/steamwebhelper.sh"
+	cp /usr/lib/steam/steamwebhelper.sh.override.f60cb3818ca4cb71 "$HOME/.local/share/Steam/ubuntu12_64/steamwebhelper.sh"
+elif [[ $WEBHELPER_SHA256 == "8625e67eb3a5c5df91a17a7d9483770f02de6802b45274848a025900076130a6" ]]; then
+	cp /usr/lib/steam/steamwebhelper.sh.override.8625e67eb3a5c5df "$HOME/.local/share/Steam/ubuntu12_64/steamwebhelper.sh"
 fi
 
 exec steam-native "$@"
diff --git a/steamwebhelper.sh b/steamwebhelper.sh
index 291d15d9dd53..85240329500d 100644
--- a/steamwebhelper.sh
+++ b/steamwebhelper.sh
@@ -4,11 +4,26 @@ shift
 
 DIR="$(dirname "$old_arg_0")"
 cd ${DIR}
-export LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}:${DIR}"
-export SYSTEM_LD_LIBRARY_PATH="/usr/lib:/usr/lib32"
+
+# 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}"
+
+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" && -n "${SYSTEM_LD_LIBRARY_PATH}" ]]; then
-	export LD_LIBRARY_PATH="${SYSTEM_LD_LIBRARY_PATH:-}:${LD_LIBRARY_PATH}"
+	export LD_LIBRARY_PATH="/usr/lib:/usr/lib32:${LD_LIBRARY_PATH}"
 fi
+
 ./steamwebhelper "$@"
diff --git a/steamwebhelper.sh.override.8625e67eb3a5c5df b/steamwebhelper.sh.override.8625e67eb3a5c5df
new file mode 100644
index 000000000000..5a0fceffbb9c
--- /dev/null
+++ b/steamwebhelper.sh.override.8625e67eb3a5c5df
@@ -0,0 +1,3 @@
+#!/bin/bash
+exec /usr/lib/steam/steamwebhelper.sh "$0" "$@"
+#####‹“##########################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################
diff --git a/steamwebhelper.sh.override b/steamwebhelper.sh.override.f60cb3818ca4cb71
index 4bc3d9caf3e9..4bc3d9caf3e9 100644
--- a/steamwebhelper.sh.override
+++ b/steamwebhelper.sh.override.f60cb3818ca4cb71