ports/contrib (3.5): wine-staging: updated to version 5.7
commit 87479bc218c4e56f823a49ce4646ef055d75448e Author: Matt Housh <jaeger@crux.ninja> Date: Mon Apr 27 16:09:26 2020 -0500 wine-staging: updated to version 5.7 diff --git a/wine-staging/.footprint b/wine-staging/.footprint index 5eb048d95..1236b5c86 100644 --- a/wine-staging/.footprint +++ b/wine-staging/.footprint @@ -2176,6 +2176,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/pstorec.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/qasf.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/qcap.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/qdvd.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/qedit.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/qmgr.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/qmgrprxy.dll @@ -2327,7 +2328,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/winemsibuilder.exe -rw-r--r-- root/root usr/lib/wine/fakedlls/winepath.exe -rw-r--r-- root/root usr/lib/wine/fakedlls/wineps.drv --rw-r--r-- root/root usr/lib/wine/fakedlls/winepulse.drv +-rw-r--r-- root/root usr/lib/wine/fakedlls/wineusb.sys -rw-r--r-- root/root usr/lib/wine/fakedlls/winevulkan.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/winex11.drv -rw-r--r-- root/root usr/lib/wine/fakedlls/wing32.dll @@ -2617,7 +2618,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/libwbemuuid.a -rw-r--r-- root/root usr/lib/wine/libwebservices.def -rw-r--r-- root/root usr/lib/wine/libwer.def --rw-r--r-- root/root usr/lib/wine/libwindowscodecs.def +-rw-r--r-- root/root usr/lib/wine/libwindowscodecs.a -rw-r--r-- root/root usr/lib/wine/libwindowscodecsext.def -rw-r--r-- root/root usr/lib/wine/libwinecrt0.a -rw-r--r-- root/root usr/lib/wine/libwined3d.def @@ -2804,6 +2805,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rwxr-xr-x root/root usr/lib/wine/pstorec.dll.so -rwxr-xr-x root/root usr/lib/wine/qasf.dll.so -rwxr-xr-x root/root usr/lib/wine/qcap.dll.so +-rwxr-xr-x root/root usr/lib/wine/qdvd.dll.so -rwxr-xr-x root/root usr/lib/wine/qedit.dll.so -rwxr-xr-x root/root usr/lib/wine/qmgr.dll.so -rwxr-xr-x root/root usr/lib/wine/qmgrprxy.dll.so @@ -2955,7 +2957,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rwxr-xr-x root/root usr/lib/wine/winemsibuilder.exe.so -rwxr-xr-x root/root usr/lib/wine/winepath.exe.so -rwxr-xr-x root/root usr/lib/wine/wineps.drv.so --rwxr-xr-x root/root usr/lib/wine/winepulse.drv.so +-rwxr-xr-x root/root usr/lib/wine/wineusb.sys.so -rwxr-xr-x root/root usr/lib/wine/winevulkan.dll.so -rwxr-xr-x root/root usr/lib/wine/winex11.drv.so -rwxr-xr-x root/root usr/lib/wine/wing32.dll.so @@ -4171,6 +4173,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/pstorec.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/qasf.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/qcap.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/qdvd.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/qedit.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/qmgr.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/qmgrprxy.dll @@ -4651,7 +4654,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/libwbemuuid.a -rw-r--r-- root/root usr/lib32/wine/libwebservices.def -rw-r--r-- root/root usr/lib32/wine/libwer.def --rw-r--r-- root/root usr/lib32/wine/libwindowscodecs.def +-rw-r--r-- root/root usr/lib32/wine/libwindowscodecs.a -rw-r--r-- root/root usr/lib32/wine/libwindowscodecsext.def -rw-r--r-- root/root usr/lib32/wine/libwinecrt0.a -rw-r--r-- root/root usr/lib32/wine/libwined3d.def @@ -4854,6 +4857,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rwxr-xr-x root/root usr/lib32/wine/pstorec.dll.so -rwxr-xr-x root/root usr/lib32/wine/qasf.dll.so -rwxr-xr-x root/root usr/lib32/wine/qcap.dll.so +-rwxr-xr-x root/root usr/lib32/wine/qdvd.dll.so -rwxr-xr-x root/root usr/lib32/wine/qedit.dll.so -rwxr-xr-x root/root usr/lib32/wine/qmgr.dll.so -rwxr-xr-x root/root usr/lib32/wine/qmgrprxy.dll.so @@ -5184,7 +5188,7 @@ drwxr-xr-x root/root usr/share/wine/gecko/ -rwxr-xr-x root/root usr/share/wine/gecko/wine-gecko-2.47.1-x86.msi -rwxr-xr-x root/root usr/share/wine/gecko/wine-gecko-2.47.1-x86_64.msi drwxr-xr-x root/root usr/share/wine/mono/ --rwxr-xr-x root/root usr/share/wine/mono/wine-mono-4.9.4.msi +-rwxr-xr-x root/root usr/share/wine/mono/wine-mono-5.0.0-x86.msi drwxr-xr-x root/root usr/share/wine/nls/ -rw-r--r-- root/root usr/share/wine/nls/c_037.nls -rw-r--r-- root/root usr/share/wine/nls/c_10000.nls @@ -5261,3 +5265,4 @@ drwxr-xr-x root/root usr/share/wine/nls/ -rw-r--r-- root/root usr/share/wine/wine.inf -rw-r--r-- root/root usr/share/wine/winebus.inf -rw-r--r-- root/root usr/share/wine/winehid.inf +-rw-r--r-- root/root usr/share/wine/wineusb.inf diff --git a/wine-staging/.signature b/wine-staging/.signature index 67bcde1ca..123aad624 100644 --- a/wine-staging/.signature +++ b/wine-staging/.signature @@ -1,9 +1,10 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31xrJWaT048HdVKSQKucXez9kavciPiRjNCuDDeFEQBheVxfPevwAdv+iVkF1FQtg+YQ42TcA4HjqJ6bIeXqIgU= -SHA256 (Pkgfile) = ca2b869f39f19ec656b505b7da74a879c4f8de0de94b80fa993577e82ad00fe4 -SHA256 (.footprint) = fb23483ea42dece36d377dee77a2f3f848cffe57786355562b05760cb323212f -SHA256 (wine-5.6.tar.xz) = 50198a7e71d58fbdc521bbfde8b45bd9727b6cff5c8f101b586bc455d1bc00e6 -SHA256 (wine-staging-5.6.1.tar.gz) = 1fc25812ba1794caad5c5826e24823a2ebc9eead68e26894c1062b5790a62ad1 +RWSagIOpLGJF3yUErR7g5hmR5Fr5VPEG1MCN2VbYFAynBehxdyeBF7FGEZCX56sij8gTv4PkXDCAmZbHveCJtGvLECcOvFyB4wQ= +SHA256 (Pkgfile) = 67b1cb535ab7857a8fc26cba8afa2b5434620e6bf21029249f964b69622190c2 +SHA256 (.footprint) = bd594788e09d3d0462b7d5a458b15b22524e8ce249bc324458394c2e5074b243 +SHA256 (wine-5.7.tar.xz) = 16c99b9c6db56f75fcc2c6b3cbae400db1da1f750edba0249fd0fc288a9b4712 +SHA256 (wine-staging-5.7.tar.gz) = c132e4d5f545699f11c5bc1d54ebbb7d8e49281abfb6a0f8896ebf0d1f1fbd96 SHA256 (wine-gecko-2.47.1-x86.msi) = f00b0e2892404827e8ce6811dedfc25ae699a09955bb3df1bbb31753e51da051 SHA256 (wine-gecko-2.47.1-x86_64.msi) = 69312e79a988da3e7d292382005e92bc4d4b2a52a23c34440ae3007feb57474a -SHA256 (wine-mono-4.9.4.msi) = 51a6ff38323fcda71d70ead90c252b5eaeacec542ba737dbd1d676787b210fdd +SHA256 (wine-mono-5.0.0-x86.msi) = 17da208645a82a5e45e84fc75c73a8440acda484411cb8fae8e9b72db9886cd5 +SHA256 (49011.diff) = 92b3a8eceef5d5c3abe8fec8f8286e21f34b98bd9abf2376a049fa27a7c7c477 diff --git a/wine-staging/49011.diff b/wine-staging/49011.diff new file mode 100644 index 000000000..d73661f01 --- /dev/null +++ b/wine-staging/49011.diff @@ -0,0 +1,13 @@ +diff --git a/server/thread.c b/server/thread.c +index cfdf42c756..e5b670649a 100644 +--- a/server/thread.c ++++ b/server/thread.c +@@ -1848,7 +1848,7 @@ DECL_HANDLER(get_thread_context) + { + assert( reply->self ); + memset( context, 0, sizeof(context_t) ); +- context->cpu = thread_context->regs.cpu; ++ context->cpu = current->process->cpu; + if (req->flags & system_flags) + { + get_thread_context( thread, context, req->flags & system_flags ); diff --git a/wine-staging/Pkgfile b/wine-staging/Pkgfile index 9ddeeb34d..53f8f0220 100644 --- a/wine-staging/Pkgfile +++ b/wine-staging/Pkgfile @@ -4,18 +4,23 @@ # Depends on: fontconfig-32 freeglut-32 gnutls-32 lcms2-32 mpg123-32 openal-32 prelink xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 vkd3d-32 name=wine-staging -version=5.6.1 +version=5.7 release=1 source=(https://dl.winehq.org/wine/source/5.x/wine-${version:0:3}.tar.xz \ https://github.com/$name/$name/archive/v${version}/$name-$version.tar.gz \ https://dl.winehq.org/wine/wine-gecko/2.47.1/wine-gecko-2.47.1-x86.msi \ https://dl.winehq.org/wine/wine-gecko/2.47.1/wine-gecko-2.47.1-x86_64.msi \ - https://dl.winehq.org/wine/wine-mono/4.9.4/wine-mono-4.9.4.msi) + https://dl.winehq.org/wine/wine-mono/5.0.0/wine-mono-5.0.0-x86.msi \ + 49011.diff) build() { # apply staging patches cd $name-$version ./patches/patchinstall.sh DESTDIR=../wine-${version:0:3} --all + + # https://bugs.winehq.org/show_bug.cgi?id=49011 + cd ../wine-$version + patch -p1 -i $SRC/49011.diff cd .. install -d wine32 wine64 @@ -58,7 +63,7 @@ build() { $SRC/wine-gecko-2.47.1-x86.msi \ $SRC/wine-gecko-2.47.1-x86_64.msi - install $SRC/wine-mono-4.9.4.msi $PKG/usr/share/wine/mono/ + install $SRC/wine-mono-5.0.0-x86.msi $PKG/usr/share/wine/mono/ rm -r $PKG/usr/share/man/??.UTF-8 }
participants (1)
-
crux＠crux.nu