summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--0001-AUR-Pkgbuild-changes.patch2
-rw-r--r--0002-AUR-Do-not-update-cargo-crates.patch2
-rw-r--r--0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch2
-rw-r--r--0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch2
-rw-r--r--0005-AUR-Strip-binaries-early.patch2
-rw-r--r--0006-AUR-Fix-hwnd-redefinition.patch2
-rw-r--r--0007-AUR-Disable-incompatible-pointer-types-in-Wine-GCC-1.patch26
-rw-r--r--PKGBUILD15
9 files changed, 49 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b4c7bcccd0c7..686a0486ac63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -146,16 +146,18 @@ pkgbase = proton-ge-custom
source = 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
source = 0005-AUR-Strip-binaries-early.patch
source = 0006-AUR-Fix-hwnd-redefinition.patch
+ source = 0007-AUR-Disable-incompatible-pointer-types-in-Wine-GCC-1.patch
sha256sums = 324f0ca2cafe55893af0ce6f9b86c9db8ff1ffbf507da77a2d60ceb113d08c99
sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6
sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814
sha256sums = 601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767
sha256sums = 50ce2cc85162343e62340b0ca7994ceba94592ab395fb99711e94e108e991f0c
- sha256sums = 6a08420d44740c14cc22e029ec38e0b80011caa99e1e399d442c250104b7b9e0
- sha256sums = 981c46b5bfe403ab5b834cde0544192a6af797942a5e4633e5cd6327a475b3da
- sha256sums = 622d189e03180eaaf5ed03a20265e4486a65480cf2ed63793393b121731ababa
- sha256sums = 9062e5e8fef9f1ce86f7e37d4de8af11e9f66afd466a5939587b16278206cc0a
- sha256sums = 92a0f078362aab6d37ceb1690409f468c6d0c0630d29653bedcf49e9d33cda2a
- sha256sums = af6cf93eebfbd0ba63ee54d9d4d69c1790090edfcb6a8a1dee7d01662da3a4ac
+ sha256sums = 00a1e8cc92e83e613c6007bd056e85727d92d73f357e4d38b30c5fb42d547e32
+ sha256sums = c10cb410eea86ffe5e82498599fda712b5a287f75329bbe8c19360468bfd7a02
+ sha256sums = 0ed6267f6c865a3dd3fb9afed47d7b4401c992fc0ada9c09e789b3ebb77a8648
+ sha256sums = b4afa84e38be6a501ff8c75561f18d14539b1d1b1178adb8b906cd42e7204a6e
+ sha256sums = c480259a891e6b1cc1504a7b11501b550e998c515172ab10ccb5bc0327dacc24
+ sha256sums = 3bf176a07063c16c76f8fa7daad1888ab5004cad8c0879e327eed9b1a5b04710
+ sha256sums = 61fed547b22fd24f5fcd3b08709c3745d147669a32a16888133cbd08091b7874
pkgname = proton-ge-custom
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index abb31b819652..b9c183970b3b 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,7 +1,7 @@
From ec0126e8c1ac948d4823f4b086e24241fe3e441b Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Tue, 7 Feb 2023 22:00:48 +0200
-Subject: [PATCH 1/6] AUR Pkgbuild changes
+Subject: [PATCH 1/7] AUR Pkgbuild changes
---
Makefile.in | 74 ++++++++++++++++++++++++++--------
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index bef6f9829919..24a4b56ab1d2 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,7 +1,7 @@
From 5d641b7911a5c3285ce668a635c4024878d15de9 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/6] AUR Do not update cargo crates
+Subject: [PATCH 2/7] AUR Do not update cargo crates
---
make/rules-cargo.mk | 2 --
diff --git a/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch b/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
index c6057df57a64..ba0836f34cb3 100644
--- a/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
+++ b/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
@@ -1,7 +1,7 @@
From 5fce541cf02ddcefee6664686d5e16d1a4b63a20 Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Wed, 12 Jul 2023 17:56:34 +0300
-Subject: [PATCH 3/6] AUR Remove kaldi, openfst, vosk-api modules because of
+Subject: [PATCH 3/7] AUR Remove kaldi, openfst, vosk-api modules because of
missing blas, lapack lib32 from Arch
---
diff --git a/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch b/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
index a8cad5ebfe4f..1ac5f934f7a3 100644
--- a/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
+++ b/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
@@ -1,7 +1,7 @@
From ac8cb7143e72649078f5a042568259a7f07e1643 Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Wed, 12 Jul 2023 03:16:34 +0300
-Subject: [PATCH 4/6] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
+Subject: [PATCH 4/7] 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/0005-AUR-Strip-binaries-early.patch b/0005-AUR-Strip-binaries-early.patch
index 5b7f4bbe8dd2..5fa5a4b0b97d 100644
--- a/0005-AUR-Strip-binaries-early.patch
+++ b/0005-AUR-Strip-binaries-early.patch
@@ -1,7 +1,7 @@
From d9f3dd0e213a5f788ffd7c53d28c9ed4fe50f87b Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Wed, 23 Aug 2023 19:31:35 +0300
-Subject: [PATCH 5/6] AUR Strip binaries early
+Subject: [PATCH 5/7] AUR Strip binaries early
---
Makefile.in | 2 +-
diff --git a/0006-AUR-Fix-hwnd-redefinition.patch b/0006-AUR-Fix-hwnd-redefinition.patch
index da2c44264824..bddf17f9d71e 100644
--- a/0006-AUR-Fix-hwnd-redefinition.patch
+++ b/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,7 +1,7 @@
From b297a1a2edae6695cc79852aa35bf1c0c3cb931e Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Thu, 28 Sep 2023 14:16:04 +0300
-Subject: [PATCH 6/6] AUR: Fix hwnd redefinition
+Subject: [PATCH 6/7] AUR: Fix hwnd redefinition
---
steam_helper/steam.cpp | 4 ++++
diff --git a/0007-AUR-Disable-incompatible-pointer-types-in-Wine-GCC-1.patch b/0007-AUR-Disable-incompatible-pointer-types-in-Wine-GCC-1.patch
new file mode 100644
index 000000000000..017ae571a0fe
--- /dev/null
+++ b/0007-AUR-Disable-incompatible-pointer-types-in-Wine-GCC-1.patch
@@ -0,0 +1,26 @@
+From d624fd5bcd60817fd2b38eb3c616834deee06538 Mon Sep 17 00:00:00 2001
+From: Stelios Tsampas <loathingkernel@gmail.com>
+Date: Sat, 11 May 2024 21:58:52 +0300
+Subject: [PATCH 7/7] AUR: Disable incompatible-pointer-types in Wine (GCC 14)
+
+---
+ Makefile.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7056890f..5f32f2b4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -634,6 +634,9 @@ WINE_CONFIGURE_ARGS64 = --enable-win64 \
+ VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_DST64)/include -I$(VKD3D_DST64)/include/vkd3d" \
+ VKD3D_PE_LIBS="-L$(VKD3D_DST64)/bin -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll"
+
++WINE_CFLAGS = \
++ -Wno-incompatible-pointer-types \
++
+ WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d
+
+ $(eval $(call rules-source,wine,$(SRCDIR)/wine))
+--
+2.45.0
+
diff --git a/PKGBUILD b/PKGBUILD
index d2a476ccc785..5b983a404b59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -96,6 +96,7 @@ source=(
0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
0005-AUR-Strip-binaries-early.patch
0006-AUR-Fix-hwnd-redefinition.patch
+ 0007-AUR-Disable-incompatible-pointer-types-in-Wine-GCC-1.patch
)
noextract=(
wine-gecko-${_geckover}-{x86,x86_64}.tar.xz
@@ -171,6 +172,7 @@ prepare() {
patch -p1 -i "$srcdir"/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
patch -p1 -i "$srcdir"/0005-AUR-Strip-binaries-early.patch
patch -p1 -i "$srcdir"/0006-AUR-Fix-hwnd-redefinition.patch
+ patch -p1 -i "$srcdir"/0007-AUR-Disable-incompatible-pointer-types-in-Wine-GCC-1.patch
}
build() {
@@ -263,9 +265,10 @@ sha256sums=('324f0ca2cafe55893af0ce6f9b86c9db8ff1ffbf507da77a2d60ceb113d08c99'
'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814'
'601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767'
'50ce2cc85162343e62340b0ca7994ceba94592ab395fb99711e94e108e991f0c'
- '6a08420d44740c14cc22e029ec38e0b80011caa99e1e399d442c250104b7b9e0'
- '981c46b5bfe403ab5b834cde0544192a6af797942a5e4633e5cd6327a475b3da'
- '622d189e03180eaaf5ed03a20265e4486a65480cf2ed63793393b121731ababa'
- '9062e5e8fef9f1ce86f7e37d4de8af11e9f66afd466a5939587b16278206cc0a'
- '92a0f078362aab6d37ceb1690409f468c6d0c0630d29653bedcf49e9d33cda2a'
- 'af6cf93eebfbd0ba63ee54d9d4d69c1790090edfcb6a8a1dee7d01662da3a4ac')
+ '00a1e8cc92e83e613c6007bd056e85727d92d73f357e4d38b30c5fb42d547e32'
+ 'c10cb410eea86ffe5e82498599fda712b5a287f75329bbe8c19360468bfd7a02'
+ '0ed6267f6c865a3dd3fb9afed47d7b4401c992fc0ada9c09e789b3ebb77a8648'
+ 'b4afa84e38be6a501ff8c75561f18d14539b1d1b1178adb8b906cd42e7204a6e'
+ 'c480259a891e6b1cc1504a7b11501b550e998c515172ab10ccb5bc0327dacc24'
+ '3bf176a07063c16c76f8fa7daad1888ab5004cad8c0879e327eed9b1a5b04710'
+ '61fed547b22fd24f5fcd3b08709c3745d147669a32a16888133cbd08091b7874')