Rebase against d177709b10ce07ddd234b0e8e00764ae4b1d8488.

patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,4 +1,4 @@
-From e9f5c886b6b40ca77eb1dd7f0d21bbdc483b7a95 Mon Sep 17 00:00:00 2001
+From d51057f7c91016d2c6f5c3b21d201f86d7c085b5 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
@@ -9,7 +9,7 @@ Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
-index 74647820126..9f0aad2fc4f 100644
+index 3657fa7db12..c8114677bc6 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -2,7 +2,7 @@ MODULE    = dbghelp.dll
@@ -18,9 +18,9 @@ index 74647820126..9f0aad2fc4f 100644
  EXTRAINCL = $(ZLIB_PE_CFLAGS)
 -EXTRADEFS = -D_IMAGEHLP_SOURCE_
 +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\""
- DELAYIMPORTS = version
  
  C_SRCS = \
+ 	coff.c \
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
 index a2a60752a68..a2bca11048f 100644
 --- a/dlls/dbghelp/elf_module.c
@@ -34,5 +34,5 @@ index a2a60752a68..a2bca11048f 100644
      }
  
 -- 
-2.40.1
+2.42.0
 

patches/fonts-Missing_Fonts/0001-fonts-Add-Liberation-Sans-as-an-Arial-replacement.patch

@@ -1,31 +1,31 @@
-From 5b1941f523b17f6131000ef5f188bc51a7a616c8 Mon Sep 17 00:00:00 2001
+From db27b07e0751b2535f729fa433dc67ba9668a394 Mon Sep 17 00:00:00 2001
 From: Torsten Kurbad <t.kurbad@iwm-kmrc.de>
 Date: Tue, 22 Jul 2014 18:11:41 -0600
-Subject: fonts: Add Liberation Sans as an Arial replacement. (v2)
+Subject: [PATCH] fonts: Add Liberation Sans as an Arial replacement. (v2)
 
 Changes in v2 by Sebastian Lackner <sebastian@fds-team.de>:
 * Update to Liberation Sans version 1.07.4
 ---
  fonts/Makefile.in |     1 +
- fonts/arial.sfd   | 86988 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ fonts/arial.sfd   | 86988 ++++++++++++++++++++++++++++++++++++++++++++
  fonts/arial.ttf   |   Bin 0 -> 134188 bytes
  3 files changed, 86989 insertions(+)
  create mode 100644 fonts/arial.sfd
  create mode 100644 fonts/arial.ttf
 
 diff --git a/fonts/Makefile.in b/fonts/Makefile.in
-index 9d4ea9f..6bbc79c 100644
+index a582d7be864..ab80e7b70f7 100644
 --- a/fonts/Makefile.in
 +++ b/fonts/Makefile.in
 @@ -1,4 +1,5 @@
- FONT_SRCS = \
+ SOURCES = \
 +	arial.sfd \
  	courier.sfd \
  	fixedsys.sfd \
  	fixedsys_jp.sfd \
 diff --git a/fonts/arial.sfd b/fonts/arial.sfd
 new file mode 100644
-index 0000000..8a04e04
+index 00000000000..8a04e0486c2
 --- /dev/null
 +++ b/fonts/arial.sfd
 @@ -0,0 +1,86988 @@
@@ -88782,5 +88782,5 @@ literal 0
 HcmV?d00001
 
 -- 
-2.5.0
+2.42.0
 

patches/fonts-Missing_Fonts/0003-fonts-Add-Liberation-Mono-as-an-Courier-New-replacem.patch

@@ -1,22 +1,22 @@
-From 52ceb247058041e8630175d4860261e871c571da Mon Sep 17 00:00:00 2001
+From 5305bdbc5091ae02c179bf88ed35f1e7fe2a7aec Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 3 Sep 2015 01:30:37 +0200
-Subject: fonts: Add Liberation Mono as an Courier New replacement.
+Subject: [PATCH] fonts: Add Liberation Mono as an Courier New replacement.
 
 ---
  fonts/Makefile.in |     1 +
- fonts/cour.sfd    | 67696 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ fonts/cour.sfd    | 67696 ++++++++++++++++++++++++++++++++++++++++++++
  fonts/cour.ttf    |   Bin 0 -> 108468 bytes
  3 files changed, 67697 insertions(+)
  create mode 100644 fonts/cour.sfd
  create mode 100644 fonts/cour.ttf
 
 diff --git a/fonts/Makefile.in b/fonts/Makefile.in
-index 33f4f03..3777c54 100644
+index f62f0e104fb..5326641b859 100644
 --- a/fonts/Makefile.in
 +++ b/fonts/Makefile.in
 @@ -1,5 +1,6 @@
- FONT_SRCS = \
+ SOURCES = \
  	arial.sfd \
 +	cour.sfd \
  	courier.sfd \
@@ -24,7 +24,7 @@ index 33f4f03..3777c54 100644
  	fixedsys_jp.sfd \
 diff --git a/fonts/cour.sfd b/fonts/cour.sfd
 new file mode 100644
-index 0000000..88d988a
+index 00000000000..88d988a8caa
 --- /dev/null
 +++ b/fonts/cour.sfd
 @@ -0,0 +1,67696 @@
@@ -69150,5 +69150,5 @@ literal 0
 HcmV?d00001
 
 -- 
-2.5.0
+2.42.0
 

staging/upstream-commit

@@ -1 +1 @@
-8943fcbca4963ac6740a5c6e13d5fc9b7748cad2
+d177709b10ce07ddd234b0e8e00764ae4b1d8488