wine: fix patch

Fixes #37524
2022-06-11 20:50:14 +02:00 · 2022-06-11 20:50:14 +02:00 · df7bf6bd1d
commit df7bf6bd1d
parent e997c195b4
1 changed files with 0 additions and 5 deletions
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@ -43,13 +43,8 @@ index 774a95ce003..d408e77cc78 100755
 
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
-<<<<<<< HEAD
--- a/wine-7.6/configure.ac
-+++ b/wine-7.6/configure.ac
-=======
 --- a/configure.ac
 +++ b/configure.ac
->>>>>>> 6dccb4ef9c (wine: patch into $build_wrksrc)
@@ -916,6 +916,9 @@ case $host_os in
     AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
     AC_SUBST(LIBWINE_DEPENDS,"wine.map")