]> git.pld-linux.org Git - packages/X11.git/blame - X11-PLD.patch
projects / packages / X11.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- glxinfo link fixed.
[packages/X11.git] / X11-PLD.patch
CommitLineData
756a6f4b
AM		 1--- xc/config/cf/Imake.cf.wiget 2004-08-11 23:14:01.000000000 +0200
2+++ xc/config/cf/Imake.cf 2004-09-09 16:16:53.093467589 +0200
3@@ -805,6 +805,10 @@
aa35d5a8
AM		 4 # define s390Architecture
5 # undef __s390__
6 # endif /* s390 */
7+# ifdef alpha
8+# define AlphaArchitecture
9+# undef alpha
10+# endif /* alpha */
11 # ifdef __alpha
12 # define AlphaArchitecture
13 # undef __alpha
756a6f4b
AM		 14--- xc/config/cf/Imake.tmpl.wiget 2004-07-28 05:24:29.000000000 +0200
15+++ xc/config/cf/Imake.tmpl 2004-09-09 16:16:53.116463078 +0200
16@@ -262,7 +262,7 @@
aa35d5a8
AM		 17
18 #ifndef BuildHtmlManPages
19 #ifdef RmanCmd
20-#define BuildHtmlManPages YES
21+#define BuildHtmlManPages NO
22 #else
23 #define BuildHtmlManPages NO
24 #endif
756a6f4b 25@@ -863,11 +863,7 @@
aa35d5a8
AM		 26 #define LintlibDir $(USRLIBDIR)/lint
27 #endif
28 #ifndef SystemManDirectory
29-#if SystemV4
30 #define SystemManDirectory /usr/share/man
31-#else
32-#define SystemManDirectory /usr/man
33-#endif
34 #endif
35 #ifndef ManDirectoryRoot
36 #ifdef ProjectRoot
756a6f4b 37@@ -1171,7 +1167,7 @@
aa35d5a8
AM		 38 #define CppCmd /LibDirName/cpp
39 #endif
40 #ifndef RawCppCmd
41-#define RawCppCmd CppCmd -undef
42+#define RawCppCmd CppCmd
43 #endif
44 #ifndef CppNoLineInfoOption
45 #define CppNoLineInfoOption /**/
756a6f4b
AM		 46--- xc/config/cf/linux.cf.wiget 2004-08-11 23:14:01.000000000 +0200
47+++ xc/config/cf/linux.cf 2004-09-09 16:16:53.123461705 +0200
48@@ -368,7 +368,7 @@
49 */
50 #if BuildXF86DRI
51 # if defined(i386Architecture)
52-# define BuildLibGlxWithoutPIC YES
53+# define BuildLibGlxWithoutPIC NO
54 # endif
55 #endif
56
57@@ -757,7 +757,7 @@
58
59 #define HasVarRun YES
60 #ifndef VarDbDirectory
61-# define VarDbDirectory $(VARDIR)/lib
62+# define VarDbDirectory /var/lib
63 #endif
64
65 #ifndef XF86OSCardDrivers
66--- xc/config/cf/site.def.wiget 2004-05-06 17:08:25.000000000 +0200
67+++ xc/config/cf/site.def 2004-09-09 16:16:53.129460529 +0200
68@@ -119,10 +119,14 @@
69 #define HasSentinel YES
70 */
71
72-/*
73 #undef DefaultUserPath
74-#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
75-*/
76+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
77+#undef DefaultSystemPath
78+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
79+
80+
81+#define HasPam YES
82+#define HasPamMisc YES
83
84
85 /* You do NOT need SetUID if you only run the server under xdm */
86--- xc/config/cf/X11.tmpl.wiget 2004-09-03 18:18:18.000000000 +0200
87+++ xc/config/cf/X11.tmpl 2004-09-09 16:16:53.172452095 +0200
88@@ -715,7 +715,7 @@
89 #endif
90
91 #ifndef InstallHardcopyDocs
92-#define InstallHardcopyDocs YES
93+#define InstallHardcopyDocs NO
94 #endif
95
96 #ifndef InstallMiscManPages
97@@ -1398,8 +1398,12 @@
aa35d5a8
AM		 98 # define UsbMouseSupport NO
99 #endif
100
101+#ifndef EtcX11Directory
102+#define EtcX11Directory /etc/X11
103+#endif
104+
105 #ifndef DefaultFSConfigFile
106-#define DefaultFSConfigFile $(LIBDIR)/fs/config
107+#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
108 #endif
109
756a6f4b
AM		 110 #ifndef BinDir
111@@ -1486,7 +1490,7 @@
aa35d5a8
AM		 112 #define ConfigDir $(LIBDIR)/config
113 #endif
114 #ifndef DocDir
115-#define DocDir $(LIBDIR)/doc
116+#define DocDir $(LIBDIR)/share/doc
117 #endif
118 #ifndef DocHtmlDir
119 #define DocHtmlDir $(DOCDIR)/html
756a6f4b 120@@ -1498,31 +1502,31 @@
aa35d5a8
AM		 121 #define DocPdfDir $(DOCDIR)/PDF
122 #endif
123 #ifndef FontDir
124-#define FontDir $(LIBDIR)/fonts
125+#define FontDir /usr/share/fonts
126 #endif
127 #ifndef AdmDir
128-#define AdmDir /usr/adm
129+#define AdmDir /var/log
130 #endif
131 #ifndef XinitDir
132-#define XinitDir $(LIBDIR)/xinit
133+#define XinitDir $(ETCX11DIR)/xinit
134 #endif
135 #ifndef XdmDir
136-#define XdmDir $(LIBDIR)/xdm
137+#define XdmDir $(ETCX11DIR)/xdm
138 #endif
139 #ifndef XdmVarDir
140 #define XdmVarDir $(VARLIBDIR)/xdm
141 #endif
142 #ifndef XdmAuthDir
143-#define XdmAuthDir $(LIBDIR)/xdm
144+#define XdmAuthDir $(ETCX11DIR)/xdm
145 #endif
146 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
147 #define XdmConfigurationSubdirectory config
148 #endif
149 #ifndef TwmDir
150-#define TwmDir $(LIBDIR)/twm
151+#define TwmDir $(ETCX11DIR)/twm
152 #endif
153 #ifndef XsmDir
154-#define XsmDir $(LIBDIR)/xsm
155+#define XsmDir $(ETCX11DIR)/xsm
156 #endif
157 #ifndef NlsDir
158 #define NlsDir $(LIBDIR)/nls
756a6f4b 159@@ -1531,23 +1535,20 @@
aa35d5a8
AM		 160 #define XLocaleDir $(LIBDIR)/locale
161 #endif
162 #ifndef LbxproxyDir
163-#define LbxproxyDir $(LIBDIR)/lbxproxy
164+#define LbxproxyDir $(ETCX11DIR)/lbxproxy
165 #endif
166 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
167 #define LbxproxyConfigSubdir config
168 #endif
169 #ifndef ProxyManagerDir
170-#define ProxyManagerDir $(LIBDIR)/proxymngr
171+#define ProxyManagerDir $(ETCX11DIR)/proxymngr
172 #endif
173 #ifndef ServerConfigDir
174-#define ServerConfigDir $(LIBDIR)/xserver
175+#define ServerConfigDir $(ETCX11DIR)/xserver
176 #endif
177 #ifndef XPrintDir
178 #define XPrintDir ServerConfigDir
179 #endif
180-#ifndef EtcX11Directory
181-#define EtcX11Directory /etc/X11
182-#endif
183 #ifndef InstallSecurityConfig
184 #define InstallSecurityConfig YES /* Install sample security policy */
185 #endif
756a6f4b 186@@ -1579,10 +1580,10 @@
aa35d5a8
AM		 187 #define OsNameDefines /* as nothing */
188 #endif
189 #ifndef DefaultUserPath /* for xdm */
190-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
191+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
192 #endif
193 #ifndef DefaultSystemPath /* for xdm */
194-#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
195+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
196 #endif
197 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
198 #define DefaultSystemShell BourneShell
756a6f4b 199@@ -1719,7 +1720,7 @@
aa35d5a8
AM		 200
201 HTMLINDEXCMD = HtmlIndexCmd
202
203- DOCUTILSRC = $(XTOP)/doc/util
204+ DOCUTILSRC = $(XTOP)/share/doc/util
205 CLIENTSRC = $(TOP)/clients
206 DEMOSRC = $(TOP)/demos
207 XDOCMACROS = $(DOCUTILSRC)/macros.t
756a6f4b 208@@ -1733,7 +1734,7 @@
aa35d5a8
AM		 209 SERVERSRC = $(XTOP)/programs/Xserver
210 CONTRIBSRC = ContribDir
211 UNSUPPORTEDSRC = UnsupportedDir
212- DOCSRC = $(XTOP)/doc
213+ DOCSRC = $(XTOP)/share/doc
214 RGBSRC = $(XTOP)/programs/rgb
215 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
216 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
756a6f4b
AM		 217--- xc/config/cf/xorg.cf.wiget 2004-09-04 00:00:10.000000000 +0200
218+++ xc/config/cf/xorg.cf 2004-09-09 16:16:53.189448761 +0200
219@@ -142,7 +142,7 @@
220 #define XConfigFile xorg.conf
aa35d5a8 221 #endif
756a6f4b
AM		 222 #ifndef XConfigDir
223-#define XConfigDir $(LIBDIR)
224+#define XConfigDir $(ETCX11DIR)
aa35d5a8 225 #endif
756a6f4b
AM		 226 #ifndef XLogFile
227 #define XLogFile Xorg
228@@ -409,7 +409,7 @@
229 neomagic i740 tdfx savage \
230 cirrus vmware tseng trident chips apm \
231 GlideDriver i128 i386Drivers \
232- ati DevelDrivers ark \
233+ ati DevelDrivers ark fbdev \
234 cyrix siliconmotion via \
235 vesa vga \
236 dummy XF86OSCardDrivers XF86ExtraCardDrivers
237--- xc/config/cf/xorgsite.def.wiget 2004-08-21 04:06:44.000000000 +0200
238+++ xc/config/cf/xorgsite.def 2004-09-09 16:16:53.193447976 +0200
239@@ -264,8 +264,8 @@
aa35d5a8
AM		 240 /*
241 * To not build/install the Cyrillic fonts, uncomment the following
242 *
243-#define BuildCyrillicFonts NO
244 */
245+#define BuildCyrillicFonts YES
246
247 /*
248 * To not install the local font directory, uncomment the following
756a6f4b 249@@ -433,8 +433,8 @@
aa35d5a8
AM		 250 * Some Linux releases don't have a libtermcap. In this case you may need
251 * to uncomment the following
252 *
253-#define TermcapLibrary -lncurses
254 */
255+#define TermcapLibrary -lncurses
256
257 /*
258 * Build a server that dynamically loads the modules by setting
756a6f4b 259@@ -610,8 +610,8 @@
aa35d5a8
AM		 260 * To forceably build static libraries in addition to shared libraries,
261 * uncomment this.
262 *
263-#define ForceNormalLib YES
264 */
265+#define ForceNormalLib YES
266
267 /*
268 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
756a6f4b
AM		 269--- xc/config/imake/imake.c.wiget 2004-06-11 19:59:30.000000000 +0200
270+++ xc/config/imake/imake.c 2004-09-09 16:16:53.252436404 +0200
aa35d5a8
AM		 271@@ -1057,6 +1057,7 @@
272 static char* suse = "/etc/SuSE-release";
273 static char* redhat = "/etc/redhat-release";
274 static char* debian = "/etc/debian_version";
275+ static char* pld = "/etc/pld-release";
276
277 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
278 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
279@@ -1071,6 +1072,7 @@
280 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
281 fprintf (inFile, "%s\n", "#define LinuxWare 11");
282 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
283+ fprintf (inFile, "%s\n", "#define LinuxPLD 13");
284
285 #ifdef CROSSCOMPILE
286 if (CrossCompiling) {
287@@ -1097,6 +1099,11 @@
288 * at the content of /etc/debian_version */
289 return;
290 }
291+ if (lstat (pld, &sb) == 0) {
292+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
293+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
294+ return;
295+ }
296 /* what's the definitive way to tell what any particular distribution is? */
297
298 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
756a6f4b
AM		 299--- xc/programs/xdm/config/Xres.cpp.wiget 2004-04-23 21:54:43.000000000 +0200
300+++ xc/programs/xdm/config/Xres.cpp 2004-09-09 16:16:53.261434639 +0200
301@@ -70,10 +70,10 @@
302 #endif /* XPM */
aa35d5a8
AM		 303 XHASHendif
304 #ifdef XPM
305-XHASHif PLANES >= 8
306-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
307+XHASHif PLANES > 8
308+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
309 XHASHelse
310-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
311+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
312 XHASHendif
313 xlogin*useShape: true
314 xlogin*logoPadding: 10
756a6f4b
AM		 315--- xc/programs/xdm/resource.c.wiget 2004-04-23 21:54:42.000000000 +0200
316+++ xc/programs/xdm/resource.c 2004-09-09 16:16:53.264434051 +0200
317@@ -85,31 +85,31 @@
aa35d5a8
AM		 318 */
319 #ifndef __EMX__
320 #ifndef DEF_SERVER_LINE
321-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
322+#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
323 #endif
324 #ifndef XRDB_PROGRAM
325-#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
326+#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
327 #endif
328 #ifndef DEF_SESSION
329-#define DEF_SESSION "/usr/bin/X11/xterm -ls"
330+#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
331 #endif
332 #ifndef DEF_USER_PATH
333-#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
334+#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
335 #endif
336 #ifndef DEF_SYSTEM_PATH
337-#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
338+#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
339 #endif
340 #ifndef DEF_SYSTEM_SHELL
341 #define DEF_SYSTEM_SHELL "/bin/sh"
342 #endif
343 #ifndef DEF_FAILSAFE_CLIENT
344-#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
345+#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
346 #endif
347 #ifndef DEF_XDM_CONFIG
348-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
349+#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
350 #endif
351 #ifndef DEF_CHOOSER
352-#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
353+#define DEF_CHOOSER "/etc/X11/xdm/chooser"
354 #endif
355 #ifndef DEF_AUTH_NAME
356 #ifdef HASXDMAUTH
756a6f4b 357@@ -119,7 +119,7 @@
aa35d5a8
AM		 358 #endif
359 #endif
360 #ifndef DEF_AUTH_DIR
361-#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
362+#define DEF_AUTH_DIR "/etc/X11/xdm"
363 #endif
364 #ifndef DEF_USER_AUTH_DIR
365 #define DEF_USER_AUTH_DIR "/tmp"
756a6f4b
AM		 366--- xc/programs/xinit/Imakefile.wiget 2004-04-23 21:54:49.000000000 +0200
367+++ xc/programs/xinit/Imakefile 2004-09-09 16:16:53.265433855 +0200
368@@ -48,11 +48,12 @@
aa35d5a8
AM		 369 #endif
370 InstallManPage(startx,$(MANDIR))
371
372-#if InstallXinitConfig
373-InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
374-#else
375-InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
376-#endif
377+XCOMM Red Hat gets this from a different package
378+XCOMM #if InstallXinitConfig
379+XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
380+XCOMM #else
381+XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
382+XCOMM #endif
383
384 LinkConfDirectory(xinit,.,xinit,.)
385
756a6f4b
AM		 386--- xc/programs/xterm/Imakefile.wiget 2004-08-13 14:57:19.000000000 +0200
387+++ xc/programs/xterm/Imakefile 2004-09-09 16:16:53.267433462 +0200
aa35d5a8
AM		 388@@ -36,6 +36,10 @@
389 #define XkbClientLibs /**/
390 #endif
391
392+#if InstallXtermSetUID
393+#undef InstallXtermSetUID
394+#endif
395+
396 #ifndef SpecialCObjectRule
397 #define SpecialCObjectRule(module,ignore,defines) \
398 module.o: ; $(CC) -c defines $(CFLAGS) module.c
399@@ -57,6 +61,8 @@
400 PTYLIB = -lpucc
401 #endif
402
403+ PTYLIB = -lutil
404+
405 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
406 (defined(LinuxArchitecture) && \
407 (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
408@@ -116,7 +122,7 @@
409 XKB_DEFINES = XkbClientDefines
410 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
756a6f4b 411 DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
aa35d5a8
AM		 412- INCLUDES = -I. $(XRFINCLUDES)
413+ INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
414
415 #ifdef OS2Architecture
416 MAINSRC = os2main.c
756a6f4b
AM		 417--- xc/programs/xterm/xterm.h.wiget 2004-08-13 14:57:21.000000000 +0200
418+++ xc/programs/xterm/xterm.h 2004-09-09 16:16:53.269433070 +0200
419@@ -75,7 +75,7 @@
bbafed51 420 #endif
421
422 #ifndef DFT_TERMTYPE
423-#define DFT_TERMTYPE "xterm"
424+#define DFT_TERMTYPE "xterm-color"
425 #endif
426
427 #ifndef X_NOT_POSIX
756a6f4b
AM		 428--- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile.wiget 2004-09-02 03:10:29.000000000 +0200
429+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2004-09-09 16:16:53.266433659 +0200
430@@ -110,7 +110,7 @@
431
432 #if HasNCurses
433 CURSESLIB = NCursesLibName
434-CURSESDEFINES = -DHAS_NCURSES
435+CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
436 #endif
437
438 XF86CONFIGFILE = XConfigFile
439--- xc/Makefile.wiget 2004-09-03 18:18:17.000000000 +0200
440+++ xc/Makefile 2004-09-09 16:18:24.437548570 +0200
441@@ -8,7 +8,7 @@
442 # or add "MAKE = make" to this file.
443
de9badb0 444 RELEASE = "Release 6.8.2"
756a6f4b
AM		 445-SHELL = /bin/sh
446+SHELL = /bin/sh -e
447 RM = rm -f
448 MV = mv
449 WORLDOPTS =
450--- xc/config/cf/X11.tmpl.orig 2004-09-13 18:37:30.000000000 +0200
451+++ xc/config/cf/X11.tmpl 2004-09-13 22:24:31.449334056 +0200
452@@ -2801,7 +2801,7 @@
453 #endif
454
455 #ifndef SharedLibXdmcp
456-#define SharedLibXdmcp NO
457+#define SharedLibXdmcp YES
458 #endif
459 #ifndef NormalLibXdmcp
460 #define NormalLibXdmcp (!SharedLibXdmcp | ForceNormalLib)
461
462--- xc/config/cf/linux.cf.orig 2004-09-13 18:37:30.000000000 +0200
463+++ xc/config/cf/linux.cf 2004-09-13 22:42:59.680857256 +0200
464@@ -502,6 +502,10 @@
465 # define HasExpat YES
466 #endif
467
468+#ifndef HasFontconfig
469+# define HasFontconfig YES
470+#endif
471+
472 #ifndef HasFreetype2
473 # define HasFreetype2 YES
474 #endif
475
476--- xc/config/cf/X11.tmpl.orig 2004-09-14 17:15:01.000000000 +0200
477+++ xc/config/cf/X11.tmpl 2004-09-14 21:29:44.837063736 +0200
478@@ -2775,7 +2775,7 @@
479 #endif
480
481 #ifndef SharedLibXau
482-#define SharedLibXau NO
483+#define SharedLibXau YES
484 #endif
485 #ifndef NormalLibXau
486 #define NormalLibXau (!SharedLibXau | ForceNormalLib)
487
This page took 0.405667 seconds and 4 git commands to generate.