Attachment 1300 Details for Bug 1816 – [FIXED_X11R68x] Patch to fix for Cygwin and Mac OS X

[patch] [FIXED_X11R68x] Patch to fix for Cygwin and Mac OS X

rootless.diff (text/plain), 4.09 KB, created by Torrey T. Lyons on 2004-11-12 18:36:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Torrey T. Lyons

Created: 2004-11-12 18:36:37 UTC

Size: 4.09 KB

patch

obsolete

>Index: programs/Xserver/fb/fb.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/fb/fb.h,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -d -b -w -r1.6 -r1.7
>--- programs/Xserver/fb/fb.h	11 Aug 2004 21:14:17 -0000	1.6
>+++ programs/Xserver/fb/fb.h	5 Nov 2004 19:51:38 -0000	1.7
>@@ -647,7 +647,7 @@
> 	((WindowPtr) (pWin))->devPrivates[fbGetWinPrivateIndex()].ptr)
> #endif
> 
>-#if defined(__DARWIN__)||defined(__CYGWIN__)
>+#ifdef ROOTLESS
> #define __fbPixOriginX(pPix)	((pPix)->drawable.x)
> #define __fbPixOriginY(pPix)	((pPix)->drawable.y)
> #else
>Index: config/cf/X11.tmpl
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
>retrieving revision 1.35
>retrieving revision 1.37
>diff -u -d -b -w -r1.35 -r1.37
>--- config/cf/X11.tmpl	3 Sep 2004 16:18:18 -0000	1.35
>+++ config/cf/X11.tmpl	30 Oct 2004 01:41:46 -0000	1.37
>@@ -680,6 +680,10 @@
> #define BuildXevieLibrary	!BuildServersOnly
> #endif
> 
>+#ifndef BuildRootless
>+#define BuildRootless	NO
>+#endif
>+
> #ifndef BuildXterm
> #define BuildXterm		BuildClients
> #endif
>@@ -1237,6 +1241,14 @@
> #endif
> #endif
> 
>+#ifndef RootlessDefines
>+#if BuildRootless
>+#define RootlessDefines -DROOTLESS
>+#else
>+#define RootlessDefines /**/
>+#endif
>+#endif
>+
> #ifndef SitePervasiveExtensionDefines
> #define SitePervasiveExtensionDefines /**/
> #endif
>@@ -1247,7 +1259,8 @@
> 	XF86BigfontExtensionDefines DPMSDefines \
> 	LowMemDefines XprintDefines XineramaDefines \
> 	SitePervasiveExtensionDefines RenderDefines RandRDefines \
>-	XfixesDefines XDamageDefines CompositeDefines XevieDefines
>+	XfixesDefines XDamageDefines CompositeDefines XevieDefines \
>+	RootlessDefines
> #endif
> #ifndef SiteExtensionDefines
> #define SiteExtensionDefines /**/
>Index: config/cf/cygwin.cf
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/cygwin.cf,v
>retrieving revision 1.14.2.1
>retrieving revision 1.16
>diff -u -d -b -w -r1.14.2.1 -r1.16
>--- config/cf/cygwin.cf	17 Sep 2004 15:38:18 -0000	1.14.2.1
>+++ config/cf/cygwin.cf	30 Oct 2004 01:41:46 -0000	1.16
>@@ -329,6 +331,7 @@
> # define XWinMultiWindowDefines 
> #endif /* BuildXWinMultiWindow */
> #if BuildXWinMultiWindowExtWM
>+# define BuildRootless		YES
> # define XWinMultiWindowExtWMDefines -DXWIN_MULTIWINDOWEXTWM
> #else /* BuildXWinMultiWindowExtWM */
> # define XWinMultiWindowExtWMDefines 
>Index: config/cf/darwin.cf
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/darwin.cf,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -d -b -w -r1.4 -r1.5
>--- config/cf/darwin.cf	2 Sep 2004 01:23:45 -0000	1.4
>+++ config/cf/darwin.cf	30 Oct 2004 01:41:46 -0000	1.5
>@@ -133,6 +133,7 @@
> #  define GlxExtraDefines -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL GlxArchDefines
> # endif
> 
>+# define BuildRootless          YES
> #define BuildAppleWMLibrary     YES
> 
> #endif  /* DarwinQuartzSupport */
>Index: programs/Xserver/dix/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/dix/Imakefile,v
>retrieving revision 1.2
>retrieving revision 1.4
>diff -u -d -b -w -r1.2 -r1.4
>--- programs/Xserver/dix/Imakefile	23 Apr 2004 19:04:43 -0000	1.2
>+++ programs/Xserver/dix/Imakefile	30 Oct 2004 01:41:45 -0000	1.4
>@@ -73,7 +73,7 @@
> 
> #ifdef DarwinArchitecture
> #if DarwinQuartzSupport
>-    QUARTZ_DEFINES = -DDARWIN_WITH_QUARTZ -DROOTLESS
>+    QUARTZ_DEFINES = -DDARWIN_WITH_QUARTZ
> #endif
> #endif
> 
>Index: programs/Xserver/miext/damage/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/miext/damage/Imakefile,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -d -b -w -r1.4 -r1.5
>--- programs/Xserver/miext/damage/Imakefile	2 Sep 2004 04:04:47 -0000	1.4
>+++ programs/Xserver/miext/damage/Imakefile	30 Oct 2004 01:41:45 -0000	1.5
>@@ -8,8 +8,7 @@
> #endif
> #endif
> 
>-#if (defined(XWinServer) && XWinServer && BuildXWinMultiWindowExtWM) || \
>-    (defined(XDarwinServer) && XDarwinServer && DarwinQuartzSupport)
>+#if BuildRootless
> DEFINES = -DROOTLESS_WORKAROUND
> #endif
>

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1816: 1268 | 1300

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.