[proton] Incorporate hwnd patch

8 files changed, 38 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 42fa2176c48c..3bb38e5a8a70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = proton
 	pkgdesc = Compatibility tool for Steam Play based on Wine and additional components
 	pkgver = 8.0.4
-	pkgrel = 7
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	install = proton.install
@@ -169,15 +169,15 @@ pkgbase = proton
 	source = 0002-AUR-Do-not-update-cargo-crates.patch
 	source = 0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
 	source = 0004-AUR-Strip-binaries-early.patch
-	source = fix_hwnd_changes_meaning.patch
+	source = 0005-AUR-Fix-hwnd-redefinition.patch
 	sha256sums = SKIP
 	sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3
 	sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75
 	sha256sums = 83f65c9292137a740c4b8ea730b61cee0dbbb82e4eb3607590ba2f4377827464
-	sha256sums = 1098fff9eacb95e4e824e13e3c14d302c2a9fb46371388e90184d41df61ef8ac
-	sha256sums = 728930a302a5b4fcf0f329c6a284861d6cecf843d8194a6f8c241037a0dfc5cc
-	sha256sums = bf351e776e1e7b1f78d864b3608c5752dcde97739194f970ce3802275c3907f0
-	sha256sums = 30c4204bb6ffae4f4a418e47c690bd072dee06d9526fc20723af47b9e070c6ff
-	sha256sums = 20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f
+	sha256sums = c77102316c60d65b61be44c64ae3e8f2d5e5aadd0fa19965c8a46bb247effd89
+	sha256sums = f6ee756585a63ad4f1e05a6778b1bf4bb955ae2148cd38b8daf29e4be74a96f5
+	sha256sums = fa5ac1680eebfe38e392d85b1b2f655c0f2039da393e7c5f3237f6df38368df6
+	sha256sums = 3503a51c55b93fbbffc4b09ad89e54febbf1b4eeebab4ae750af4357e1aa4297
+	sha256sums = 8a0d13276a71ed8e6d1a41435a8313170fed377a8280cf18ab56a10728a0ccc5
 
 pkgname = proton
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 81b7e715ae0f..25d61aee1c3f 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,7 +1,7 @@
 From 4d8a9f7fad342a14db10f53be8c03805a8e3165c Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Tue, 7 Feb 2023 21:58:22 +0200
-Subject: [PATCH 1/4] AUR Pkgbuild changes
+Subject: [PATCH 1/5] AUR Pkgbuild changes
 
 ---
  Makefile.in                    | 70 ++++++++++++++++++++++++++--------
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index b636d027ba74..cbc18f3e46ab 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,7 +1,7 @@
 From 8f975262e9eec74b7088c0bf2ec2b855b15baf1e 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/4] AUR Do not update cargo crates
+Subject: [PATCH 2/5] AUR Do not update cargo crates
 
 ---
  make/rules-cargo.mk | 2 --
diff --git a/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch b/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
index 9a383f39c13c..4cb466259d6c 100644
--- a/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
+++ b/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
@@ -1,7 +1,7 @@
 From bd60e922f127f01554cb87be227d9dcb84129a90 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 12 Jul 2023 03:16:34 +0300
-Subject: [PATCH 3/4] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
+Subject: [PATCH 3/5] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
  correct location in the prefix
 
 For some unknown to me reason, 32bit vkd3d (not vkd3d-proton) always links
diff --git a/0004-AUR-Strip-binaries-early.patch b/0004-AUR-Strip-binaries-early.patch
index 3d2c74ff69b6..3ebc69c5d991 100644
--- a/0004-AUR-Strip-binaries-early.patch
+++ b/0004-AUR-Strip-binaries-early.patch
@@ -1,7 +1,7 @@
 From 9abaa5a7a4d8e28ca19b8b4cbf17d1747fd19431 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 23 Aug 2023 19:31:35 +0300
-Subject: [PATCH 4/4] AUR Strip binaries early
+Subject: [PATCH 4/5] AUR Strip binaries early
 
 ---
  Makefile.in | 2 +-
diff --git a/fix_hwnd_changes_meaning.patch b/0005-AUR-Fix-hwnd-redefinition.patch
index 87b19a458885..502bb8186be1 100644
--- a/fix_hwnd_changes_meaning.patch
+++ b/0005-AUR-Fix-hwnd-redefinition.patch
@@ -1,5 +1,15 @@
+From 9777bbf78ebdc11224f861a7d097c3e8de6e015f Mon Sep 17 00:00:00 2001
+From: Stelios Tsampas <loathingkernel@gmail.com>
+Date: Thu, 28 Sep 2023 14:16:04 +0300
+Subject: [PATCH 5/5] AUR: Fix hwnd redefinition
+
+---
+ steam_helper/steam.cpp                       | 2 ++
+ vrclient_x64/vrclient_x64/json_converter.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
 diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp
