From 1d7d9cf626c333597e52f9d5e1d40490cb700cab Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 1 May 2017 18:34:32 +0200 Subject: [PATCH] kernel32-Locale_Definitions: Disable patchset which causes a test failure. --- patches/kernel32-Locale_Definitions/definition | 1 + patches/patchinstall.sh | 18 ------------------ 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/patches/kernel32-Locale_Definitions/definition b/patches/kernel32-Locale_Definitions/definition index 4118472b..1280dfdf 100644 --- a/patches/kernel32-Locale_Definitions/definition +++ b/patches/kernel32-Locale_Definitions/definition @@ -1 +1,2 @@ # Fixes: [40619] Add sr-Latn-RS locale definition +Disabled: true diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 9287cea1..6e442da4 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -182,7 +182,6 @@ patch_enable_all () enable_kernel32_GetShortPathName="$1" enable_kernel32_K32GetPerformanceInfo="$1" enable_kernel32_LocaleNameToLCID="$1" - enable_kernel32_Locale_Definitions="$1" enable_kernel32_Misalign_Workaround="$1" enable_kernel32_MoveFile="$1" enable_kernel32_NeedCurrentDirectoryForExePath="$1" @@ -771,9 +770,6 @@ patch_enable () kernel32-LocaleNameToLCID) enable_kernel32_LocaleNameToLCID="$2" ;; - kernel32-Locale_Definitions) - enable_kernel32_Locale_Definitions="$2" - ;; kernel32-Misalign_Workaround) enable_kernel32_Misalign_Workaround="$2" ;; @@ -4557,20 +4553,6 @@ if test "$enable_kernel32_LocaleNameToLCID" -eq 1; then ) >> "$patchlist" fi -# Patchset kernel32-Locale_Definitions -# | -# | Modified files: -# | * dlls/kernel32/locale_rc.rc, dlls/kernel32/nls/srl.nls, dlls/kernel32/nls/srsl.nls -# | -if test "$enable_kernel32_Locale_Definitions" -eq 1; then - patch_apply kernel32-Locale_Definitions/0001-kernel32-Update-sr-Latn-locale-definition.patch - patch_apply kernel32-Locale_Definitions/0002-kernel32-Add-sr-Latn-RS-locale-definition.patch - ( - printf '%s\n' '+ { "Michael Müller", "kernel32: Update sr-Latn locale definition.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "kernel32: Add sr-Latn-RS locale definition.", 1 },'; - ) >> "$patchlist" -fi - # Patchset kernel32-Misalign_Workaround # | # | This patchset fixes the following Wine bugs: