[proton] Strip binaries early

7 files changed, 50 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 728ffa538132..571ca51bf90d 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.3.3
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	install = proton.install
@@ -166,15 +166,17 @@ pkgbase = proton
 	source = https://github.com/madewokherd/wine-mono/releases/download/wine-mono-7.4.1/wine-mono-7.4.1-x86.tar.xz
 	source = 0001-AUR-Pkgbuild-changes.patch
 	source = 0002-AUR-Do-not-update-cargo-crates.patch
-	source = 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.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
 	sha256sums = SKIP
 	sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3
 	sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75
 	sha256sums = 1286afc67b0a329f5e2d98d9e803ca5906a841ad5486e9b3b1fefa1124b15622
-	sha256sums = e8f649ad4a7010fce360561b12de69cc37d6a2a6f4484fc990426cc68958d1b5
-	sha256sums = 96f1f6891a12dae0c8da9ba2407f5a69cac239e5f1a75b814d5053b86892127b
-	sha256sums = 48fa081f39997e3f8eb876dba94d77045a6e4df92739556f9ebb1a8ad6c4281d
+	sha256sums = 05ed7c49f0f6b9ddff5d4a8891c1b5e7ac8e0e7c9694c1571811eb20bf6eed85
+	sha256sums = 8c1b487777983958841f4f113f505d6d03d40c4d74868c7553e53b7f133b6c52
+	sha256sums = b507bae0ea4400d49e64ab31128cba14108598dd14fa097328fa967ee88fef4a
+	sha256sums = ae2c2eb53cd6a29463cf55cdf464084003ea5a1a9164e67bee0f544c2416233c
 	sha256sums = 20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f
 
 pkgname = proton
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index d126f226bb5e..950a30548f61 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,7 +1,7 @@
 From 30e1791d50391930e871ba17acb44d47a6d7bd83 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/3] AUR Pkgbuild changes
+Subject: [PATCH 1/4] 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 c5d1ce4d371c..a913d4f4f82c 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,7 +1,7 @@
 From fe1e557f5cbbd6091e47978a18ce4d182dfd7ed4 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/3] AUR Do not update cargo crates
+Subject: [PATCH 2/4] AUR Do not update cargo crates
 
 ---
  make/rules-cargo.mk | 2 --
diff --git a/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch b/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
index c3e2c5ed7046..7b9eb4863690 100644
--- a/0004-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 6ec0e7d263b1026f2703cb19c5444fd7eb22663b 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/3] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
+Subject: [PATCH 3/4] 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
new file mode 100644
index 000000000000..1891a7777442
--- /dev/null
+++ b/0004-AUR-Strip-binaries-early.patch
@@ -0,0 +1,25 @@
+From 34d79fa09479b0961c8fe89af0a1ee10e2ddcda1 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
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1fc3af27..c061be3c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -54,7 +54,7 @@ CFLAGS         ?= -O2 -march=nocona -mtune=core-avx2
+ OPTIMIZE_FLAGS := $(CFLAGS) -mfpmath=sse
+ SANITY_FLAGS   := -fwrapv -fno-strict-aliasing
+ DEBUG_FLAGS    := -ggdb -ffunction-sections -fdata-sections -fno-omit-frame-pointer
+-COMMON_FLAGS    = $(DEBUG_FLAGS) $(OPTIMIZE_FLAGS) $(SANITY_FLAGS) -ffile-prefix-map=$(CCACHE_BASEDIR)=.
++COMMON_FLAGS    = -s $(OPTIMIZE_FLAGS) $(SANITY_FLAGS) -ffile-prefix-map=$(CCACHE_BASEDIR)=.
+ COMMON_FLAGS32 := -mstackrealign -mno-avx
+ COMMON_FLAGS64 := -mcmodel=small
+ CARGO_BUILD_ARG := --release
+-- 
+2.41.0
+
diff --git a/PKGBUILD b/PKGBUILD
index fd0c6ee8084f..b966f9eec17c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _commit=
 pkgver=8.0.3.3  # pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=7.4.1
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components"
 url="https://github.com/ValveSoftware/Proton"
@@ -85,7 +85,8 @@ source=(
     https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${_monover}/wine-mono-${_monover}-x86.tar.xz
     0001-AUR-Pkgbuild-changes.patch
     0002-AUR-Do-not-update-cargo-crates.patch
-    0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
+    0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
+    0004-AUR-Strip-binaries-early.patch
     fix_hwnd_changes_meaning.patch
 )
 # Optional patches
@@ -156,7 +157,8 @@ prepare() {
 
     patch -p1 -i "$srcdir"/0001-AUR-Pkgbuild-changes.patch
     patch -p1 -i "$srcdir"/0002-AUR-Do-not-update-cargo-crates.patch
-    patch -p1 -i "$srcdir"/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.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
 }
 
@@ -254,9 +256,10 @@ sha256sums=('SKIP'
             '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
             '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
             '1286afc67b0a329f5e2d98d9e803ca5906a841ad5486e9b3b1fefa1124b15622'
-            'e8f649ad4a7010fce360561b12de69cc37d6a2a6f4484fc990426cc68958d1b5'
-            '96f1f6891a12dae0c8da9ba2407f5a69cac239e5f1a75b814d5053b86892127b'
-            '48fa081f39997e3f8eb876dba94d77045a6e4df92739556f9ebb1a8ad6c4281d'
+            '05ed7c49f0f6b9ddff5d4a8891c1b5e7ac8e0e7c9694c1571811eb20bf6eed85'
+            '8c1b487777983958841f4f113f505d6d03d40c4d74868c7553e53b7f133b6c52'
+            'b507bae0ea4400d49e64ab31128cba14108598dd14fa097328fa967ee88fef4a'
+            'ae2c2eb53cd6a29463cf55cdf464084003ea5a1a9164e67bee0f544c2416233c'
             '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f')
 # Optional patches
 sha256sums+=(
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index 72cd706aed40..9691c63ec3ce 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -6,7 +6,7 @@ _commit=
 pkgver=8.0.3.3  # pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=7.4.1
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components"
 url="https://github.com/ValveSoftware/Proton"
@@ -85,7 +85,8 @@ source=(
     https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${_monover}/wine-mono-${_monover}-x86.tar.xz
     0001-AUR-Pkgbuild-changes.patch
     0002-AUR-Do-not-update-cargo-crates.patch
-    0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
+    0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
+    0004-AUR-Strip-binaries-early.patch
     fix_hwnd_changes_meaning.patch
 )
 # Optional patches
@@ -156,7 +157,8 @@ prepare() {
 
     patch -p1 -i "$srcdir"/0001-AUR-Pkgbuild-changes.patch
     patch -p1 -i "$srcdir"/0002-AUR-Do-not-update-cargo-crates.patch
-    patch -p1 -i "$srcdir"/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.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
 }
 
@@ -260,6 +262,7 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
+            'SKIP'
             '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f')
 # Optional patches
 sha256sums+=(