[proton-experiment] Fix patch

4 files changed, 30 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ba81eea0066..00f302a3197a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -222,7 +222,7 @@ pkgbase = proton-experimental
 	sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3
 	sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75
 	sha256sums = 1286afc67b0a329f5e2d98d9e803ca5906a841ad5486e9b3b1fefa1124b15622
-	sha256sums = 4b38b10cca5502594b7582596b5173d9d3ca42f31f35ec1d89750b68e3aa14b6
-	sha256sums = 2b09fee9dedddf24ad96772ca8c98fe99a146d5c4a22d27a56564d24549a7fd8
+	sha256sums = 1a7304d8e26cfc91cc059f9129f8287ca32ab68f9ec20fd7997021c6602ba723
+	sha256sums = fd047f0a441ef3d761c291fedd44fe351c125ada51cabcaf102f85cbffaaed6f
 
 pkgname = proton-experimental
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index eb0309d03947..c7d58b315646 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,4 +1,4 @@
-From 25873128daf808994902e76ab5216b49225cc6c5 Mon Sep 17 00:00:00 2001
+From 3992d030fd6ddf53f0b997b382ff415242ea0c1d Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 26 Apr 2023 14:22:23 +0300
 Subject: [PATCH 1/2] AUR Pkgbuild changes
@@ -6,6 +6,7 @@ Subject: [PATCH 1/2] AUR Pkgbuild changes
 ---
  Makefile.in                    | 71 ++++++++++++++++++++++++++--------
  compatibilitytool.vdf.template |  2 +-
+ configure.sh                   |  2 +
  make/rules-autoconf.mk         |  4 +-
  make/rules-cargo.mk            |  4 +-
  make/rules-cmake.mk            |  4 +-
@@ -15,7 +16,7 @@ Subject: [PATCH 1/2] AUR Pkgbuild changes
  make/rules-winemaker.mk        |  2 +-
  proton                         |  6 +--
  toolmanifest_runtime.vdf       |  3 --
- 11 files changed, 81 insertions(+), 40 deletions(-)
+ 12 files changed, 83 insertions(+), 40 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
 index d2943e34..d66489ac 100644
@@ -254,6 +255,26 @@ index 5ac60e8b..e580cd20 100644
  
        "from_oslist"  "windows"
        "to_oslist"    "linux"
+diff --git a/configure.sh b/configure.sh
+index bc3ccc65..faa4d6e3 100755
+--- a/configure.sh
++++ b/configure.sh
+@@ -128,6 +128,7 @@ function configure() {
+     CONTAINER_MOUNT_OPTS=:Z
+   fi
+ 
++  if [ "$arg_container_engine" != "none" ]; then
+   if [[ -n "$arg_container_engine" ]]; then
+     check_container_engine "$arg_container_engine" "$steamrt_image" || die "Specified container engine \"$arg_container_engine\" doesn't work"
+   else
+@@ -140,6 +141,7 @@ function configure() {
+         die "${arg_container_engine:-Container engine discovery} has failed. Please fix your setup."
+     fi
+   fi
++  fi
+ 
+   stat "Using $arg_container_engine."
+ 
 diff --git a/make/rules-autoconf.mk b/make/rules-autoconf.mk
 index ad04eeb8..53eda5bc 100644
 --- a/make/rules-autoconf.mk
@@ -450,5 +471,5 @@ index beddcbbb..b6f36788 100644
 -  "compatmanager_layer_name" "proton"
  }
 -- 
-2.40.0
+2.40.1
 
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index d9321f5736fa..3f86a67a1a29 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From 1a9aae88ca69fd8aac67f3652de094d8f97cf39d Mon Sep 17 00:00:00 2001
+From 90ec68540933c224a30283d57fb1466cd536ebe1 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Sun, 19 Mar 2023 10:56:59 +0200
 Subject: [PATCH 2/2] AUR Do not update cargo crates
@@ -21,5 +21,5 @@ index 45bd7381..11e36c1d 100644
  	      -j$$(SUBJOBS) --locked --offline --verbose \
  	      --target "$$(CARGO_TARGET_$(3))" \
 -- 
-2.40.0
+2.40.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 5238012c9f97..ee5a4d88735f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -351,8 +351,8 @@ sha256sums=('SKIP'
             '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
             '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
             '1286afc67b0a329f5e2d98d9e803ca5906a841ad5486e9b3b1fefa1124b15622'
-            '4b38b10cca5502594b7582596b5173d9d3ca42f31f35ec1d89750b68e3aa14b6'
-            '2b09fee9dedddf24ad96772ca8c98fe99a146d5c4a22d27a56564d24549a7fd8')
+            '1a7304d8e26cfc91cc059f9129f8287ca32ab68f9ec20fd7997021c6602ba723'
+            'fd047f0a441ef3d761c291fedd44fe351c125ada51cabcaf102f85cbffaaed6f')
 # Optional patches
 sha256sums+=(
 )