1 files changed, 138 insertions, 0 deletions
diff --git a/vcpkg/ports/libx11/vcxserver.patch b/vcpkg/ports/libx11/vcxserver.patch
new file mode 100644
index 0000000..10a6312
--- /dev/null
+++ b/vcpkg/ports/libx11/vcxserver.patch
@@ -0,0 +1,138 @@
+diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
+index 5faf83b..c6c63a3 100644
+--- a/include/X11/Xlib.h
++++ b/include/X11/Xlib.h
+@@ -79,7 +79,7 @@ _Xmblen(
+ 
+ typedef char *XPointer;
+ 
+-#define Bool int
+-#define Status int
++typedef int Bool;
++typedef int Status;
+ #define True 1
+ #define False 0
+diff --git a/src/CrGlCur.c b/src/CrGlCur.c
+index 460660f..510ff5d 100644
+--- a/src/CrGlCur.c
++++ b/src/CrGlCur.c
+@@ -51,8 +51,14 @@ in this Software without prior written authorization from The Open Group.
+ #if defined(hpux)
+ typedef shl_t	XModuleType;
+ #else
++#ifdef _MSC_VER
++#include <X11/XWindows.h>
++typedef HANDLE XModuleType;
++#define dlsym GetProcAddress
++#else
+ typedef void *XModuleType;
+ #endif
++#endif
+ 
+ #ifndef LIBXCURSOR
+ #define LIBXCURSOR "libXcursor.so.1"
+@@ -70,8 +76,12 @@ open_library (void)
+     {
+ #if defined(hpux)
+ 	module = shl_load(library, BIND_DEFERRED, 0L);
++#else
++#ifdef _MSC_VER
++	module =  LoadLibrary(library);
+ #else
+ 	module =  dlopen(library, RTLD_LAZY);
++#endif
+ #endif
+ 	if (module)
+ 	    return module;
+diff --git a/src/GetDflt.c b/src/GetDflt.c
+index c9222a2..c6e1b25 100644
+--- a/src/GetDflt.c
++++ b/src/GetDflt.c
+@@ -137,9 +138,13 @@ InitDefaults(
+      * ~/.Xdefaults.  Next, if there is an XENVIRONMENT environment variable,
+      * then load that file.
+      */
+-
++     
+     if (dpy->xdefaults == NULL) {
++	#ifdef _MSC_VER
++	const char *slashDotXdefaults = ".Xdefaults";
++	#else
+ 	const char *slashDotXdefaults = "/.Xdefaults";
++	#endif
+ 
+ 	(void) GetHomeDir (fname, (int) (PATH_MAX - strlen (slashDotXdefaults) - 1));
+ 	(void) strcat (fname, slashDotXdefaults);
+@@ -149,7 +154,11 @@ InitDefaults(
+     }
+ 
+     if (!(xenv = getenv ("XENVIRONMENT"))) {
++	#ifdef _MSC_VER
++	const char *slashDotXdefaultsDash = ".Xdefaults-";
++	#else
+ 	const char *slashDotXdefaultsDash = "/.Xdefaults-";
++	#endif
+ 	int len;
+ 
+ 	(void) GetHomeDir (fname, (int) (PATH_MAX - strlen (slashDotXdefaultsDash) - 1));
+    diff --git a/src/SetLocale.c b/src/SetLocale.c
+index 81f4a7c..cb52f11 100644
+--- a/src/SetLocale.c
++++ b/src/SetLocale.c
+@@ -63,11 +63,11 @@ from The Open Group.
+ #include <X11/Xlocale.h>
+ #include <X11/Xos.h>
+ #include "XlcPubI.h"
+ 
+ #define MAXLOCALE	64	/* buffer size of locale name */
+ 
+ 
+-#if defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(__APPLE__) || defined(__CYGWIN__) || defined(_MSC_VER)
+ char *
+ _Xsetlocale(
+     int           category,
+diff --git a/src/StrKeysym.c b/src/StrKeysym.c
+index be77a93..6967bcc 100644
+--- a/src/StrKeysym.c
++++ b/src/StrKeysym.c
+@@ -39,12 +39,12 @@ in this Software without prior written authorization from The Open Group.
+ 
+ #ifndef KEYSYMDB
+ #ifndef XKEYSYMDB
+-#define KEYSYMDB "/usr/lib/X11/XKeysymDB"
++#define KEYSYMDB "XKeysymDB"
+ #else
+ #define KEYSYMDB XKEYSYMDB
+ #endif
+ #endif
+ 
+ static Bool initialized;
+ static XrmDatabase keysymdb;
+ static XrmQuark Qkeysym[2];
+diff --git a/src/xlibi18n/lcDynamic.c b/src/xlibi18n/lcDynamic.c
+index 3821bff..a50aa70 100644
+--- a/src/xlibi18n/lcDynamic.c
++++ b/src/xlibi18n/lcDynamic.c
+@@ -51,7 +51,7 @@ from The Open Group.
+ #include "Xlcint.h"
+ 
+ #ifndef XLOCALEDIR
+-#define XLOCALEDIR "/usr/lib/X11/locale"
++#define XLOCALEDIR "locale"
+ #endif
+ 
+ #define LCLIBNAME    "xi18n.so"
+diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c
+index 25cabd5..819ac89 100644
+--- a/src/xlibi18n/lcFile.c
++++ b/src/xlibi18n/lcFile.c
+@@ -195,7 +192,7 @@ _XlcParsePath(
+ }
+ 
+ #ifndef XLOCALEDIR
+-#define XLOCALEDIR "/usr/lib/X11/locale"
++#define XLOCALEDIR "locale"
+ #endif
+ 
+ void