Rebase against 4a7d6576f0a8507097e3894a579061b568db6ac6.

patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch

@@ -1,50 +1,26 @@
-From fd12e8e89a6f42ce0737006d9951c644b2e4ec54 Mon Sep 17 00:00:00 2001
+From 684fb32612284520e8e4b61cb015f546c8b5d218 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 1 Jul 2019 09:58:55 +1000
 Subject: [PATCH] loader: Add Keyboard Layouts registry enteries.
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
- loader/wine.inf.in | 209 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 209 insertions(+)
+ loader/wine.inf.in | 206 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 206 insertions(+)
 
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index 000ba36bf36..9a86c6241b1 100644
+index f204c458511..62cc028a0d0 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -63,6 +63,7 @@ AddReg=\
-     Debugger,\
+@@ -64,6 +64,7 @@ AddReg=\
      DirectX,\
      Fonts,\
+     LicenseInformation,\
 +    KeyboardLayouts,\
      MCI,\
      Misc,\
      OLE,\
-@@ -86,6 +87,7 @@ AddReg=\
-     Debugger,\
-     DirectX,\
-     Fonts,\
-+    KeyboardLayouts,\
-     MCI,\
-     Misc,\
-     OLE,\
-@@ -111,6 +113,7 @@ AddReg=\
-     Debugger,\
-     DirectX,\
-     Fonts,\
-+    KeyboardLayouts,\
-     MCI,\
-     Misc,\
-     OLE,\
-@@ -157,6 +160,7 @@ AddReg=\
-     CurrentVersionWow64.ntx86,\
-     Debugger,\
-     DirectX,\
-+    KeyboardLayouts,\
-     MCI,\
-     Misc,\
-     VCRuntime.ntamd64,\
-@@ -677,6 +681,211 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic
+@@ -632,6 +633,211 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic
  HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http"
  HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https"
  

staging/upstream-commit

@@ -1 +1 @@
-7dcdd7a6549793e8a6469816a5c25226e2d73e9c
+4a7d6576f0a8507097e3894a579061b568db6ac6