summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStelios Tsampas2024-03-04 20:48:21 +0200
committerStelios Tsampas2024-03-04 20:48:21 +0200
commit26eaad4f956121ea964bef11759d20b31fe38c52 (patch)
tree46d8efb3c000ce8d771b5d63d98c108774a3dedf
parentf9c806b62b275b39f2772e5d17e41f3a0e970190 (diff)
downloadaur-26eaad4f956121ea964bef11759d20b31fe38c52.tar.gz
[proton-experimental] Fix borked patch
-rw-r--r--.SRCINFO14
-rw-r--r--0001-AUR-Pkgbuild-changes.patch8
-rw-r--r--0002-AUR-Do-not-update-cargo-crates.patch2
-rw-r--r--0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch4
-rw-r--r--0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch2
-rw-r--r--0005-AUR-Strip-binaries-early.patch4
-rw-r--r--0006-AUR-Fix-hwnd-redefinition.patch2
-rw-r--r--0007-AUR-Enable-winewayland.patch4
-rw-r--r--PKGBUILD14
9 files changed, 27 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index be0055c4bca1..c12d7ee90f2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -148,13 +148,13 @@ pkgbase = proton-experimental
sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6
sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814
sha256sums = d73d440c08ebd67c93fbd6534f4f1b4e98aa07342f9c7d98c8aaeb74755eb9cf
- sha256sums = f32cd6bfcc189a172ef7c0336264d24b870eef88c4e0feca3620b1411fbecb44
- sha256sums = bf93c46e251d16c81688a843cbd0e0d3e5dd618139af050470d8597725c45e40
- sha256sums = ecf97bbbfae0d9d8edef635189ab47d85d93b363fd6e71a9f3616469fdf9f309
- sha256sums = 73e74744f09db1ecee9866cd0131a27c6634cd68175d5db39a8d865bedf11117
- sha256sums = b858409f6cab4b901becbdf5b029174e7f07516d0431664dcf3f245648e2a3f5
- sha256sums = 79ef58fa41ab5f5b97897f083790a52abbcd2d0611104050e61b4a78fb049af1
- sha256sums = 05d66721a83cf4e6939bd082edd54fe0e025713a4b951b68fdf61bc9c79e4f06
+ sha256sums = 0d416d251da423e4c21a4ae2a7aba5cd28a522231981657d33e250c8c740f1fe
+ sha256sums = a0efa9e3020c348bd47601fb753e1e053eb00867837afac055631295ed7df765
+ sha256sums = 4af57781b6e81f0ac5ed1b1ab1a0fdaea92e1992e67d69d37a92334962921f5b
+ sha256sums = a3667c3fe517ea856dc7a5ab73fb5e10b20e5743f66f72d35b9a42394ed31701
+ sha256sums = fce16c5db9950068a3c965fd87e9194bbe13ead8a2c02d4710884c3669e236e5
+ sha256sums = 89baf181f197a6156507841c018fd81c8f934f77161ba90f5ee6466677428235
+ sha256sums = b7297cabb316eb9621ec1abade892143392eba5fdbd3bd496df7992a7c9d7358
sha256sums = 3d308f8e87361669267fa52b986c24f1dea1913156a045f43ea04e02f7444b18
sha256sums = 0f9ddda17319e3ef23ee847c0a740bf74847796d4b3cf61b05feb9aa3141b7c7
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index add446eca32a..d91dc466e7d6 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,4 +1,4 @@
-From 198ff97d9760fc05fd7f1d207efd997667f4417e Mon Sep 17 00:00:00 2001
+From 3da3f55c35491f6ae90b290a4c62ba4f9b66456d 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/7] AUR Pkgbuild changes
@@ -20,7 +20,7 @@ Subject: [PATCH 1/7] AUR Pkgbuild changes
13 files changed, 89 insertions(+), 43 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index b88483f7..a4ccd4e0 100644
+index b88483f7..822f0382 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,11 +50,12 @@ else
@@ -128,8 +128,8 @@ index b88483f7..a4ccd4e0 100644
+FFMPEG_LTO_OPTS64 := --disable-inline-asm
+FFMPEG_LTO_OPTS32 := --disable-inline-asm
-+FFMPEG_CONFIGURE_ARGS64 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS64) $(FFMPEG_LTO_OPTS64)"
-+FFMPEG_CONFIGURE_ARGS32 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS32) $(FFMPEG_LTO_OPTS32)"
++FFMPEG_CONFIGURE_ARGS64 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS64)" $(FFMPEG_LTO_OPTS64)
++FFMPEG_CONFIGURE_ARGS32 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS32)" $(FFMPEG_LTO_OPTS32)
+
$(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
$(eval $(call rules-configure,ffmpeg,32))
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index ed2adea30b6c..324fe2185eef 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From da1738f62278ad06ed20ec9dc45cd37ecb29e8ac Mon Sep 17 00:00:00 2001
+From e56f19a70609d6b149900e266b93733c8d8e235d 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/7] AUR Do not update cargo crates
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 457618dfb12f..d4fdcab4cca2 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,4 +1,4 @@
-From e322bee3a668aae7d2bfae2abba2a69271263470 Mon Sep 17 00:00:00 2001
+From ace3ffd629ec4e7ae959c1652175fb53e52898f4 Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Wed, 12 Jul 2023 17:53:47 +0300
Subject: [PATCH 3/7] AUR Remove kaldi, openfst, vosk-api modules because of
@@ -9,7 +9,7 @@ Subject: [PATCH 3/7] AUR Remove kaldi, openfst, vosk-api modules because of
1 file changed, 1 insertion(+), 81 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index a4ccd4e0..fc71a5d1 100644
+index 822f0382..7aefa09f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -404,86 +404,6 @@ $(OBJ)/.steamexe-post-build64:
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 25fef518ee17..98a72e507c4a 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,4 +1,4 @@
-From 3a0968c9b642c40b901014726d3a32b459aab87e Mon Sep 17 00:00:00 2001
+From a137852fa5dbebf4d04d1061037583b9701d5583 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/7] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
diff --git a/0005-AUR-Strip-binaries-early.patch b/0005-AUR-Strip-binaries-early.patch
index 29005e2a1a00..34fbf8298f35 100644
--- a/0005-AUR-Strip-binaries-early.patch
+++ b/0005-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From 6ec6617bd7d0b24f0101b6001a764193cd48d017 Mon Sep 17 00:00:00 2001
+From fbc0b1bc96f65cbcc5b80637213f2a81aab63bc8 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/7] AUR Strip binaries early
@@ -8,7 +8,7 @@ Subject: [PATCH 5/7] AUR Strip binaries early
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
-index fc71a5d1..a80e5262 100644
+index 7aefa09f..99ee6e17 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,7 +54,7 @@ CFLAGS ?= -O2 -march=nocona -mtune=core-avx2
diff --git a/0006-AUR-Fix-hwnd-redefinition.patch b/0006-AUR-Fix-hwnd-redefinition.patch
index 4a71d297c35c..2a0aef9a90d1 100644
--- a/0006-AUR-Fix-hwnd-redefinition.patch
+++ b/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From 44f51474947445efb1ed04cd7b69938151139a91 Mon Sep 17 00:00:00 2001
+From 7d5893ec2a883e01cfb0d198a93b5655a312b338 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/7] AUR: Fix hwnd redefinition
diff --git a/0007-AUR-Enable-winewayland.patch b/0007-AUR-Enable-winewayland.patch
index b8c6a11ab2ba..9385310c0e04 100644
--- a/0007-AUR-Enable-winewayland.patch
+++ b/0007-AUR-Enable-winewayland.patch
@@ -1,4 +1,4 @@
-From 4569aceed6267eaeffa0fd1f9f6e4c510a548076 Mon Sep 17 00:00:00 2001
+From 41b57a46854d8c6e78050434128f020aad6e03e0 Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Thu, 29 Feb 2024 15:28:48 +0200
Subject: [PATCH 7/7] AUR Enable winewayland
@@ -9,7 +9,7 @@ Subject: [PATCH 7/7] AUR Enable winewayland
2 files changed, 9 insertions(+)
diff --git a/Makefile.in b/Makefile.in
-index a80e5262..ede0804a 100644
+index 99ee6e17..581b981c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -426,6 +426,7 @@ WINE_SOURCE_ARGS = \
diff --git a/PKGBUILD b/PKGBUILD
index f98fe05ec166..82d27ced88fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -277,12 +277,12 @@ sha256sums=('SKIP'
'2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6'
'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814'
'd73d440c08ebd67c93fbd6534f4f1b4e98aa07342f9c7d98c8aaeb74755eb9cf'
- 'f32cd6bfcc189a172ef7c0336264d24b870eef88c4e0feca3620b1411fbecb44'
- 'bf93c46e251d16c81688a843cbd0e0d3e5dd618139af050470d8597725c45e40'
- 'ecf97bbbfae0d9d8edef635189ab47d85d93b363fd6e71a9f3616469fdf9f309'
- '73e74744f09db1ecee9866cd0131a27c6634cd68175d5db39a8d865bedf11117'
- 'b858409f6cab4b901becbdf5b029174e7f07516d0431664dcf3f245648e2a3f5'
- '79ef58fa41ab5f5b97897f083790a52abbcd2d0611104050e61b4a78fb049af1'
- '05d66721a83cf4e6939bd082edd54fe0e025713a4b951b68fdf61bc9c79e4f06'
+ '0d416d251da423e4c21a4ae2a7aba5cd28a522231981657d33e250c8c740f1fe'
+ 'a0efa9e3020c348bd47601fb753e1e053eb00867837afac055631295ed7df765'
+ '4af57781b6e81f0ac5ed1b1ab1a0fdaea92e1992e67d69d37a92334962921f5b'
+ 'a3667c3fe517ea856dc7a5ab73fb5e10b20e5743f66f72d35b9a42394ed31701'
+ 'fce16c5db9950068a3c965fd87e9194bbe13ead8a2c02d4710884c3669e236e5'
+ '89baf181f197a6156507841c018fd81c8f934f77161ba90f5ee6466677428235'
+ 'b7297cabb316eb9621ec1abade892143392eba5fdbd3bd496df7992a7c9d7358'
'3d308f8e87361669267fa52b986c24f1dea1913156a045f43ea04e02f7444b18'
'0f9ddda17319e3ef23ee847c0a740bf74847796d4b3cf61b05feb9aa3141b7c7')