Skip to content

Commit e9d2178

Browse files
misc. cleanup
1 parent b945c40 commit e9d2178

8 files changed

+3
-951
lines changed

Vulkan-Loader

Submodule Vulkan-Loader deleted from 538b267

configure.sh

+3
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ check_container_engine() {
6464
if [[ $inner_uid == *"Permission denied"* ]]; then
6565
err "The container cannot access files. Are you using SELinux?"
6666
die "Please read README.md and check your $1 setup works."
67+
elif [[ $inner_uid == *"Emulate Docker CLI"* ]]; then
68+
err "Detected podman-docker in use without the warning being silenced."
69+
die "Please create /etc/containers/nodocker or specify --container-engine=podman."
6770
elif [ "$inner_uid" -eq 0 ]; then
6871
# namespace maps the user as root or the build is performed as host's root
6972
ROOTLESS_CONTAINER=1

patches/protonprep-valve-staging.sh

-7
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,6 @@
8686
patch -Np1 < ../patches/wine-hotfixes/pending/webview2.patch
8787
patch -Np1 < ../patches/wine-hotfixes/pending/webview2-install-fix.patch
8888

89-
echo "WINE: -PENDING- taskschd (NCSoft Purple Client)"
90-
patch -Np1 < ../patches/wine-hotfixes/pending/0001-taskschd-ncsoft-purple-5153.patch
91-
patch -Np1 < ../patches/wine-hotfixes/pending/0002-taskschd-ncsoft-purple-5143.patch
92-
patch -Np1 < ../patches/wine-hotfixes/pending/0003-taskschd-ncsoft-purple-5142.patch
93-
patch -Np1 < ../patches/wine-hotfixes/pending/0004-taskschd-ncsoft-purple-5175.patch
94-
patch -Np1 < ../patches/wine-hotfixes/pending/0005-taskschd-ncsoft-purple-5103.patch
95-
9689
### END WINE PENDING UPSTREAM SECTION ###
9790

9891
popd

patches/wine-hotfixes/pending/0001-taskschd-ncsoft-purple-5153.patch

-115
This file was deleted.

patches/wine-hotfixes/pending/0002-taskschd-ncsoft-purple-5143.patch

-26
This file was deleted.

0 commit comments

Comments
 (0)