Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/xserver/xorg/sun-paths.patch
author Alan Coopersmith <Alan.Coopersmith@Sun.COM>
Tue, 17 Apr 2007 16:56:26 -0700
changeset 144 be9658af83e1
parent 98 c21b46ed1efd
child 198 7cb95e4f130b
permissions -rw-r--r--
6546692 Xorg -configure should create xorg.file to include bitstream by default
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
98
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     1
 
diff -urp -x '*~' Xext/Makefile.am Xext/Makefile.am
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     2
 
--- Xext/Makefile.am	2006-11-13 16:59:38.000000000 -0800
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     3
 
+++ Xext/Makefile.am	2006-12-21 14:19:20.440059000 -0800
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     4
 
@@ -34,7 +34,7 @@ MODULE_SRCS =			\
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     5
 
 	xcmisc.c
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     6
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     7
 
 # Extra configuration files ship with some extensions
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     8
 
-SERVERCONFIGdir = $(libdir)/xserver
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     9
 
+SERVERCONFIGdir = $(libdir)/X11/xserver
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    10
 
 SERVERCONFIG_DATA =
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    11
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    12
 
 # Optional sources included if extension enabled by configure.ac rules
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    13
 
diff -urp -x '*~' xkb/Makefile.am xkb/Makefile.am
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    14
 
--- xkb/Makefile.am	2006-11-13 16:59:41.000000000 -0800
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    15
 
+++ xkb/Makefile.am	2006-12-21 14:19:20.503671000 -0800
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    16
 
@@ -1,6 +1,7 @@
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    17
 
 noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    18
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    19
 
 AM_CFLAGS = $(DIX_CFLAGS) \
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    20
 
+	-DMAKE_XKM_OUTPUT_DIR \
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    21
 
 	-DHAVE_XKB_CONFIG_H
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    22
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    23
 
 DDX_SRCS = \
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    24
 
diff -urp -x '*~' xkb/xkbInit.c xkb/xkbInit.c
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    25
 
--- xkb/xkbInit.c	2006-11-13 16:59:41.000000000 -0800
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    26
 
+++ xkb/xkbInit.c	2006-12-21 14:19:20.503312000 -0800
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    27
 
@@ -123,7 +123,7 @@ typedef struct	_SrvXkmInfo {
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    28
 
 #endif
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    29
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    30
 
 char	*		XkbBaseDirectory=	XKB_BASE_DIRECTORY;
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    31
 
-char	*		XkbBinDirectory=	XKB_BIN_DIRECTORY;
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    32
 
+char	*		XkbBinDirectory=	XKB_BASE_DIRECTORY;
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    33
 
 int	 		XkbWantAccessX=		0;
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    34
 
 static XkbFileInfo *	_XkbInitFileInfo=	NULL;
c21b46ed1efd 6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    35
144
be9658af83e1 6546692 Xorg -configure should create xorg.file to include bitstream by default
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 98
diff changeset 
    36
 












be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    37


--- hw/xfree86/common/xf86Configure.c	2007-04-17 10:43:56.616816000 -0700













be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    38


+++ hw/xfree86/common/xf86Configure.c	2007-04-17 10:57:03.148386000 -0700













be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    39


@@ -642,7 +642,8 @@













be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    40


             /* 'strstr(dFP,"/dir")' is meant as 'dFP =~ m(/dir\W)' */













be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    41


     	    if (defaultFontPath && (













be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    42


 		(strcmp(*el, "freetype")  == 0 &&













be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    43


-		 strstr(defaultFontPath, "/TTF")) ||













be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    44


+ 		 (strstr(defaultFontPath, "/TrueType") ||













be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    45


+ 		  strstr(defaultFontPath, "/TTF"))) ||













be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    46


     	        (strcmp(*el, "type1")  == 0 &&













be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    47


 		 strstr(defaultFontPath, "/Type1")))) 













be9658af83e1
6546692 Xorg -configure should create xorg.file to include bitstream by default



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 
98

diff
changeset




    48


 	    	ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(















upstream/oracle/x-cons/x-s11-update-clone