From nobody Sun Nov 7 08:32:25 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 048CA184492B; Sun, 7 Nov 2021 08:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hn6td6jvmz3CbM; Sun, 7 Nov 2021 08:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C701C1B583; Sun, 7 Nov 2021 08:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A78WPeC001645; Sun, 7 Nov 2021 08:32:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A78WP0q001644; Sun, 7 Nov 2021 08:32:25 GMT (envelope-from git) Date: Sun, 7 Nov 2021 08:32:25 GMT Message-Id: <202111070832.1A78WP0q001644@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 00078ad233b8 - main - emulators/wine-devel: Update to Wine 6.21 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00078ad233b83f1b5a53355502ba8747480c991f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=00078ad233b83f1b5a53355502ba8747480c991f commit 00078ad233b83f1b5a53355502ba8747480c991f Author: Damjan Jovanovic AuthorDate: 2021-11-07 08:31:42 +0000 Commit: Gerald Pfeifer CommitDate: 2021-11-07 08:31:42 +0000 emulators/wine-devel: Update to Wine 6.21 This includes the following changes: - WinSpool, GPhoto, and a few other modules converted to PE. - Better support for inline functions in DbgHelp. - Beginnings of a MSDASQL implementation. - Various bug fixes. files/patch-dlls-winebus-6.20 and files/patch-no-procfs have been accepted upstream, so remove our local copies. With that, and additional upstream changes, mounting /proc is no longer required on FreeBSD, so we don't need to document it. [1] PR: 258795 [1] Approved by: maintainer (= author) --- emulators/wine-devel/Makefile | 3 +- emulators/wine-devel/distinfo | 10 +- emulators/wine-devel/files/patch-dlls-winebus-6.20 | 36 --- emulators/wine-devel/files/patch-no-procfs | 284 --------------------- emulators/wine-devel/pkg-plist | 16 +- 5 files changed, 14 insertions(+), 335 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 2a994c80d7ad..f75c627aa928 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,8 +1,7 @@ # Created by: Gerald Pfeifer PORTNAME= wine -DISTVERSION= 6.20 -PORTREVISION= 3 +DISTVERSION= 6.21 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index ede40c4b16fa..283a2f1b50bf 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1634993849 -SHA256 (wine-6.20.tar.xz) = 4028237e9c7bfdd56d7604af19783ff812f645f29c27de742a688e4535528471 -SIZE (wine-6.20.tar.xz) = 26921644 -SHA256 (v6.20.tar.gz) = 360fd304a0f4c12e3aa149dde0bc3ac7a2c8787740e1f228bd13158f855166ea -SIZE (v6.20.tar.gz) = 9643278 +TIMESTAMP = 1636178163 +SHA256 (wine-6.21.tar.xz) = f7b67572b52a7150f3dcc43318b40cf10425171319edf6368a60274642e079ce +SIZE (wine-6.21.tar.xz) = 26973172 +SHA256 (v6.21.tar.gz) = df986de7d6ce6536c18bba4dbeab05e2bd199cfa73e3194fd6c805cdc6d51dfd +SIZE (v6.21.tar.gz) = 9627829 diff --git a/emulators/wine-devel/files/patch-dlls-winebus-6.20 b/emulators/wine-devel/files/patch-dlls-winebus-6.20 deleted file mode 100644 index b4f196d56e11..000000000000 --- a/emulators/wine-devel/files/patch-dlls-winebus-6.20 +++ /dev/null @@ -1,36 +0,0 @@ -commit 57db53024a79aa5ce3c691d94b5f167a34ef0530 -Author: Damjan Jovanovic -Date: Sat Oct 23 10:54:48 2021 +0200 - - winebus.sys: get inotify working on FreeBSD - - FreeBSD requires linking to the inotify library, and - including limits.h. - - Signed-off-by: Damjan Jovanovic - -diff --git dlls/winebus.sys/Makefile.in dlls/winebus.sys/Makefile.in -index 6fc6fc5a632..d9ea33d267d 100644 ---- dlls/winebus.sys/Makefile.in -+++ dlls/winebus.sys/Makefile.in -@@ -1,7 +1,7 @@ - MODULE = winebus.sys - UNIXLIB = winebus.so - IMPORTS = ntoskrnl hidparse --EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS) -+EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS) $(INOTIFY_LIBS) - EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS) - - EXTRADLLFLAGS = -Wl,--subsystem,native -diff --git dlls/winebus.sys/bus_udev.c dlls/winebus.sys/bus_udev.c -index 8889b6a3e1f..4c00fe6ad39 100644 ---- dlls/winebus.sys/bus_udev.c -+++ dlls/winebus.sys/bus_udev.c -@@ -52,6 +52,7 @@ - #ifdef HAVE_SYS_INOTIFY_H - # include - #endif -+#include - - #ifdef HAVE_LINUX_INPUT_H - # include diff --git a/emulators/wine-devel/files/patch-no-procfs b/emulators/wine-devel/files/patch-no-procfs deleted file mode 100644 index 0cb0478bd2a7..000000000000 --- a/emulators/wine-devel/files/patch-no-procfs +++ /dev/null @@ -1,284 +0,0 @@ -commit 6e67f3beaabdf70832e2c71d2505fc96a4aa9456 -Author: Damjan Jovanovic -Date: Sat Oct 23 09:57:09 2021 +0200 - - Use sysctl() instead of /proc/curproc/file throughout Wine. - -diff --git dlls/ntdll/unix/loader.c dlls/ntdll/unix/loader.c -index 4e807744862..2be11dc3747 100644 ---- dlls/ntdll/unix/loader.c -+++ dlls/ntdll/unix/loader.c -@@ -58,6 +58,10 @@ - #ifdef HAVE_SYS_WAIT_H - #include - #endif -+#include -+#ifdef HAVE_SYS_SYSCTL_H -+# include -+#endif - #ifdef __APPLE__ - # include - # define LoadResource MacLoadResource -@@ -588,6 +592,11 @@ static void set_config_dir(void) - static void init_paths( char *argv[] ) - { - Dl_info info; -+#if defined (__FreeBSD__) || defined(__DragonFly__) -+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ char *path; -+ size_t path_size; -+#endif - - argv0 = strdup( argv[0] ); - -@@ -600,7 +609,10 @@ static void init_paths( char *argv[] ) - #if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - bin_dir = realpath_dirname( "/proc/self/exe" ); - #elif defined (__FreeBSD__) || defined(__DragonFly__) -- bin_dir = realpath_dirname( "/proc/curproc/file" ); -+ path = malloc( path_size = PATH_MAX ); -+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) -+ bin_dir = realpath_dirname( path ); -+ free( path ); - #else - bin_dir = realpath_dirname( argv0 ); - #endif -diff --git libs/wine/config.c libs/wine/config.c -index cb42421c168..23c76fda128 100644 ---- libs/wine/config.c -+++ libs/wine/config.c -@@ -28,8 +28,12 @@ - #include - #include - #include -+#include - #include - #include -+#ifdef HAVE_SYS_SYSCTL_H -+# include -+#endif - #include - #include - #ifdef HAVE_PWD_H -@@ -56,8 +60,6 @@ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format( - - #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - static const char exe_link[] = "/proc/self/exe"; --#elif defined (__FreeBSD__) || defined(__DragonFly__) --static const char exe_link[] = "/proc/curproc/file"; - #else - static const char exe_link[] = ""; - #endif -@@ -141,8 +143,18 @@ static char *symlink_dirname( const char *name ) - /* return the directory that contains the main exe at run-time */ - static char *get_runtime_exedir(void) - { -+#if defined(__FreeBSD__) || defined(__DragonFly__) -+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ size_t dir_size = PATH_MAX; -+ char *dir = malloc( dir_size ); -+ if (dir && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), dir, &dir_size, NULL, 0 )) -+ return dir; -+ free( dir ); -+ return NULL; -+#else - if (exe_link[0]) return symlink_dirname( exe_link ); - return NULL; -+#endif - } - - /* return the base directory from argv0 */ -diff --git loader/main.c loader/main.c -index fdc77c56162..242ff15accd 100644 ---- loader/main.c -+++ loader/main.c -@@ -29,6 +29,10 @@ - #include - #include - #include -+#include -+#ifdef HAVE_SYS_SYSCTL_H -+# include -+#endif - - #include "main.h" - -@@ -83,8 +87,14 @@ static const char *get_self_exe( char *argv0 ) - #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - return "/proc/self/exe"; - #elif defined (__FreeBSD__) || defined(__DragonFly__) -- return "/proc/curproc/file"; --#else -+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ size_t path_size = PATH_MAX; -+ char *path = malloc( path_size ); -+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) -+ return path; -+ free( path ); -+#endif -+ - if (!strchr( argv0, '/' )) /* search in PATH */ - { - char *p, *path = getenv( "PATH" ); -@@ -104,7 +114,6 @@ static const char *get_self_exe( char *argv0 ) - return NULL; - } - return argv0; --#endif - } - - static void *try_dlopen( const char *dir, const char *name ) -diff --git server/unicode.c server/unicode.c -index 67698d7639c..86a1217b01f 100644 ---- server/unicode.c -+++ server/unicode.c -@@ -25,6 +25,10 @@ - #include - #include - #include -+#include -+#ifdef HAVE_SYS_SYSCTL_H -+# include -+#endif - - #include "windef.h" - #include "winternl.h" -@@ -240,7 +244,17 @@ static char *get_nls_dir(void) - #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); - #elif defined (__FreeBSD__) || defined(__DragonFly__) -- dir = realpath( "/proc/curproc/file", NULL ); -+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ size_t dir_size = PATH_MAX; -+ dir = malloc( dir_size ); -+ if (dir) -+ { -+ if (sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), dir, &dir_size, NULL, 0 )) -+ { -+ free( dir ); -+ dir = NULL; -+ } -+ } - #else - dir = realpath( server_argv0, NULL ); - #endif -diff --git tools/widl/widl.c tools/widl/widl.c -index e5a772e87bd..79c92e2f338 100644 ---- tools/widl/widl.c -+++ tools/widl/widl.c -@@ -29,6 +29,11 @@ - #include - #include - #include -+#include -+#include -+#ifdef HAVE_SYS_SYSCTL_H -+# include -+#endif - - #include "widl.h" - #include "utils.h" -@@ -562,7 +567,12 @@ static void init_argv0_dir( const char *argv0 ) - #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); - #elif defined (__FreeBSD__) || defined(__DragonFly__) -- dir = realpath( "/proc/curproc/file", NULL ); -+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ size_t path_size = PATH_MAX; -+ char *path = malloc( path_size ); -+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) -+ dir = realpath( path, NULL ); -+ free( path ); - #else - dir = realpath( argv0, NULL ); - #endif -diff --git tools/winegcc/winegcc.c tools/winegcc/winegcc.c -index 5204553f739..b1123cd7e51 100644 ---- tools/winegcc/winegcc.c -+++ tools/winegcc/winegcc.c -@@ -96,6 +96,11 @@ - #include - #include - #include -+#include -+#include -+#ifdef HAVE_SYS_SYSCTL_H -+# include -+#endif - - #include "utils.h" - -@@ -747,7 +752,12 @@ static void init_argv0_dir( const char *argv0 ) - #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); - #elif defined (__FreeBSD__) || defined(__DragonFly__) -- dir = realpath( "/proc/curproc/file", NULL ); -+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ size_t path_size = PATH_MAX; -+ char *path = malloc( path_size ); -+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) -+ dir = realpath( path, NULL ); -+ free( path ); - #else - dir = realpath( argv0, NULL ); - #endif -diff --git tools/wmc/wmc.c tools/wmc/wmc.c -index 864c969b136..2993d3c5ef7 100644 ---- tools/wmc/wmc.c -+++ tools/wmc/wmc.c -@@ -24,6 +24,11 @@ - #include - #include - #include -+#include -+#include -+#ifdef HAVE_SYS_SYSCTL_H -+# include -+#endif - - #include "wmc.h" - #include "utils.h" -@@ -165,7 +170,12 @@ static void init_argv0_dir( const char *argv0 ) - #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); - #elif defined (__FreeBSD__) || defined(__DragonFly__) -- dir = realpath( "/proc/curproc/file", NULL ); -+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ size_t path_size = PATH_MAX; -+ char *path = malloc( path_size ); -+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) -+ dir = realpath( path, NULL ); -+ free( path ); - #else - dir = realpath( argv0, NULL ); - #endif -diff --git tools/wrc/wrc.c tools/wrc/wrc.c -index 8cdb91195cf..b44ae6fd0e5 100644 ---- tools/wrc/wrc.c -+++ tools/wrc/wrc.c -@@ -27,6 +27,11 @@ - #include - #include - #include -+#include -+#include -+#ifdef HAVE_SYS_SYSCTL_H -+# include -+#endif - - #include "../tools.h" - #include "wrc.h" -@@ -336,7 +341,12 @@ static void init_argv0_dir( const char *argv0 ) - #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); - #elif defined (__FreeBSD__) || defined(__DragonFly__) -- dir = realpath( "/proc/curproc/file", NULL ); -+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ size_t path_size = PATH_MAX; -+ char *path = malloc( path_size ); -+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) -+ dir = realpath( path, NULL ); -+ free( path ); - #else - dir = realpath( argv0, NULL ); - #endif diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index ff4d60e469b0..dcc923c05c2e 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -1000,6 +1000,8 @@ include/wine/windows/windows.media.speechsynthesis.idl %%STAGING%%include/wine/windows/windows.networking.connectivity.idl %%STAGING%%include/wine/windows/windows.networking.h %%STAGING%%include/wine/windows/windows.networking.idl +include/wine/windows/windows.storage.streams.h +include/wine/windows/windows.storage.streams.idl include/wine/windows/windows.system.h include/wine/windows/windows.system.idl include/wine/windows/windows.system.userprofile.h @@ -1414,7 +1416,6 @@ lib/wine/%%WINEARCH%%-unix/bthprops.cpl.so lib/wine/%%WINEARCH%%-unix/cabarc.exe.so lib/wine/%%WINEARCH%%-unix/cabinet.dll.so lib/wine/%%WINEARCH%%-unix/cacls.exe.so -lib/wine/%%WINEARCH%%-unix/capi2032.dll.so lib/wine/%%WINEARCH%%-unix/cards.dll.so lib/wine/%%WINEARCH%%-unix/cdosys.dll.so lib/wine/%%WINEARCH%%-unix/cfgmgr32.dll.so @@ -1422,6 +1423,7 @@ lib/wine/%%WINEARCH%%-unix/chcp.com.so lib/wine/%%WINEARCH%%-unix/clock.exe.so lib/wine/%%WINEARCH%%-unix/clusapi.dll.so lib/wine/%%WINEARCH%%-unix/cmd.exe.so +lib/wine/%%WINEARCH%%-unix/cng.sys.so lib/wine/%%WINEARCH%%-unix/combase.dll.so lib/wine/%%WINEARCH%%-unix/comcat.dll.so lib/wine/%%WINEARCH%%-unix/comctl32.dll.so @@ -1447,6 +1449,7 @@ lib/wine/%%WINEARCH%%-unix/cryptsp.dll.so lib/wine/%%WINEARCH%%-unix/cryptui.dll.so lib/wine/%%WINEARCH%%-unix/cscript.exe.so lib/wine/%%WINEARCH%%-unix/ctapi32.dll.so +lib/wine/%%WINEARCH%%-unix/ctapi32.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/ctl3d.dll16.so lib/wine/%%WINEARCH%%-unix/ctl3d32.dll.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/ctl3dv2.dll16.so @@ -1649,7 +1652,6 @@ lib/wine/%%WINEARCH%%-unix/gamingtcui.dll.so lib/wine/%%WINEARCH%%-unix/gdi32.dll.so lib/wine/%%WINEARCH%%-unix/gdiplus.dll.so %%X11%%lib/wine/%%WINEARCH%%-unix/glu32.dll.so -lib/wine/%%WINEARCH%%-unix/gphoto2.ds.so lib/wine/%%WINEARCH%%-unix/gpkcsp.dll.so lib/wine/%%WINEARCH%%-unix/hal.dll.so lib/wine/%%WINEARCH%%-unix/hh.exe.so @@ -1714,7 +1716,6 @@ lib/wine/%%WINEARCH%%-unix/libavifil32.def lib/wine/%%WINEARCH%%-unix/libavrt.def lib/wine/%%WINEARCH%%-unix/libbcrypt.def lib/wine/%%WINEARCH%%-unix/libcabinet.def -lib/wine/%%WINEARCH%%-unix/libcapi2032.def lib/wine/%%WINEARCH%%-unix/libcards.def lib/wine/%%WINEARCH%%-unix/libcfgmgr32.def lib/wine/%%WINEARCH%%-unix/libclusapi.def @@ -1989,6 +1990,7 @@ lib/wine/%%WINEARCH%%-unix/mscorwks.dll.so lib/wine/%%WINEARCH%%-unix/msctf.dll.so lib/wine/%%WINEARCH%%-unix/msctfp.dll.so lib/wine/%%WINEARCH%%-unix/msdaps.dll.so +lib/wine/%%WINEARCH%%-unix/msdasql.dll.so lib/wine/%%WINEARCH%%-unix/msdelta.dll.so lib/wine/%%WINEARCH%%-unix/msdmo.dll.so lib/wine/%%WINEARCH%%-unix/msdrm.dll.so @@ -2165,7 +2167,6 @@ lib/wine/%%WINEARCH%%-unix/rtworkq.dll.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/rundll.exe16.so lib/wine/%%WINEARCH%%-unix/rundll32.exe.so lib/wine/%%WINEARCH%%-unix/samlib.dll.so -lib/wine/%%WINEARCH%%-unix/sane.ds.so lib/wine/%%WINEARCH%%-unix/sapi.dll.so lib/wine/%%WINEARCH%%-unix/sas.dll.so lib/wine/%%WINEARCH%%-unix/sc.exe.so @@ -2308,7 +2309,6 @@ lib/wine/%%WINEARCH%%-unix/windows.media.devices.dll.so lib/wine/%%WINEARCH%%-unix/windows.media.speech.dll.so %%STAGING%%lib/wine/%%WINEARCH%%-unix/windows.networking.connectivity.so lib/wine/%%WINEARCH%%-unix/windowscodecs.dll.so -lib/wine/%%WINEARCH%%-unix/windowscodecs.so lib/wine/%%WINEARCH%%-unix/windowscodecsext.dll.so lib/wine/%%WINEARCH%%-unix/wineboot.exe.so lib/wine/%%WINEARCH%%-unix/winebrowser.exe.so @@ -2348,6 +2348,7 @@ lib/wine/%%WINEARCH%%-unix/winnls32.dll.so lib/wine/%%WINEARCH%%-unix/winscard.dll.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/winsock.dll16.so lib/wine/%%WINEARCH%%-unix/winspool.drv.so +lib/wine/%%WINEARCH%%-unix/winspool.so lib/wine/%%WINEARCH%%-unix/winsta.dll.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/wintab.dll16.so lib/wine/%%WINEARCH%%-unix/wintab32.dll.so @@ -2704,7 +2705,6 @@ lib/wine/%%WINEARCH%%-windows/bthprops.cpl lib/wine/%%WINEARCH%%-windows/cabarc.exe lib/wine/%%WINEARCH%%-windows/cabinet.dll lib/wine/%%WINEARCH%%-windows/cacls.exe -lib/wine/%%WINEARCH%%-windows/capi2032.dll lib/wine/%%WINEARCH%%-windows/cards.dll lib/wine/%%WINEARCH%%-windows/cdosys.dll lib/wine/%%WINEARCH%%-windows/cfgmgr32.dll @@ -2712,6 +2712,7 @@ lib/wine/%%WINEARCH%%-windows/chcp.com lib/wine/%%WINEARCH%%-windows/clock.exe lib/wine/%%WINEARCH%%-windows/clusapi.dll lib/wine/%%WINEARCH%%-windows/cmd.exe +lib/wine/%%WINEARCH%%-windows/cng.sys lib/wine/%%WINEARCH%%-windows/combase.dll lib/wine/%%WINEARCH%%-windows/comcat.dll lib/wine/%%WINEARCH%%-windows/comctl32.dll @@ -2936,7 +2937,6 @@ lib/wine/%%WINEARCH%%-windows/gamingtcui.dll lib/wine/%%WINEARCH%%-windows/gdi32.dll lib/wine/%%WINEARCH%%-windows/gdiplus.dll %%X11%%lib/wine/%%WINEARCH%%-windows/glu32.dll -lib/wine/%%WINEARCH%%-windows/gphoto2.ds lib/wine/%%WINEARCH%%-windows/gpkcsp.dll lib/wine/%%WINEARCH%%-windows/hal.dll lib/wine/%%WINEARCH%%-windows/hh.exe @@ -3035,6 +3035,7 @@ lib/wine/%%WINEARCH%%-windows/mscorwks.dll lib/wine/%%WINEARCH%%-windows/msctf.dll lib/wine/%%WINEARCH%%-windows/msctfp.dll lib/wine/%%WINEARCH%%-windows/msdaps.dll +lib/wine/%%WINEARCH%%-windows/msdasql.dll lib/wine/%%WINEARCH%%-windows/msdelta.dll lib/wine/%%WINEARCH%%-windows/msdmo.dll lib/wine/%%WINEARCH%%-windows/msdrm.dll @@ -3205,7 +3206,6 @@ lib/wine/%%WINEARCH%%-windows/rtworkq.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/rundll.exe16 lib/wine/%%WINEARCH%%-windows/rundll32.exe lib/wine/%%WINEARCH%%-windows/samlib.dll -lib/wine/%%WINEARCH%%-windows/sane.ds lib/wine/%%WINEARCH%%-windows/sapi.dll lib/wine/%%WINEARCH%%-windows/sas.dll lib/wine/%%WINEARCH%%-windows/sc.exe