commit wine for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2018-10-15 09:46:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wine" Mon Oct 15 09:46:22 2018 rev:264 rq:641941 version:3.18 Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2018-10-02 19:48:21.573772619 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2018-10-15 09:47:30.623098757 +0200 @@ -1,0 +2,12 @@ +Sat Oct 13 07:43:30 UTC 2018 - meissner@suse.com + +- Update to 3.18 development release + - Subpixel font rendering with FreeType >= 2.8.1. + - Support for OAEP algorithm in RSA encryption. + - Array marshalling fixes in DCOM. + - Improved DPI scaling in the Wine console. + - Various bug fixes. +- updated staging to 3.18 +- updated winetricks + +------------------------------------------------------------------- Old: ---- wine-3.17.tar.xz wine-3.17.tar.xz.sign wine-d3d9-patches-3.16.tar.xz wine-staging-3.17.tar.xz New: ---- wine-3.18.tar.xz wine-3.18.tar.xz.sign wine-d3d9-patches-3.17.tar.xz wine-staging-3.18.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.wQBcIV/_old 2018-10-15 09:47:31.963097266 +0200 +++ /var/tmp/diff_new_pack.wQBcIV/_new 2018-10-15 09:47:31.967097261 +0200 @@ -107,8 +107,8 @@ BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -%define realver 3.17 -Version: 3.17 +%define realver 3.18 +Version: 3.18 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.17 +%define staging_version 3.18 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.16 +%define nine_version 3.17 BuildRequires: Mesa-libd3d-devel BuildRequires: libOSMesa-devel BuildRequires: pkgconfig(dri2proto) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.wQBcIV/_old 2018-10-15 09:47:32.015097207 +0200 +++ /var/tmp/diff_new_pack.wQBcIV/_new 2018-10-15 09:47:32.015097207 +0200 @@ -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.17</param> + <param name="revision">refs/tags/v3.18</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.16</param> + <param name="revision">refs/tags/wine-d3d9-3.17</param> <param name="scm">git</param> </service> <service name="recompress" mode="disabled"> ++++++ wine-3.17.tar.xz -> wine-3.18.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-3.17.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-3.18.tar.xz differ: char 26, line 1 ++++++ wine-d3d9-patches-3.16.tar.xz -> wine-d3d9-patches-3.17.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.16/d3d9-helper.patch new/wine-d3d9-patches-3.17/d3d9-helper.patch --- old/wine-d3d9-patches-3.16/d3d9-helper.patch 2018-09-17 03:01:49.000000000 +0200 +++ new/wine-d3d9-patches-3.17/d3d9-helper.patch 2018-09-30 20:54:02.000000000 +0200 @@ -1,6 +1,6 @@ -From aa3701b578511d44a810c5541ee26ec16f2adeb7 Mon Sep 17 00:00:00 2001 +From cd3f552bf4fcb8c66fedc38ae841878b7a2f39f2 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <sarnex@gentoo.org> -Date: Sun, 16 Sep 2018 21:00:41 -0400 +Date: Sun, 30 Sep 2018 14:52:30 -0400 Subject: [PATCH] D3D9 Helper Signed-off-by: Nick Sarnie <sarnex@gentoo.org> @@ -18,7 +18,7 @@ create mode 100644 programs/winecfg/staging.c diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 26b2431047..de57f5428b 100644 +index a66a708a7b..cd7592832f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -110,6 +110,7 @@ struct builtin_load_info @@ -29,7 +29,7 @@ NTSTATUS status; WINE_MODREF *wm; }; -@@ -135,7 +136,8 @@ static WINE_MODREF *cached_modref; +@@ -134,7 +135,8 @@ static WINE_MODREF *cached_modref; static WINE_MODREF *current_modref; static WINE_MODREF *last_failed_modref; @@ -39,7 +39,7 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ); static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, DWORD ordinal, LPCWSTR load_path ); -@@ -511,7 +513,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS +@@ -510,7 +512,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (!(wm = find_basename_module( mod_name ))) { TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward ); @@ -48,7 +48,7 @@ !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { if (!imports_fixup_done && current_modref) -@@ -682,7 +684,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP +@@ -681,7 +683,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP { ascii_to_unicode( buffer, name, len ); buffer[len] = 0; @@ -57,7 +57,7 @@ } else /* need to allocate a larger buffer */ { -@@ -690,7 +692,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP +@@ -689,7 +691,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP if (!ptr) return FALSE; ascii_to_unicode( ptr, name, len ); ptr[len] = 0; @@ -66,7 +66,7 @@ RtlFreeHeap( GetProcessHeap(), 0, ptr ); } -@@ -976,7 +978,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * +@@ -975,7 +977,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * prev = current_modref; current_modref = wm; @@ -75,7 +75,7 @@ current_modref = prev; if (status) { -@@ -1064,7 +1066,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) +@@ -1063,7 +1065,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) * Allocate a WINE_MODREF structure and add it to the process list * The loader_section must be locked while calling this function. */ @@ -84,7 +84,7 @@ { WINE_MODREF *wm; const WCHAR *p; -@@ -1078,7 +1080,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) +@@ -1077,7 +1079,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; @@ -93,7 +93,7 @@ if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++; else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); -@@ -1745,7 +1747,7 @@ static void load_builtin_callback( void *module, const char *filename ) +@@ -1744,7 +1746,7 @@ static void load_builtin_callback( void *module, const char *filename ) return; } @@ -102,7 +102,7 @@ RtlFreeHeap( GetProcessHeap(), 0, fullname ); if (!wm) { -@@ -1955,8 +1957,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) +@@ -1954,8 +1956,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; -@@ -1999,7 +2001,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -1998,7 +2000,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; -@@ -2067,8 +2069,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -2066,8 +2068,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; -@@ -2088,6 +2090,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, +@@ -2087,6 +2089,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; -@@ -2286,6 +2289,108 @@ done: +@@ -2285,6 +2288,108 @@ done: return status; } @@ -250,7 +250,7 @@ /*********************************************************************** * open_dll_file -@@ -2332,7 +2437,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct +@@ -2331,7 +2436,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; -@@ -2377,20 +2482,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, +@@ -2376,20 +2481,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 */ -@@ -2438,8 +2564,10 @@ overflow: +@@ -2437,8 +2563,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; -@@ -2456,7 +2584,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2455,7 +2583,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; -@@ -2476,6 +2604,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2475,6 +2603,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 )) -@@ -2498,22 +2645,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2497,22 +2644,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)) { -@@ -2523,7 +2670,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2522,7 +2669,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; } -@@ -2556,7 +2703,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, +@@ -2555,7 +2702,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)) { -@@ -2595,7 +2742,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S +@@ -2594,7 +2741,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; -@@ -3517,7 +3664,7 @@ void __wine_process_init(void) +@@ -3515,7 +3662,7 @@ void __wine_process_init(void) /* setup the load callback and create ntdll modref */ wine_dll_set_callback( load_builtin_callback ); @@ -805,7 +805,7 @@ + return ret; +} diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 165f083425..78c6ee0710 100644 +index 85ba707b04..d02430649b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -214,6 +214,7 @@ enum loadorder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.16/staging-helper.patch new/wine-d3d9-patches-3.17/staging-helper.patch --- old/wine-d3d9-patches-3.16/staging-helper.patch 2018-09-17 03:01:49.000000000 +0200 +++ new/wine-d3d9-patches-3.17/staging-helper.patch 2018-09-30 20:54:02.000000000 +0200 @@ -1,7 +1,7 @@ -From 3d0cdc67616f9dbcd6ad7c7524aaf50d529a4dd5 Mon Sep 17 00:00:00 2001 +From 260fcdb64a5f9f990efc70a7dd53041ad8fd6787 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <sarnex@gentoo.org> -Date: Sun, 16 Sep 2018 20:59:23 -0400 -Subject: [PATCH] Staging Helper +Date: Sun, 30 Sep 2018 14:51:06 -0400 +Subject: [PATCH] Staging helper Signed-off-by: Nick Sarnie <sarnex@gentoo.org> --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.16/wine-d3d9.patch new/wine-d3d9-patches-3.17/wine-d3d9.patch --- old/wine-d3d9-patches-3.16/wine-d3d9.patch 2018-09-17 03:01:49.000000000 +0200 +++ new/wine-d3d9-patches-3.17/wine-d3d9.patch 2018-09-30 20:54:02.000000000 +0200 @@ -1,6 +1,6 @@ -From 9a97d5ec74cbbbf6cdd37368128c19a5cdb1dffd Mon Sep 17 00:00:00 2001 +From 9ff85c78cb98810a95c21bebeab611f51c048271 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <sarnex@gentoo.org> -Date: Sun, 16 Sep 2018 20:59:42 -0400 +Date: Sun, 30 Sep 2018 14:51:35 -0400 Subject: [PATCH] Wine D3D9 Signed-off-by: Nick Sarnie <sarnex@gentoo.org> @@ -41,7 +41,7 @@ create mode 100644 dlls/d3d9-nine/wndproc.h diff --git a/configure.ac b/configure.ac -index 34fe888da5..307649b015 100644 +index 674093d520..3759bea5ef 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), @@ -252,7 +252,7 @@ CPPFLAGS="$ac_save_CPPFLAGS" else X_CFLAGS="" -@@ -3263,6 +3450,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) +@@ -3262,6 +3449,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) WINE_CONFIG_MAKEFILE(dlls/d3d9) WINE_CONFIG_MAKEFILE(dlls/d3d9/tests) ++++++ wine-staging-3.17.tar.xz -> wine-staging-3.18.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-staging-3.17.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-staging-3.18.tar.xz differ: char 26, line 1
participants (1)
-
root