Attachment 5736 Details for Bug 6742 – also, csrg

[patch] also, csrg

morepatching.diff (text/plain), 5.70 KB, created by paul on 2006-05-25 04:32:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: paul

Created: 2006-05-25 04:32:13 UTC

Size: 5.70 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
>retrieving revision 1.198
>diff -u -d -b -w -r1.198 configure.ac
>--- configure.ac	23 May 2006 16:17:09 -0000	1.198
>+++ configure.ac	24 May 2006 18:31:15 -0000
>@@ -265,6 +265,9 @@
> 	DRI=yes
> 	KDRIVE_HW=yes
> 	;;
>+  *darwin*)
>+	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
>+	;;
> esac
> AM_CONDITIONAL(KDRIVE_HW, test "x$KDRIVE_HW" = xyes)
> 
>@@ -1298,7 +1301,7 @@
> if test "x$XPRINT" = xyes; then
> 	PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau])
> 	XPRINT_EXTENSIONS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $LBX_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS"
>-	XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $CWRAP_LIB $OS_LIB"
>+	XPRINT_LIBS="$DIX_LIB $XKB_LIB $XKB_STUB_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $CWRAP_LIB $OS_LIB $XPRINT_LIBS"
> 	AC_SUBST([XPRINT_CFLAGS])
> 	AC_SUBST([XPRINT_LIBS])
> 
>Index: Xext/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/Xext/Makefile.am,v
>retrieving revision 1.22
>diff -u -d -b -w -r1.22 Makefile.am
>--- Xext/Makefile.am	5 Apr 2006 21:08:45 -0000	1.22
>+++ Xext/Makefile.am	24 May 2006 18:31:15 -0000
>@@ -73,7 +73,7 @@
> if XCSECURITY   
> BUILTIN_SRCS += $(XCSECURITY_SRCS)
> 
>-SERVERCONFIGdir = $(libdir)/xserver
>+SERVERCONFIGdir = $(libdir)/X11/xserver
> SERVERCONFIG_DATA = SecurityPolicy
> AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\"
> endif
>Index: Xprint/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/Xprint/Makefile.am,v
>retrieving revision 1.9
>diff -u -d -b -w -r1.9 Makefile.am
>--- Xprint/Makefile.am	3 Apr 2006 21:45:54 -0000	1.9
>+++ Xprint/Makefile.am	24 May 2006 18:31:15 -0000
>@@ -4,7 +4,7 @@
> 
> Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
> 	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
>-	-DXPRINTDIR=\"$(prefix)/X11/xserver\"    \
>+	-DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
> 	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
> 
> Xprt_LDFLAGS = -L$(top_srcdir)
>Index: hw/darwin/darwinKeyboard.c
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/darwin/darwinKeyboard.c,v
>retrieving revision 1.4
>diff -u -d -b -w -r1.4 darwinKeyboard.c
>--- hw/darwin/darwinKeyboard.c	6 May 2005 00:45:30 -0000	1.4
>+++ hw/darwin/darwinKeyboard.c	24 May 2006 18:31:16 -0000
>@@ -68,7 +68,7 @@
> #include <stdlib.h>
> #include <errno.h>
> #include <sys/stat.h>
>-#include <IOKit/hidsystem/event_status_driver.h>
>+#include <drivers/event_status_driver.h>
> #include <IOKit/hidsystem/ev_keymap.h>
> #include <architecture/byte_order.h>  // For the NXSwap*
> #include "darwin.h"
>Index: hw/darwin/darwinKeyboard.h
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/darwin/darwinKeyboard.h,v
>retrieving revision 1.3
>diff -u -d -b -w -r1.3 darwinKeyboard.h
>--- hw/darwin/darwinKeyboard.h	22 Sep 2004 23:38:32 -0000	1.3
>+++ hw/darwin/darwinKeyboard.h	24 May 2006 18:31:16 -0000
>@@ -30,7 +30,7 @@
> 
> #define XK_TECHNICAL		// needed to get XK_Escape
> #define XK_PUBLISHING
>-#include "keysym.h"
>+#include <X11/keysym.h>
> #include "inputstr.h"
> 
> // Each key can generate 4 glyphs. They are, in order:
>Index: hw/darwin/quartz/XServer.m
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/darwin/quartz/XServer.m,v
>retrieving revision 1.4
>diff -u -d -b -w -r1.4 XServer.m
>--- hw/darwin/quartz/XServer.m	2 Apr 2005 02:29:24 -0000	1.4
>+++ hw/darwin/quartz/XServer.m	24 May 2006 18:31:17 -0000
>@@ -40,14 +40,14 @@
> #include "quartzCommon.h"
> 
> #define BOOL xBOOL
>-#include "X.h"
>-#include "Xproto.h"
>+#include <X11/X.h>
>+#include <X11/Xproto.h>
> #include "os.h"
> #include "opaque.h"
> #include "darwin.h"
> #include "quartz.h"
> #define _APPLEWM_SERVER_
>-#include "applewm.h"
>+#include <X11/extensions/applewm.h>
> #include "applewmExt.h"
> #undef BOOL
> 
>Index: hw/darwin/quartz/quartz.c
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/darwin/quartz/quartz.c,v
>retrieving revision 1.4
>diff -u -d -b -w -r1.4 quartz.c
>--- hw/darwin/quartz/quartz.c	1 Jul 2005 22:43:07 -0000	1.4
>+++ hw/darwin/quartz/quartz.c	24 May 2006 18:31:17 -0000
>@@ -38,7 +38,7 @@
> #include "quartzAudio.h"
> #include "pseudoramiX.h"
> #define _APPLEWM_SERVER_
>-#include "applewm.h"
>+#include <X11/extensions/applewm.h>
> #include "applewmExt.h"
> 
> // X headers
>Index: hw/darwin/quartz/quartzKeyboard.c
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/darwin/quartz/quartzKeyboard.c,v
>retrieving revision 1.4
>diff -u -d -b -w -r1.4 quartzKeyboard.c
>--- hw/darwin/quartz/quartzKeyboard.c	1 Jul 2005 22:43:07 -0000	1.4
>+++ hw/darwin/quartz/quartzKeyboard.c	24 May 2006 18:31:17 -0000
>@@ -40,7 +40,7 @@
> #include <Carbon/Carbon.h>
> 
> #include "darwinKeyboard.h"
>-#include "keysym.h"
>+#include <X11/keysym.h>
> #include "keysym2ucs.h"
> 
> #ifdef HAS_KL_API
>Index: hw/darwin/quartz/cr/crAppleWM.m
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/darwin/quartz/cr/crAppleWM.m,v
>retrieving revision 1.2
>diff -u -d -b -w -r1.2 crAppleWM.m
>--- hw/darwin/quartz/cr/crAppleWM.m	23 Apr 2004 19:15:51 -0000	1.2
>+++ hw/darwin/quartz/cr/crAppleWM.m	24 May 2006 18:31:17 -0000
>@@ -34,9 +34,9 @@
> #undef BOOL
> #define BOOL xBOOL
> #include "rootless.h"
>-#include "X.h"
>+#include <X11/X.h>
> #define _APPLEWM_SERVER_
>-#include "applewm.h"
>+#include <X11/extensions/applewm.h>
> #include "applewmExt.h"
> #undef BOOL
>

Actions: View | Splinter Review

Attachments on bug 6742: 5734 | 5736

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.