Update xorg-sever patches

5 files changed, 47 insertions, 214 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 8fc0100..86868aa 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -360,9 +360,7 @@ def BuilderList(slaves):
                   'mesa-glut' :   [ '0001-Fix-build-when-GL-or-libX11-are-in-non-standard-loca.patch' ],
                   'app-sessreg' : [ '0001-Don-t-try-to-use-utmpx-functions-if-WTMPX_FILE-isn-t.patch' ],
                   'app-xdm' :     [ '0001-Workaround-Cygwin-s-failure-to-prototype-initgroups.patch' ],
-                  'xserver' :     [ '0001-Bodge-around-prototype-scoping-issues-with-winmultiw.patch',
-                                    '0002-Bodge-around-prototype-scoping-issues-with-winauth.c.patch',
-                                    '0003-Ensure-WIN32-check-triggers-on-MinGW-only-and-not-Cy.patch' ],
+                  'xserver' :     [ '0001-Use-Bool-type-in-winShowWindowOnTaskbar-prototype.patch', ],
                   'xcb-proto' :   [ '0001-Update-XML-schema-to-fix-make-check.patch' ],
                   'khronos-opengl-registry' : [ 'Makefile.patch' ] }
 
diff --git a/patches/xserver/0001-Bodge-around-prototype-scoping-issues-with-winmultiw.patch b/patches/xserver/0001-Bodge-around-prototype-scoping-issues-with-winmultiw.patch
deleted file mode 100644
index 976b602..0000000
--- a/patches/xserver/0001-Bodge-around-prototype-scoping-issues-with-winmultiw.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 98326b7a27851fc9230195096c3135c6dc385ea5 Mon Sep 17 00:00:00 2001
-From: Jon TURNEY <jon.turney@dronecode.org.uk>
-Date: Fri, 6 Feb 2015 15:13:52 +0000
-Subject: [PATCH 1/3] Bodge around prototype scoping issues with
- winmultiwindowicons.h
-
-Fixes compilation with -Werror=implicit-function-declaration
-
-Should definitely look at xcb conversion for internal WM, as that will avoid all
-the xlib/xserver namespace collision issues
-
-Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
----
- hw/xwin/winmultiwindowicons.c  | 3 +++
- hw/xwin/winmultiwindowicons.h  | 4 ++--
- hw/xwin/winmultiwindowwindow.c | 2 ++
- hw/xwin/winmultiwindowwm.c     | 2 ++
- hw/xwin/winprefs.c             | 1 +
- hw/xwin/winwin32rootless.c     | 1 +
- 6 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c
-index cc45387..75bcaed 100644
---- a/hw/xwin/winmultiwindowicons.c
-+++ b/hw/xwin/winmultiwindowicons.c
-@@ -45,6 +45,9 @@
- #include "winmsg.h"
- #include "winmultiwindowicons.h"
- #include "winglobals.h"
-+
-+extern void winUpdateIcon(HWND hWnd, Display * pDisplay, Window id, HICON hIconNew);
-+
- /*
-  * global variables
-  */
-diff --git a/hw/xwin/winmultiwindowicons.h b/hw/xwin/winmultiwindowicons.h
-index bf7f6ed..5e0873a 100644
---- a/hw/xwin/winmultiwindowicons.h
-+++ b/hw/xwin/winmultiwindowicons.h
-@@ -27,8 +27,8 @@
- #ifndef WINMULTIWINDOWICONS_H
- #define WINMULTIWINDOWICONS_H
- 
--void
-- winUpdateIcon(HWND hWnd, Display * pDisplay, Window id, HICON hIconNew);
-+//void
-+// winUpdateIcon(HWND hWnd, Display * pDisplay, Window id, HICON hIconNew);
- 
- void
-  winInitGlobalIcons(void);
-diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
-index f4de912..75ab2c9 100644
---- a/hw/xwin/winmultiwindowwindow.c
-+++ b/hw/xwin/winmultiwindowwindow.c
-@@ -35,9 +35,11 @@
- #ifdef HAVE_XWIN_CONFIG_H
- #include <xwin-config.h>
- #endif
-+
- #include "win.h"
- #include "dixevents.h"
- #include "winmultiwindowclass.h"
-+#include "winmultiwindowicons.h"
- 
- /*
-  * Prototypes for local functions
-diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
-index 1efe96a..8bee04c 100644
---- a/hw/xwin/winmultiwindowwm.c
-+++ b/hw/xwin/winmultiwindowwm.c
-@@ -62,6 +62,7 @@
- #include "windowstr.h"
- #include "winglobals.h"
- #include "windisplay.h"
-+#include "winmultiwindowicons.h"
- 
- #ifdef XWIN_MULTIWINDOWEXTWM
- #include <X11/extensions/windowswmstr.h>
-@@ -78,6 +79,7 @@
- extern void winDebug(const char *format, ...);
- extern void winReshapeMultiWindow(WindowPtr pWin);
- extern void winUpdateRgnMultiWindow(WindowPtr pWin);
-+extern void winUpdateIcon(HWND hWnd, Display * pDisplay, Window id, HICON hIconNew);
- 
- #ifndef CYGDEBUG
- #define CYGDEBUG NO
-diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
-index 5052927..a180a9e 100644
---- a/hw/xwin/winprefs.c
-+++ b/hw/xwin/winprefs.c
-@@ -46,6 +46,7 @@
- #include "winprefs.h"
- #include "windisplay.h"
- #include "winmultiwindowclass.h"
-+#include "winmultiwindowicons.h"
- 
- /* Where will the custom menu commands start counting from? */
- #define STARTMENUID WM_USER
-diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c
-index 660a78f..9d0bab5 100644
---- a/hw/xwin/winwin32rootless.c
-+++ b/hw/xwin/winwin32rootless.c
-@@ -40,6 +40,7 @@
- #define _WINDOWSWM_SERVER_
- #include <X11/extensions/windowswmstr.h>
- #include "winmultiwindowclass.h"
-+#include "winmultiwindowicons.h"
- #include <X11/Xatom.h>
- 
- /*
--- 
-2.5.1
-
diff --git a/patches/xserver/0001-Use-Bool-type-in-winShowWindowOnTaskbar-prototype.patch b/patches/xserver/0001-Use-Bool-type-in-winShowWindowOnTaskbar-prototype.patch
new file mode 100644
index 0000000..7d966ee
--- /dev/null
+++ b/patches/xserver/0001-Use-Bool-type-in-winShowWindowOnTaskbar-prototype.patch
@@ -0,0 +1,46 @@
+From 4ad58bc21ae397ca76aff3b9b97d4bb803460bc3 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 7 Apr 2016 17:40:56 +0100
+Subject: [PATCH xserver] Use Bool type in winShowWindowOnTaskbar() prototype
+
+Use the Bool type from X11/Xdefs.h for winShowWindowOnTaskbar().
+
+This is the boolean type we should be using inside the X server, rather than
+BOOL, which evaluates to either the Win32 API type, or the Xlib API type,
+depending on the context...
+
+Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+---
+ hw/xwin/wintaskbar.c | 2 +-
+ hw/xwin/winwindow.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xwin/wintaskbar.c b/hw/xwin/wintaskbar.c
+index 7dd4ec3..401ec17 100644
+--- a/hw/xwin/wintaskbar.c
++++ b/hw/xwin/wintaskbar.c
+@@ -66,7 +66,7 @@ DECLARE_INTERFACE_(ITaskbarList, IUnknown)
+    seem to be the case
+ */
+ 
+-void winShowWindowOnTaskbar(HWND hWnd, BOOL show)
++void winShowWindowOnTaskbar(HWND hWnd, Bool show)
+ {
+   ITaskbarList* pTaskbarList = NULL;
+ 
+diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h
+index e3a5948..65e4bea 100644
+--- a/hw/xwin/winwindow.h
++++ b/hw/xwin/winwindow.h
+@@ -160,7 +160,7 @@ void
+  winSetAppUserModelID(HWND hWnd, const char *AppID);
+ 
+ void
+- winShowWindowOnTaskbar(HWND hWnd, BOOL show);
++ winShowWindowOnTaskbar(HWND hWnd, Bool show);
+ 
+ #endif                          /* XWIN_MULTIWINDOW */
+ #endif
+-- 
+2.8.0
+
diff --git a/patches/xserver/0002-Bodge-around-prototype-scoping-issues-with-winauth.c.patch b/patches/xserver/0002-Bodge-around-prototype-scoping-issues-with-winauth.c.patch
deleted file mode 100644
index 7641406..0000000
--- a/patches/xserver/0002-Bodge-around-prototype-scoping-issues-with-winauth.c.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 880afbaaa1d5475a1f06ed37259f9916dc35a1bc Mon Sep 17 00:00:00 2001
-From: Jon TURNEY <jon.turney@dronecode.org.uk>
-Date: Fri, 6 Feb 2015 15:16:43 +0000
-Subject: [PATCH 2/3] Bodge around prototype scoping issues with winauth.c
-
-Fixes compilation with -Werror=implicit-function-declaration
-
-Should definitely look at xcb conversion for internal WM, as that will avoid all
-the xlib/xserver namespace collision issues
-
-Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
----
- hw/xwin/winauth.c          | 9 +++++++++
- hw/xwin/winmultiwindowwm.c | 1 +
- 2 files changed, 10 insertions(+)
-
-diff --git a/hw/xwin/winauth.c b/hw/xwin/winauth.c
-index 7efa1c0..c75228c 100644
---- a/hw/xwin/winauth.c
-+++ b/hw/xwin/winauth.c
-@@ -38,6 +38,15 @@
- #include "securitysrv.h"
- #include "os/osdep.h"
- 
-+/* Need to get this from Xlib.h */
-+extern void XSetAuthorization(
-+    const char *                /* name */,
-+    int                         /* namelen */,
-+    const char *                /* data */,
-+    int                         /* datalen */
-+);
-+
-+
- /*
-  * Constants
-  */
-diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
-index 8bee04c..c493099 100644
---- a/hw/xwin/winmultiwindowwm.c
-+++ b/hw/xwin/winmultiwindowwm.c
-@@ -80,6 +80,7 @@ extern void winDebug(const char *format, ...);
- extern void winReshapeMultiWindow(WindowPtr pWin);
- extern void winUpdateRgnMultiWindow(WindowPtr pWin);
- extern void winUpdateIcon(HWND hWnd, Display * pDisplay, Window id, HICON hIconNew);
-+extern void winSetAuthorization(void);
- 
- #ifndef CYGDEBUG
- #define CYGDEBUG NO
--- 
-2.5.1
-
diff --git a/patches/xserver/0003-Ensure-WIN32-check-triggers-on-MinGW-only-and-not-Cy.patch b/patches/xserver/0003-Ensure-WIN32-check-triggers-on-MinGW-only-and-not-Cy.patch
deleted file mode 100644
index 4108c4e..0000000
--- a/patches/xserver/0003-Ensure-WIN32-check-triggers-on-MinGW-only-and-not-Cy.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 999bffe3e82df36e87ea63ba88259858a8a18b25 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Wed, 3 Feb 2016 23:40:07 +0000
-Subject: [PATCH 3/3] Ensure WIN32 check triggers on MinGW only and not Cygwin.
-
-To ensure that if WIN32 is defined on Cygwin, fd_mask doesn't get defined as a
-type which conflicts with select.h's definition of it.
-
-Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
----
- os/osdep.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/os/osdep.h b/os/osdep.h
-index 2fbfc48..3dc2daf 100644
---- a/os/osdep.h
-+++ b/os/osdep.h
-@@ -72,7 +72,7 @@ SOFTWARE.
- #if defined(NOFILE) && !defined(NOFILES_MAX)
- #define OPEN_MAX NOFILE
- #else
--#if !defined(WIN32)
-+#if !defined(WIN32) || defined(__CYGWIN__)
- #define OPEN_MAX NOFILES_MAX
- #else
- #define OPEN_MAX 512
-@@ -178,7 +178,7 @@ extern fd_set ClientsWriteBlocked;
- extern fd_set OutputPending;
- extern fd_set IgnoredClientsWithInput;
- 
--#ifndef WIN32
-+#if !defined(WIN32) || defined(__CYGWIN__)
- extern int *ConnectionTranslation;
- #else
- extern int GetConnectionTranslation(int conn);
-@@ -193,7 +193,7 @@ extern Bool NumNotifyWriteFd;
- extern WorkQueuePtr workQueue;
- 
- /* in WaitFor.c */
--#ifdef WIN32
-+#if defined(WIN32) && !defined(__CYGWIN__)
- typedef long int fd_mask;
- #endif
- #define ffs mffs
--- 
-2.7.0
-