Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2018-11-27 10:42:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine" Tue Nov 27 10:42:56 2018 rev:267 rq:651975 version:3.21 Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2018-11-13 17:53:29.231346386 +0100 +++ /work/SRC/openSUSE:Factory/.wine.new.19453/wine.changes 2018-11-27 10:43:33.404125901 +0100 @@ -1,0 +2,12 @@ +Sat Nov 24 08:19:07 UTC 2018 - [email protected] + +- Update to 3.21 development release + - Typelib marshaller rewrite using NDR functions. + - Graphics support on recent Android versions. + - Support for memory font resources in DirectWrite. + - Joystick support improvements. + - Various bug fixes. +- updated staging to 3.21 +- updated winetricks + +------------------------------------------------------------------- Old: ---- wine-3.20.tar.xz wine-3.20.tar.xz.sign wine-d3d9-patches-3.17.tar.xz wine-staging-3.20.tar.xz New: ---- wine-3.21.tar.xz wine-3.21.tar.xz.sign wine-d3d9-patches-3.20.tar.xz wine-staging-3.21.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.wHsbvY/_old 2018-11-27 10:43:37.104122106 +0100 +++ /var/tmp/diff_new_pack.wHsbvY/_new 2018-11-27 10:43:37.104122106 +0100 @@ -107,8 +107,8 @@ BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -%define realver 3.20 -Version: 3.20 +%define realver 3.21 +Version: 3.21 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1-or-later @@ -146,7 +146,7 @@ ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64 %if %{staging} # upstream patch target version -%define staging_version 3.20 +%define staging_version 3.21 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel @@ -154,7 +154,7 @@ %endif %if %{nine} # upstream patch target version -%define nine_version 3.17 +%define nine_version 3.20 BuildRequires: Mesa-libd3d-devel BuildRequires: libOSMesa-devel BuildRequires: pkgconfig(dri2proto) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.wHsbvY/_old 2018-11-27 10:43:37.164122045 +0100 +++ /var/tmp/diff_new_pack.wHsbvY/_new 2018-11-27 10:43:37.164122045 +0100 @@ -3,7 +3,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="url">https://github.com/wine-staging/wine-staging.git</param> - <param name="revision">refs/tags/v3.20</param> + <param name="revision">refs/tags/v3.21</param> <param name="match-tag">v*.*</param> <param name="scm">git</param> </service> @@ -11,7 +11,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">wined3d9(.*)</param> <param name="url">https://github.com/sarnex/wine-d3d9-patches.git</param> - <param name="revision">refs/tags/wine-d3d9-3.17</param> + <param name="revision">refs/tags/wine-d3d9-3.20</param> <param name="scm">git</param> </service> <service name="recompress" mode="disabled"> ++++++ wine-3.20.tar.xz -> wine-3.21.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-3.20.tar.xz /work/SRC/openSUSE:Factory/.wine.new.19453/wine-3.21.tar.xz differ: char 26, line 1 ++++++ wine-d3d9-patches-3.17.tar.xz -> wine-d3d9-patches-3.20.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.17/d3d9-helper.patch new/wine-d3d9-patches-3.20/d3d9-helper.patch --- old/wine-d3d9-patches-3.17/d3d9-helper.patch 2018-09-30 20:54:02.000000000 +0200 +++ new/wine-d3d9-patches-3.20/d3d9-helper.patch 2018-11-11 18:25:14.000000000 +0100 @@ -1,6 +1,6 @@ -From cd3f552bf4fcb8c66fedc38ae841878b7a2f39f2 Mon Sep 17 00:00:00 2001 +From b2754287c16240b4d46da8ef89df9f471ad31ac0 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <[email protected]> -Date: Sun, 30 Sep 2018 14:52:30 -0400 +Date: Sun, 11 Nov 2018 12:24:29 -0500 Subject: [PATCH] D3D9 Helper Signed-off-by: Nick Sarnie <[email protected]> @@ -18,7 +18,7 @@ create mode 100644 programs/winecfg/staging.c diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index a66a708a7b..cd7592832f 100644 +index c5e8d0d7c1..4aa342ac74 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -110,6 +110,7 @@ struct builtin_load_info @@ -102,7 +102,7 @@ RtlFreeHeap( GetProcessHeap(), 0, fullname ); if (!wm) { -@@ -1954,8 +1956,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) +@@ -1999,8 +2001,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) /****************************************************************************** * load_native_dll (internal) */ @@ -113,7 +113,7 @@ { void *module; HANDLE mapping; -@@ -1998,7 +2000,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -2043,7 +2045,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /* create the MODREF */ @@ -122,7 +122,7 @@ { if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); return STATUS_NO_MEMORY; -@@ -2066,8 +2068,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -2111,8 +2113,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /*********************************************************************** * load_builtin_dll */ @@ -133,7 +133,7 @@ { char error[256], dllname[MAX_PATH]; const WCHAR *name, *p; -@@ -2087,6 +2089,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, +@@ -2132,6 +2134,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, */ info.load_path = load_path; info.filename = NULL; @@ -141,7 +141,7 @@ info.status = STATUS_SUCCESS; info.wm = NULL; -@@ -2285,6 +2288,108 @@ done: +@@ -2330,6 +2333,108 @@ done: return status; } @@ -250,7 +250,7 @@ /*********************************************************************** * open_dll_file -@@ -2331,7 +2436,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct +@@ -2376,7 +2481,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct */ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, WCHAR *filename, ULONG *size, WINE_MODREF **pwm, @@ -259,7 +259,7 @@ { UNICODE_STRING nt_name; WCHAR *file_part, *ext, *dllname; -@@ -2376,20 +2481,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, +@@ -2421,20 +2526,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { @@ -305,7 +305,7 @@ } /* not found */ -@@ -2437,8 +2563,10 @@ overflow: +@@ -2482,8 +2608,10 @@ overflow: * Load a PE style module according to the load order. * The loader_section must be locked while calling this function. */ @@ -317,7 +317,7 @@ enum loadorder loadorder; WCHAR buffer[64]; WCHAR *filename; -@@ -2455,7 +2583,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2500,7 +2628,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ size = sizeof(buffer); for (;;) { @@ -326,7 +326,7 @@ if (nts == STATUS_SUCCESS) break; if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); if (nts != STATUS_BUFFER_TOO_SMALL) return nts; -@@ -2475,6 +2603,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2520,6 +2648,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ } main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); @@ -352,7 +352,7 @@ loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); if (handle && is_fake_dll( handle )) -@@ -2497,22 +2644,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2542,22 +2689,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ if (!handle) nts = STATUS_DLL_NOT_FOUND; else { @@ -380,7 +380,7 @@ if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) { -@@ -2522,7 +2669,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2567,7 +2714,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ nts = STATUS_DLL_NOT_FOUND; } if (nts == STATUS_DLL_NOT_FOUND && loadorder != LO_BUILTIN) @@ -389,7 +389,7 @@ break; } -@@ -2555,7 +2702,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, +@@ -2600,7 +2747,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, RtlEnterCriticalSection( &loader_section ); if (!path_name) path_name = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; @@ -398,7 +398,7 @@ if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { -@@ -2594,7 +2741,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S +@@ -2639,7 +2786,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S size = sizeof(buffer); for (;;) { @@ -407,7 +407,7 @@ if (handle) NtClose( handle ); if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); if (status != STATUS_BUFFER_TOO_SMALL) break; -@@ -3515,7 +3662,7 @@ void __wine_process_init(void) +@@ -3560,7 +3707,7 @@ void __wine_process_init(void) /* setup the load callback and create ntdll modref */ wine_dll_set_callback( load_builtin_callback ); @@ -805,10 +805,10 @@ + return ret; +} diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 85ba707b04..d02430649b 100644 +index fdb443b45c..4edd453c52 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -214,6 +214,7 @@ enum loadorder +@@ -215,6 +215,7 @@ enum loadorder }; extern enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) DECLSPEC_HIDDEN; @@ -1025,5 +1025,5 @@ /* @makedep: winecfg.ico */ -- -2.19.0 +2.19.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.17/staging-helper.patch new/wine-d3d9-patches-3.20/staging-helper.patch --- old/wine-d3d9-patches-3.17/staging-helper.patch 2018-09-30 20:54:02.000000000 +0200 +++ new/wine-d3d9-patches-3.20/staging-helper.patch 2018-11-11 18:25:14.000000000 +0100 @@ -1,7 +1,7 @@ -From 260fcdb64a5f9f990efc70a7dd53041ad8fd6787 Mon Sep 17 00:00:00 2001 +From 7f62f58c6abd2c87c674fc7d1e58286c7fe28b8b Mon Sep 17 00:00:00 2001 From: Nick Sarnie <[email protected]> -Date: Sun, 30 Sep 2018 14:51:06 -0400 -Subject: [PATCH] Staging helper +Date: Sun, 11 Nov 2018 12:23:42 -0500 +Subject: [PATCH] Staging Helper Signed-off-by: Nick Sarnie <[email protected]> --- @@ -108,5 +108,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.19.0 +2.19.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.17/wine-d3d9.patch new/wine-d3d9-patches-3.20/wine-d3d9.patch --- old/wine-d3d9-patches-3.17/wine-d3d9.patch 2018-09-30 20:54:02.000000000 +0200 +++ new/wine-d3d9-patches-3.20/wine-d3d9.patch 2018-11-11 18:25:14.000000000 +0100 @@ -1,6 +1,6 @@ -From 9ff85c78cb98810a95c21bebeab611f51c048271 Mon Sep 17 00:00:00 2001 +From 0ad6d2a46e5348726fbaa8cb6cead66c7efbe2c7 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <[email protected]> -Date: Sun, 30 Sep 2018 14:51:35 -0400 +Date: Sun, 11 Nov 2018 12:23:54 -0500 Subject: [PATCH] Wine D3D9 Signed-off-by: Nick Sarnie <[email protected]> @@ -41,7 +41,7 @@ create mode 100644 dlls/d3d9-nine/wndproc.h diff --git a/configure.ac b/configure.ac -index 674093d520..3759bea5ef 100644 +index 67dfb3b765..9f0e4f23ad 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), @@ -59,7 +59,7 @@ AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library])) AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support])) AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]), -@@ -424,6 +432,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) +@@ -429,6 +437,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) AC_SUBST(OPENGL_LIBS,"") @@ -68,7 +68,7 @@ dnl **** Check for header files **** AC_SYS_LARGEFILE() -@@ -1276,6 +1286,183 @@ OpenGL and Direct3D won't be supported.]) +@@ -1280,6 +1290,183 @@ OpenGL and Direct3D won't be supported.]) WINE_NOTICE_WITH(va,[test "x$ac_cv_lib_soname_va" = "x" -o "x$ac_cv_lib_soname_va_x11" = "x" -o "x$ac_cv_lib_soname_va_drm" = "x"], [libva ${notice_platform}development files not found, GPU video acceleration won't be supported.]) @@ -252,7 +252,7 @@ CPPFLAGS="$ac_save_CPPFLAGS" else X_CFLAGS="" -@@ -3262,6 +3449,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) +@@ -3269,6 +3456,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) WINE_CONFIG_MAKEFILE(dlls/d3d9) WINE_CONFIG_MAKEFILE(dlls/d3d9/tests) @@ -5781,5 +5781,5 @@ + +#endif -- -2.19.0 +2.19.1 ++++++ wine-staging-3.20.tar.xz -> wine-staging-3.21.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-staging-3.20.tar.xz /work/SRC/openSUSE:Factory/.wine.new.19453/wine-staging-3.21.tar.xz differ: char 26, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.wHsbvY/_old 2018-11-27 10:43:37.336121868 +0100 +++ /var/tmp/diff_new_pack.wHsbvY/_new 2018-11-27 10:43:37.340121864 +0100 @@ -47,8 +47,8 @@ # sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm # sudo dnf install binutils cabextract p7zip-plugins unrar unzip wget wine zenity # -# See http://winetricks.org for documentation and tutorials, including -# how to contribute changes to winetricks. +# See https://github.com/Winetricks/winetricks for documentation and tutorials, +# including how to contribute changes to winetricks. # #-------------------------------------------------------------------- # @@ -99,7 +99,7 @@ # - Portability matters, as this script is run on many operating systems # - No bash, zsh, or csh extensions; only use features from # the POSIX standard shell and utilities; see -# http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html +# https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html # - 'checkbashisms -p -x winetricks' should show no warnings (per Debian policy) # - Prefer classic sh idioms as described in e.g. # "Portable Shell Programming" by Bruce Blinn, ISBN: 0-13-451494-7 @@ -4870,7 +4870,7 @@ # We shouldn't use all these extra variables. Instead, we should # use ${foo:+bar} to jam in commandline options for silent install # only if W_OPT_UNATTENDED is nonempty. See - # http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02 + # https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02 # So in attended mode, W_OPT_UNATTENDED should be empty. case "$1" in @@ -5313,9 +5313,10 @@ # wine-2.8 _wine_version_stripped="$(echo "$WINETRICKS_WINE_VERSION" | cut -d ' ' -f1 | sed -e 's/wine-//' -e 's/-rc.*//')" - # If WINE is < 2.0, warn user: - if w_wine_version_in 2.0, ; then - w_warn "Your version of wine $_wine_version_stripped is no longer supported upstream. You should upgrade to 2.x" + # If WINE is < 3.0, warn user: + # 3.0 doesn't do what I thought it would + if w_wine_version_in 2.99, ; then + w_warn "Your version of wine $_wine_version_stripped is no longer supported upstream. You should upgrade to 3.x" fi if [ ! "$WINETRICKS_SUPER_QUIET" ] ; then @@ -5667,8 +5668,9 @@ # See https://bugs.winehq.org/show_bug.cgi?id=43506 # and https://github.com/Winetricks/winetricks/issues/821 + # Note: must be -silent, not /silent. /silent gives error 'too many arguments' if w_workaround_wine_bug 43506 "Forcing quiet install"; then - w_try "$WINE" AdobeAIRInstaller.exe -silent + w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT else w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT fi @@ -7004,7 +7006,10 @@ load_dxvk80() { # https://github.com/doitsujin/dxvk - w_download "https://github.com/doitsujin/dxvk/releases/download/v0.80/dxvk-0.80.tar.gz"; f9e736cdbf1e83e45ca748652a94a3a189fc5accde1eac549b2ba5af8f7acacb + # 2018/09/23: f9e736cdbf1e83e45ca748652a94a3a189fc5accde1eac549b2ba5af8f7acacb + # 2018/11/17: 7058a834bb006cad5462933110449b434df561e67d83f68d3965ecc74e2e1cbc + # See: https://github.com/doitsujin/dxvk/issues/773 + w_download "https://github.com/doitsujin/dxvk/releases/download/v0.80/dxvk-0.80.tar.gz"; 7058a834bb006cad5462933110449b434df561e67d83f68d3965ecc74e2e1cbc helper_dxvk "$file1" "d3d10_enabled" "3.10" "1.0.76" } @@ -7065,6 +7070,44 @@ helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88" } +w_metadata dxvk92 dlls \ + title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.92)" \ + publisher="Philip Rebohle" \ + year="2018" \ + media="download" \ + file1="dxvk-0.92.tar.gz" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \ + installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \ + installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \ + installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \ + installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll" + +load_dxvk92() +{ + # https://github.com/doitsujin/dxvk + w_download "https://github.com/doitsujin/dxvk/releases/download/v0.92/dxvk-0.92.tar.gz"; e22c0ae4693aac88562c7a9a97b3316e086b9048c9f8f9e128923ac1611a5c49 + helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88" +} + +w_metadata dxvk93 dlls \ + title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.93)" \ + publisher="Philip Rebohle" \ + year="2018" \ + media="download" \ + file1="dxvk-0.93.tar.gz" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \ + installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \ + installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \ + installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \ + installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll" + +load_dxvk93() +{ + # https://github.com/doitsujin/dxvk + w_download "https://github.com/doitsujin/dxvk/releases/download/v0.93/dxvk-0.93.tar.gz"; 4d964e4e10e67ba7705312496e472ae9859520a78d8742d6d377886318c95e53 + helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88" +} + #---------------------------------------------------------------- @@ -7440,8 +7483,7 @@ w_call remove_mono w_call fontfix - # Recipe from https://bugs.winehq.org/show_bug.cgi?id=10467#c57 - # and https://bugs.winehq.org/show_bug.cgi?id=30845#c10 + # Needed for https://bugs.winehq.org/show_bug.cgi?id=12401 w_set_winver win2k w_try_cd "$W_CACHE"/"$W_PACKAGE" @@ -7555,16 +7597,11 @@ w_call remove_mono - w_call dotnet20 - WINEDLLOVERRIDES= w_warn "Setting windows version so installer works" - # Stop services - # Recipe from https://bugs.winehq.org/show_bug.cgi?id=16956 - w_wineserver -k - # Fight a race condition, see bug 16956 comment 43 + w_set_winver win2k - w_wineserver -w + WINEDLLOVERRIDES=ngen.exe,regsvcs.exe,mscorsvw.exe=b export WINEDLLOVERRIDES @@ -7621,30 +7658,10 @@ w_call remove_mono - w_call dotnet20 - w_wineserver -w + w_set_winver winxp w_try_cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - SetTitleMatchMode, 2 - run, NetFx20SP2_x86.exe ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"} - - Loop - { - sleep 1000 - ifwinexist,, cannot be uninstalled - { - WinClose,, cannot be uninstalled - continue - } - Process, exist, NetFx20SP2_x86.exe - dotnet_pid = %ErrorLevel% - if dotnet_pid = 0 - { - break - } - } - " + w_try "$WINE" NetFx20SP2_x86.exe ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"} status=$? case $status in @@ -7703,8 +7720,6 @@ ;; esac - w_call dotnet20 - # AF's workaround to avoid long pause LANGPACKS_BASE_PATH="${W_WINDIR_UNIX}/SYSMSICache/Framework/v3.0" test -d "${LANGPACKS_BASE_PATH}" || mkdir -p "${LANGPACKS_BASE_PATH}" @@ -7810,8 +7825,7 @@ w_call remove_mono - w_call dotnet30sp1 - w_wineserver -w + w_set_winver winxp # See also https://blogs.msdn.microsoft.com/astebner/2008/07/17/scenarios-where-net-framework-3-5-setup-tries-to-connect-to-the-internet-and-how-to-avoid-them/ w_try_cd "$W_TMP" @@ -7855,36 +7869,10 @@ w_call remove_mono - w_call dotnet35 - w_wineserver -w - w_call dotnet20sp2 - w_wineserver -w - - # Work around hang in https://bugs.winehq.org/show_bug.cgi?id=25060#c19 - WINEDLLOVERRIDES=ngen.exe,mscorsvw.exe=b - export WINEDLLOVERRIDES + w_set_winver winxp w_try_cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - SetTitleMatchMode, 2 - run, dotnetfx35.exe /lang:ENU $W_UNATTENDED_SLASH_Q - - Loop - { - sleep 1000 - ifwinexist,, cannot be uninstalled - { - WinClose,, cannot be uninstalled - continue - } - Process, exist, dotnetfx35.exe - dotnet_pid = %ErrorLevel% - if dotnet_pid = 0 - { - break - } - } - " + "$WINE" dotnetfx35.exe /lang:ENU $W_UNATTENDED_SLASH_Q # Doesn't install any ngen.exe # W_NGEN_CMD="" @@ -8165,17 +8153,10 @@ { w_package_warn_win64 - if w_workaround_wine_bug 42170 "Running un-official repacked .NET 4.6.2 setup until the official version is fixed."; then - # Un-official slim version. See https://repacks.net/forum/viewtopic.php?t=7 - file_package="dotNetFx462_Full_x86_x64_Slim.exe" - w_download https://www.dropbox.com/s/1bdocgbate8hc8z/dotNetFx462_Full_x86_x64_Slim.exe?dl=1 8f03c8a9b2f4666c3707abe2d70145f200cb2f0f3b792626e64d167d1ad0565f $file_package - unattended_args="/ai /gm2" - else - # Official version. See https://www.microsoft.com/en-us/download/details.aspx?id=53344 - w_download https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe 28886593e3b32f018241a4c0b745e564526dbb3295cb2635944e3a393f4278d4 - file_package="NDP462-KB3151800-x86-x64-AllOS-ENU.exe" - unattended_args="/sfxlang:1027 /q /norestart" - fi + # Official version. See https://www.microsoft.com/en-us/download/details.aspx?id=53344 + w_download https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe 28886593e3b32f018241a4c0b745e564526dbb3295cb2635944e3a393f4278d4 + file_package="NDP462-KB3151800-x86-x64-AllOS-ENU.exe" + unattended_args="/sfxlang:1027 /q /norestart" w_call remove_mono @@ -10045,7 +10026,8 @@ # See ftp://ftp.microsoft.com/Softlib/index.txt # 2014/05/31: Microsoft FTP is down ftp://$ftp_microsoft_com/Softlib/MSLFILES/VBRUN200.EXE # 2015/08/10: chatnfiles is down, conradshome.com is up (and has a LOT of old MS installers archived!) - w_download https://www.conradshome.com/win31/archive/softlib/vbrun200.exe 4b0811d8fdcac1fd9411786c9119dc8d98d0540948211bdbc1ac682fbe5c0228 + # 2018/11/15: now conradshome is down ,but quaddicted.com also has it (and a lot more) + w_download https://www.quaddicted.com/files/mirrors/ftp.planetquake.com/aoe/downloads/VBRUN200.EXE 4b0811d8fdcac1fd9411786c9119dc8d98d0540948211bdbc1ac682fbe5c0228 w_try_unzip "$W_TMP" "$W_CACHE"/vb2run/VBRUN200.EXE w_try cp -f "$W_TMP/VBRUN200.DLL" "$W_SYSTEM32_DLLS" } @@ -10835,15 +10817,44 @@ w_metadata wininet dlls \ title="MS Windows Internet API" \ publisher="Microsoft" \ + year="2011" \ + media="download" \ + file1="../win7sp1/windows6.1-KB976932-X86.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/wininet.dll" + +load_wininet() +{ + helper_win7sp1 x86_microsoft-windows-i..tocolimplementation_31bf3856ad364e35_8.0.7601.17514_none_1eaaa4a07717236e/wininet.dll + w_try cp "$W_TMP/x86_microsoft-windows-i..tocolimplementation_31bf3856ad364e35_8.0.7601.17514_none_1eaaa4a07717236e/wininet.dll" "$W_SYSTEM32_DLLS/wininet.dll" + helper_win7sp1 x86_microsoft-windows-ie-runtimeutilities_31bf3856ad364e35_8.0.7601.17514_none_64655b7c61c841cb/iertutil.dll + w_try cp "$W_TMP/x86_microsoft-windows-ie-runtimeutilities_31bf3856ad364e35_8.0.7601.17514_none_64655b7c61c841cb/iertutil.dll" "$W_SYSTEM32_DLLS/iertutil.dll" + + if [ "$W_ARCH" = "win64" ]; then + helper_win7sp1_x64 amd64_microsoft-windows-i..tocolimplementation_31bf3856ad364e35_8.0.7601.17514_none_7ac940242f7494a4/wininet.dll + w_try cp "$W_TMP/amd64_microsoft-windows-i..tocolimplementation_31bf3856ad364e35_8.0.7601.17514_none_7ac940242f7494a4/wininet.dll" "$W_SYSTEM64_DLLS/wininet.dll" + helper_win7sp1_x64 amd64_microsoft-windows-ie-runtimeutilities_31bf3856ad364e35_8.0.7601.17514_none_c083f7001a25b301/iertutil.dll + w_try cp "$W_TMP/amd64_microsoft-windows-ie-runtimeutilities_31bf3856ad364e35_8.0.7601.17514_none_c083f7001a25b301/iertutil.dll" "$W_SYSTEM64_DLLS/iertutil.dll" + fi + + w_override_dlls native,builtin wininet + w_override_dlls native,builtin iertutil +} + +#---------------------------------------------------------------- + +w_metadata wininet_win2k dlls \ + title="MS Windows Internet API" \ + publisher="Microsoft" \ year="2008" \ media="download" \ file1="../win2ksp4/W2KSP4_EN.EXE" \ installed_file1="$W_SYSTEM32_DLLS_WIN/wininet.dll" -load_wininet() +load_wininet_win2k() { helper_win2ksp4 i386/wininet.dl_ w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/wininet.dl_ + w_override_dlls native,builtin wininet } @@ -11105,7 +11116,7 @@ { # See http://kldp.net/projects/baekmuk for project page # Need to download from Debian as the project page has unique captcha tokens per visitor - w_download "http://http.debian.net/debian/pool/main/f/fonts-baekmuk/fonts-baekmuk_2.2.orig.tar.gz"; 08ab7dffb55d5887cc942ce370f5e33b756a55fbb4eaf0b90f244070e8d51882 + w_download "https://deb.debian.org/debian/pool/main/f/fonts-baekmuk/fonts-baekmuk_2.2.orig.tar.gz"; 08ab7dffb55d5887cc942ce370f5e33b756a55fbb4eaf0b90f244070e8d51882 w_try_cd "$W_TMP" w_try tar -zxf "$W_CACHE/$W_PACKAGE/$file1" baekmuk-ttf-2.2/ttf @@ -11860,7 +11871,7 @@ # The OpenSymbol fonts are a replacement for the Windows Wingdings font from OpenOffice.org. # Need to w_download Debian since I can't find a standalone download from OpenOffice # Note: The source download package on debian is for _all_ of OpenOffice, which is 266 MB. - w_download "http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u11_all.deb"; b105ec27c738f92bd9801962f10fd05125c38224c92e702f84b00cbb482dfce7 + w_download "https://deb.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u11_all.deb"; b105ec27c738f92bd9801962f10fd05125c38224c92e702f84b00cbb482dfce7 w_try_cd "$W_TMP" w_try_ar "$W_CACHE/$W_PACKAGE/$file1" data.tar.xz @@ -11881,7 +11892,7 @@ load_tahoma() { - # Formerly at http://download.microsoft.com/download/ie55sp2/Install/5.5_SP2/WIN98Me/EN-US/IELPKTH.CAB + # Formerly at https://download.microsoft.com/download/ie55sp2/Install/5.5_SP2/WIN98Me/EN-US/IELPKTH.CAB w_download https://downloads.sourceforge.net/corefonts/OldFiles/IELPKTH.CAB c1be3fb8f0042570be76ec6daa03a99142c88367c1bc810240b85827c715961a w_try_cabextract -d "$W_TMP" "$W_CACHE/$W_PACKAGE/$file1" @@ -12776,7 +12787,7 @@ w_call msls31 # Change the override to the native so we are sure we use and register them - w_override_dlls native,builtin itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon wininet xmllite + w_override_dlls native,builtin ieproxy itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon wininet xmllite # IE8 installer will check the version number of iexplore.exe which causes IE8 installer to fail on wine-1.9.0+ w_override_dlls native iexplore.exe @@ -12850,6 +12861,12 @@ w_try_regedit "$W_TMP_WIN"\\set-tabprocgrowth.reg fi + # Builtin ieproxy is in system32, but ie8's lives in Program Files. Native + # CLSID path will get overwritten on prefix update. Setting ieproxy to + # native doesn't help because setupapi ignores DLL overrides. To work + # around this problem, copy native ieproxy to system32. + w_try cp -f "${W_PROGRAMS_X86_UNIX}/Internet Explorer/ieproxy.dll" "$W_SYSTEM32_DLLS" + # Seeing is believing case $WINETRICKS_GUI in none) @@ -13657,7 +13674,7 @@ file1="QQ8.9.1.exe" \ file2="QQ.tar.gz"\ installed_exe1="$W_PROGRAMS_X86_WIN/Tencent/QQ/Bin/QQScLauncher.exe" \ - homepage="http://www.qq.com"; \ + homepage="https://www.qq.com/"; \ unattended="no" load_qq() @@ -13882,7 +13899,7 @@ load_uplay() { # Changes too frequently, don't check anymore - w_download http://static3.cdn.ubi.com/orbit/launcher_installer/UplayInstaller.exe + w_download https://static3.cdn.ubi.com/orbit/launcher_installer/UplayInstaller.exe w_try_cd "$W_CACHE/$W_PACKAGE" # NSIS installer @@ -14148,7 +14165,7 @@ media="download" \ file1="winamp5666_full_all_redux.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Winamp/winamp.exe" \ - homepage="http://www.winamp.com"; + homepage="https://www.winamp.com/"; load_winamp() { @@ -14588,7 +14605,7 @@ { # Much faster w_download_manual http://www.bigdownload.com/games/stalker-call-of-pripyat/pc/stalker-call-of-pripyat-benchmark stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845 - #w_download http://files.gsc-game.com/st/bench/stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845 + #w_download https://files.gsc-game.com/st/bench/stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845 w_try_cd "$W_CACHE/$W_PACKAGE" @@ -14881,7 +14898,7 @@ WinWaitClose " - w_download http://static3.cdn.ubi.com/ac_brotherhood/ac_brotherhood_1.01_ww.exe a8027b08840a7438a0bd1a1c17f962fcc386a2cb9fd1d3055de2486bf95778c2 + w_download https://static3.cdn.ubi.com/ac_brotherhood/ac_brotherhood_1.01_ww.exe a8027b08840a7438a0bd1a1c17f962fcc386a2cb9fd1d3055de2486bf95778c2 # FIXME: figure out why these executables don't exit, and do a proper workaround or fix sleep 10 @@ -15246,69 +15263,6 @@ #---------------------------------------------------------------- -w_metadata cnc_tiberian_sun games \ - title="Command & Conquer: Tiberian Sun (2010 edition)" \ - publisher="EA" \ - year="1999" \ - media="download" \ - file1="OfficialCnCTiberianSun.rar" \ - installed_exe1="$W_PROGRAMS_X86_WIN\\EA Games\\Command & Conquer The First Decade\\Command & Conquer(tm) Tiberian Sun(tm)\\SUN\\Game.exe" - -load_cnc_tiberian_sun() -{ - w_download http://download.fileplanet.com/ftp1/022010/OfficialCnCTiberianSun.rar b04219e715511de9baa2feb9827013c8e106f8d6b9b563936b8a2f650305dec5 - - w_try_cd "$W_PROGRAMS_X86_UNIX" - # FIXME: we need a progress indicator when unpacking large archives - w_info "Unpacking rar file. This will take a minute." - w_try_unrar "$W_CACHE/$W_PACKAGE/$file1" -} - -#---------------------------------------------------------------- - -w_metadata cnc3_demo games \ - title="Command & Conquer 3 Demo" \ - publisher="EA" \ - year="2007" \ - media="download" \ - file1="CnC3Demo.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/Command & Conquer 3 Tiberium Wars Demo/CNC3Demo.exe" - -load_cnc3_demo() -{ - w_download "http://largedownloads.ea.com/pub/demos/CommandandConquer3/CnC3Demo.exe"; 1e2499f441ef1fc3cbe447ac16361ad4247a02b9b8ec05f504161e7b5b1254e5 - - w_try_cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - SetTitleMatchMode, 2 - run, CnC3Demo.exe - winwait, Conquer 3, free space to install - if ( w_opt_unattended > 0 ) { - controlclick, button1 - winwait, WinZip, After installation - controlclick, button1 - winwait, Conquer 3, InstallShield - controlclick, button1 - winwait, Conquer 3, license - controlclick, button3 - controlclick, button5 - winwait, Conquer 3, setup type - controlclick, button5 - winwait, Conquer 3, EA Link - controlclick, button1 - winwait, Conquer 3, GameSpy - controlclick, button1 - } - winwait, Conquer 3, Launch the program - if ( w_opt_unattended > 0 ) - controlclick, button1 - - winwaitclose, Conquer 3, Launch the program - " -} - -#---------------------------------------------------------------- - w_metadata cnc_redalert3_demo games \ title="Command & Conquer Red Alert 3 Demo" \ publisher="EA" \ @@ -17085,54 +17039,6 @@ } #---------------------------------------------------------------- - -w_metadata hphbp_demo games \ - title="Harry Potter and the Half-Blood Prince Demo" \ - publisher="EA" \ - year="2009" \ - media="download" \ - file1="Release_HBP_demo_PC_DD_DEMO_Final_348428.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/Harry Potter and the Half-Blood Prince Demo/pc/hp6_demo.exe" - -load_hphbp_demo() -{ - case "$LANG" in - ""|"C") w_die "Harry Potter will not install in the POSIX locale; please do 'export LANG=en_US.UTF-8' or something like that" ;; - esac - - w_download http://largedownloads.ea.com/pub/demos/HarryPotter/Release_HBP_demo_PC_DD_DEMO_Final_348428.exe eca6c5eb49dc2f778175a36e07b0b1d3f33db75fdb5fda8bfefd2c1648fbbd53 - - w_try_cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - SetTitleMatchMode, 2 - run, Release_HBP_demo_PC_DD_DEMO_FINAL_348428.exe - winwait, Harry Potter, Install - if ( w_opt_unattended > 0 ) { - controlclick, Button1, Harry Potter - winwait, Setup, License - controlclick, Button1 - controlclick, Button3 - winwait, Setup, License - controlclick, Button1 - controlclick, Button3 - winwait, Setup, Destination - controlclick, Button1 - winwait, Setup, begin - controlclick, Button1 - } - winwait, Setup, Finish - if ( w_opt_unattended > 0 ) - controlclick, Button1 - winwaitclose - " - - # Work around locale issues by symlinking the app's directory to not have a funny char - # Won't really work on Cygwin, but that's ok. - w_try_cd "$W_PROGRAMS_X86_UNIX/Electronic Arts" - ln -s "Harry Potter and the Half-Blood Prince"* "Harry Potter and the Half-Blood Prince Demo" -} - -#---------------------------------------------------------------- w_metadata kotor1 games \ title="Star Wars: Knights of the Old Republic" \ ++++++ winetricks.1 ++++++ --- /var/tmp/diff_new_pack.wHsbvY/_old 2018-11-27 10:43:37.368121836 +0100 +++ /var/tmp/diff_new_pack.wHsbvY/_new 2018-11-27 10:43:37.368121836 +0100 @@ -162,13 +162,13 @@ .SH BUGS .PP Bugs may be reported at -.I http://winetricks.org +.I https://github.com/Winetricks/winetricks .PP .SH AVAILABILITY The most recent version of .B winetricks can be downloaded from -.I http://winetricks.org/download/releases/ +.I https://github.com/Winetricks/winetricks/releases .PP The latest snapshot of the code may be obtained via git; see .I https://github.com/Winetricks/winetricks/ @@ -176,7 +176,7 @@ For further information about .B winetricks see -.I http://winetricks.org +.I https://github.com/Winetricks/winetricks/ .SH "SEE ALSO" .BR wine (1)