-index 190a8c05..afe7916b 100644
+index 65b9c179..01e3b927 100644
 --- a/steam_helper/steam.cpp
 +++ b/steam_helper/steam.cpp
 @@ -34,7 +34,9 @@
@@ -10,8 +20,8 @@ index 190a8c05..afe7916b 100644
  #include <windows.h>
 +}
  #include <winternl.h>
+ #include <shlwapi.h>
  #include <shlobj.h>
- #include <string.h>
 diff --git a/vrclient_x64/vrclient_x64/json_converter.cpp b/vrclient_x64/vrclient_x64/json_converter.cpp
 index 83fd2ec0..64d209a2 100644
 --- a/vrclient_x64/vrclient_x64/json_converter.cpp
@@ -23,3 +33,6 @@ index 83fd2ec0..64d209a2 100644
  #include <wine/debug.h>
  
  WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
+-- 
+2.42.0
+
diff --git a/PKGBUILD b/PKGBUILD
index a35577f4b88b..6c9a76edec55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _commit=
 pkgver=8.0.4  # pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=8.0.1
-pkgrel=7
+pkgrel=2
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components"
 url="https://github.com/ValveSoftware/Proton"
@@ -87,7 +87,7 @@ source=(
     0002-AUR-Do-not-update-cargo-crates.patch
     0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
     0004-AUR-Strip-binaries-early.patch
-    fix_hwnd_changes_meaning.patch
+    0005-AUR-Fix-hwnd-redefinition.patch
 )
 # Optional patches
 source+=(
@@ -165,7 +165,7 @@ prepare() {
     #patch -p1 -i "$srcdir"/0002-AUR-Do-not-update-cargo-crates.patch
     patch -p1 -i "$srcdir"/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
     patch -p1 -i "$srcdir"/0004-AUR-Strip-binaries-early.patch
-    patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch
+    patch -p1 -i "$srcdir"/0005-AUR-Fix-hwnd-redefinition.patch
 }
 
 build() {
@@ -262,11 +262,11 @@ sha256sums=('SKIP'
             '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
             '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
             '83f65c9292137a740c4b8ea730b61cee0dbbb82e4eb3607590ba2f4377827464'
-            '1098fff9eacb95e4e824e13e3c14d302c2a9fb46371388e90184d41df61ef8ac'
-            '728930a302a5b4fcf0f329c6a284861d6cecf843d8194a6f8c241037a0dfc5cc'
-            'bf351e776e1e7b1f78d864b3608c5752dcde97739194f970ce3802275c3907f0'
-            '30c4204bb6ffae4f4a418e47c690bd072dee06d9526fc20723af47b9e070c6ff'
-            '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f')
+            'c77102316c60d65b61be44c64ae3e8f2d5e5aadd0fa19965c8a46bb247effd89'
+            'f6ee756585a63ad4f1e05a6778b1bf4bb955ae2148cd38b8daf29e4be74a96f5'
+            'fa5ac1680eebfe38e392d85b1b2f655c0f2039da393e7c5f3237f6df38368df6'
+            '3503a51c55b93fbbffc4b09ad89e54febbf1b4eeebab4ae750af4357e1aa4297'
+            '8a0d13276a71ed8e6d1a41435a8313170fed377a8280cf18ab56a10728a0ccc5')
 # Optional patches
 sha256sums+=(
 )
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index c87250c86dc3..5d2a6fc94b48 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -6,7 +6,7 @@ _commit=
 pkgver=8.0.4  # pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=8.0.1
-pkgrel=7
+pkgrel=2
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components"
 url="https://github.com/ValveSoftware/Proton"
@@ -87,7 +87,7 @@ source=(
     0002-AUR-Do-not-update-cargo-crates.patch
     0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
     0004-AUR-Strip-binaries-early.patch
-    fix_hwnd_changes_meaning.patch
+    0005-AUR-Fix-hwnd-redefinition.patch
 )
 # Optional patches
 source+=(
@@ -165,7 +165,7 @@ prepare() {
     #patch -p1 -i "$srcdir"/0002-AUR-Do-not-update-cargo-crates.patch
     patch -p1 -i "$srcdir"/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
     patch -p1 -i "$srcdir"/0004-AUR-Strip-binaries-early.patch
-    patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch
+    patch -p1 -i "$srcdir"/0005-AUR-Fix-hwnd-redefinition.patch
 }
 
 build() {
@@ -269,7 +269,7 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f')
+            '8a0d13276a71ed8e6d1a41435a8313170fed377a8280cf18ab56a10728a0ccc5')
 # Optional patches
 sha256sums+=(
 )