Attachment 20371 Details for Bug 18568 – Patch to fix build

[patch] Patch to fix build

0001-Cygwin-build-machinery-fixes.patch (text/plain), 6.42 KB, created by Jon Turney on 2008-11-17 07:02:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Turney

Created: 2008-11-17 07:02:39 UTC

Size: 6.42 KB

patch

obsolete

>From fb647c7a9f926318288cc9bfdc2e876aa7f457a9 Mon Sep 17 00:00:00 2001
>Message-Id: <fb647c7a9f926318288cc9bfdc2e876aa7f457a9.1226931512.git.jon.turney@dronecode.org.uk>
>From: Jon TURNEY <jon.turney@dronecode.org.uk>
>Date: Sun, 2 Nov 2008 18:27:09 +0000
>Subject: [PATCH 01/32] Cygwin: build machinery fixes
>
>Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
>---
> configure.ac               |    5 +++--
> hw/xwin/InitInput.c        |    7 +++++++
> hw/xwin/Makefile.am        |   21 +++++++++++----------
> hw/xwin/winerror.c         |   10 +++++-----
> hw/xwin/winmultiwindowwm.c |    9 +--------
> hw/xwin/winprocarg.c       |    4 ++--
> hw/xwin/winscrinit.c       |    1 -
> 7 files changed, 29 insertions(+), 28 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 4bea8ac..dca4f16 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1465,12 +1465,13 @@ if test "x$XWIN" = xauto; then
> 		mingw*) XWIN="yes" ;;
> 		*) XWIN="no" ;;
> 	esac
>-	XWIN_LIBS="$FB_LIB $XEXT_LIB $CONFIG_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $SHADOW_LIB"
>+	XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $RANDR_LIB $RENDER_LIB $XTRAP_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $MIEXT_LAYER_LIB $LAYER_LIB $XPSTUBS_LIB $SHADOW_LIB $OS_LIB"
> 	AC_SUBST([XWIN_LIBS])
> fi
> AC_MSG_RESULT([$XWIN])
> 
> if test "x$XWIN" = xyes; then
>+	AC_CHECK_TOOL(WINDRES, windres)
> 	case $host_os in
> 		cygwin*)
> 			XWIN_SERVER_NAME=XWin
>@@ -1487,7 +1488,7 @@ if test "x$XWIN" = xyes; then
> 			XWIN_SYS_LIBS=-lwinsock2
> 			;;
> 	esac
>-	XWIN_SYS_LIBS="$XWIN_SYS_LIBS $(XWINMODULES_LIBS)"
>+	XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"
> 	AC_SUBST(XWIN_SERVER_NAME)
> 	AC_SUBST(XWIN_SYS_LIBS)
> 
>diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
>index 550c5a0..fd4f26f 100644
>--- a/hw/xwin/InitInput.c
>+++ b/hw/xwin/InitInput.c
>@@ -102,6 +102,13 @@ ProcessInputEvents (void)
> }
> 
> 
>+void DDXRingBell(int volume, int pitch, int duration)
>+{
>+  /* winKeybdBell is used instead */
>+  return;
>+}
>+
>+
> int
> TimeSinceLastInputEvent ()
> {
>diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
>index 00d4255..3c6b963 100644
>--- a/hw/xwin/Makefile.am
>+++ b/hw/xwin/Makefile.am
>@@ -119,8 +119,10 @@ SRCS =	InitInput.c \
> 	winpriv.h \
> 	winresource.h \
> 	winwindow.h \
>+	XWin.rc \
>+	$(top_srcdir)/Xi/stubs.c \
> 	$(top_srcdir)/mi/miinitext.c \
>-	$(top_srcdir)/fb/fbcmap.c \
>+	$(top_srcdir)/fb/fbcmap_mi.c \
> 	$(SRCS_CLIPBOARD) \
> 	$(SRCS_GLX_WINDOWS) \
> 	$(SRCS_MULTIWINDOW) \
>@@ -141,15 +143,13 @@ SRCS =	InitInput.c \
> 
> XWin_SOURCES = $(SRCS)
> 
>-INCLUDES = -I$(top_srcdir)/miext/rootless \
>-           -I$(top_srcdir)/miext/rootless/safeAlpha
>-
>-XWIN_LIBS = \
>-	$(top_builddir)/fb/libfb.la \
>-	$(XSERVER_LIBS)
>+INCLUDES = -I$(top_srcdir)/miext/rootless
> 
> XWin_DEPENDENCIES = $(XWIN_LIBS)
>-XWin_LDADD = $(XWIN_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
>+XWin_LDADD = $(XWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
>+
>+.rc.o:
>+	$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\"
> 
> XWin_LDFLAGS = -mwindows -static
> 
>@@ -162,7 +162,8 @@ CLEANFILES = $(BUILT_SOURCES)
> AM_YFLAGS = -d
> AM_LFLAGS = -i
> AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
>-            $(XWINMODULES_CFLAGS)
>+            $(XWINMODULES_CFLAGS) \
>+            -DXFree86Server
> 
> dist_man1_MANS = XWin.man XWinrc.man
> 
>@@ -200,4 +201,4 @@ EXTRA_DIST = \
> 	xlaunch/window/wizard.h
> 
> relink:
>-	rm -f XWin && $(MAKE) XWin
>+	rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT)
>diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c
>index 7d29213..72ee2cf 100644
>--- a/hw/xwin/winerror.c
>+++ b/hw/xwin/winerror.c
>@@ -33,10 +33,10 @@
> #endif
> #ifdef XVENDORNAME
> #define VENDOR_STRING XVENDORNAME
>-#define VERSION_STRING XORG_RELEASE
> #define VENDOR_CONTACT BUILDERADDR
> #endif
> 
>+#include <../xfree86/common/xorgVersion.h>
> #include "win.h"
> 
> /* References to external symbols */
>@@ -80,7 +80,6 @@ OsVendorVErrorF (const char *pszFormat, va_list va_args)
>  *
>  * Attempt to do last-ditch, safe, important cleanup here.
>  */
>-#ifdef DDXOSFATALERROR
> void
> OsVendorFatalError (void)
> {
>@@ -93,7 +92,6 @@ OsVendorFatalError (void)
> 		  "Please open %s for more information.\n",
> 		  MB_ICONERROR, (g_pszLogFile?g_pszLogFile:"the logfile"));
> }
>-#endif
> 
> 
> /*
>@@ -117,13 +115,15 @@ winMessageBoxF (const char *pszError, UINT uType, ...)
> #define MESSAGEBOXF \
> 	"%s\n" \
> 	"Vendor: %s\n" \
>-	"Release: %s\n" \
>+	"Release: %d.%d.%d.%d (%d)\n" \
> 	"Contact: %s\n" \
> 	"XWin was started with the following command-line:\n\n" \
> 	"%s\n"
> 
>   pszMsgBox = Xprintf (MESSAGEBOXF,
>-	   pszErrorF, VENDOR_STRING, VERSION_STRING, VENDOR_CONTACT,
>+	   pszErrorF, VENDOR_STRING,
>+		       XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT,
>+		       VENDOR_CONTACT,
> 	   g_pszCommandLine);
>   if (!pszMsgBox)
>     goto winMessageBoxF_Cleanup;
>diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
>index 5401ecd..9153176 100644
>--- a/hw/xwin/winmultiwindowwm.c
>+++ b/hw/xwin/winmultiwindowwm.c
>@@ -52,14 +52,7 @@
> #include <X11/cursorfont.h>
> 
> /* Windows headers */
>-#ifdef __CYGWIN__
>-/* Fixups to prevent collisions between Windows and X headers */
>-#define ATOM DWORD
>-
>-#include <windows.h>
>-#else
>-#include <Xwindows.h>
>-#endif
>+#include <X11/Xwindows.h>
> 
> /* Local headers */
> #include "objbase.h"
>diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
>index 7139cba..f346bed 100755
>--- a/hw/xwin/winprocarg.c
>+++ b/hw/xwin/winprocarg.c
>@@ -31,9 +31,9 @@ from The Open Group.
> #endif
> #ifdef XVENDORNAME
> #define VENDOR_STRING XVENDORNAME
>-#define VERSION_STRING XORG_RELEASE
> #define VENDOR_CONTACT BUILDERADDR
> #endif
>+#include <../xfree86/common/xorgVersion.h>
> #include "win.h"
> #include "winconfig.h"
> #include "winprefs.h"
>@@ -1525,7 +1525,7 @@ winLogVersionInfo (void)
> 
>   ErrorF ("Welcome to the XWin X Server\n");
>   ErrorF ("Vendor: %s\n", VENDOR_STRING);
>-  ErrorF ("Release: %s\n\n", VERSION_STRING);
>+  ErrorF ("Release: %d.%d.%d.%d (%d)\n\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT);
>   ErrorF ("Contact: %s\n\n", VENDOR_CONTACT);
> }
> 
>diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
>index 5121095..ee3c78b 100644
>--- a/hw/xwin/winscrinit.c
>+++ b/hw/xwin/winscrinit.c
>@@ -37,7 +37,6 @@
> #endif
> #include "win.h"
> #include "winmsg.h"
>-#include "safeAlpha.h"	
> 
> 
> #ifdef XWIN_MULTIWINDOWEXTWM
>-- 
>1.6.0.2
>

Actions: View | Splinter Review

Attachments on bug 18568: 20371

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.