Rebase against 6b58d34a625ffaad181a7316009398f3c6444181.

patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch

@@ -1,4 +1,4 @@
-From 12860d721c1d0b07d717da5816713832fad3b6a8 Mon Sep 17 00:00:00 2001
+From d2c903e409fe9a2b428791311507af04d611d2d3 Mon Sep 17 00:00:00 2001
 From: Daniel Wendt <daniel.wendt@linux.com>
 Date: Fri, 15 Nov 2013 12:52:37 +0100
 Subject: [PATCH] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing
@@ -116,12 +116,12 @@ index c6f11ae6a69..e4a5f7bab8b 100644
      {
          HeapFree( GetProcessHeap(), 0, points );
 diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
-index 489f4475736..d830261e13e 100644
+index 305dec43c7f..44fecbf7400 100644
 --- a/dlls/gdi32/gdi_private.h
 +++ b/dlls/gdi32/gdi_private.h
-@@ -175,4 +175,7 @@ extern BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HI
- extern BOOL EMFDC_SetWindowExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN;
- extern BOOL EMFDC_SetWindowOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN;
+@@ -188,4 +188,7 @@ extern BOOL EMFDC_StretchBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_
+                               HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src,
+                               DWORD rop );
  
 +BOOL xform_has_rotate_and_uniform_scale_and_shear( const XFORM *xform ) DECLSPEC_HIDDEN;
 +BOOL xform_decompose_rotation_and_translation( XFORM *xform, XFORM *rotation_and_translation ) DECLSPEC_HIDDEN;

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "91494ae6f2e47254d15a47e292ff569f3b400be6"
+	echo "6b58d34a625ffaad181a7316009398f3c6444181"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-91494ae6f2e47254d15a47e292ff569f3b400be6
+6b58d34a625ffaad181a7316009398f3c6444181