]> git.pld-linux.org Git - packages/XFree86.git/blame - XFree86-PLD.patch
projects / packages / XFree86.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- use functions
[packages/XFree86.git] / XFree86-PLD.patch
CommitLineData
e10fc0ec 1--- xc/Makefile 2006-06-11 00:28:00.305505872 +0200
2+++ xc/Makefile-new 2006-06-11 00:31:06.181248464 +0200
3@@ -3,7 +3,7 @@
4 # Luna users will need to either run make as "make MAKE=make"
42389106 5 # or add "MAKE = make" to this file.
6
42389106 7-SHELL = /bin/sh
8+SHELL = /bin/sh -e
9 RM = rm -f
10 MV = mv
11 WORLDOPTS =
e10fc0ec 12--- xc/config/cf/Imake.cf.orig 2006-01-09 15:56:12.000000000 +0100
13+++ xc/config/cf/Imake.cf 2006-06-11 00:28:00.321503440 +0200
14@@ -800,6 +800,10 @@
b19d4d8b
JR		 15 # define s390Architecture
16 # undef __s390__
17 # endif /* s390 */
e1fe05b9
JR		 18+# ifdef alpha
19+# define AlphaArchitecture
20+# undef alpha
b19d4d8b 21+# endif /* alpha */
e1fe05b9
JR		 22 # ifdef __alpha
23 # define AlphaArchitecture
24 # undef __alpha
e10fc0ec 25--- xc/config/cf/Imake.tmpl.orig 2006-04-03 01:12:46.000000000 +0200
26+++ xc/config/cf/Imake.tmpl 2006-06-11 00:28:00.323503136 +0200
27@@ -308,7 +308,7 @@
e1fe05b9
JR		 28
29 #ifndef BuildHtmlManPages
30 #ifdef RmanCmd
31-#define BuildHtmlManPages YES
32+#define BuildHtmlManPages NO
33 #else
34 #define BuildHtmlManPages NO
35 #endif
e10fc0ec 36@@ -904,11 +904,7 @@
e1fe05b9
JR		 37 #define LintlibDir $(USRLIBDIR)/lint
38 #endif
39 #ifndef SystemManDirectory
40-#if SystemV4
41 #define SystemManDirectory /usr/share/man
42-#else
43-#define SystemManDirectory /usr/man
44-#endif
45 #endif
46 #ifndef ManDirectoryRoot
47 #ifdef ProjectRoot
e10fc0ec 48@@ -1055,7 +1051,7 @@
e1fe05b9
JR		 49 #define NoRConst NO /* YES if const for structs of funcs is bad */
50 #endif
51 #ifndef InstPgmFlags
52-#define InstPgmFlags -s
53+#define InstPgmFlags
54 #endif
55 #ifndef InstBinFlags
56 #define InstBinFlags -m 0755
e10fc0ec 57@@ -1212,7 +1208,7 @@
2452d5b7 58 #define CppCmd /LibDirName/cpp
8a78032e
JR		 59 #endif
60 #ifndef RawCppCmd
61-#define RawCppCmd CppCmd -undef
62+#define RawCppCmd CppCmd
63 #endif
64 #ifndef CppNoLineInfoOption
65 #define CppNoLineInfoOption /**/
e10fc0ec 66--- xc/config/cf/X11.tmpl.orig 2006-04-18 17:57:25.000000000 +0200
67+++ xc/config/cf/X11.tmpl 2006-06-11 00:28:00.327502528 +0200
68@@ -1649,8 +1649,12 @@
2452d5b7 69 # define UsbMouseSupport NO
e1fe05b9 70 #endif
b19d4d8b 71
e1fe05b9
JR		 72+#ifndef EtcX11Directory
73+#define EtcX11Directory /etc/X11
74+#endif
b19d4d8b 75+
e1fe05b9
JR		 76 #ifndef DefaultFSConfigFile
77-#define DefaultFSConfigFile $(LIBDIR)/fs/config
78+#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
79 #endif
80
81 /* X-TrueType settings */
e10fc0ec 82@@ -1783,7 +1787,7 @@
b19d4d8b 83 #define ConfigDir $(LIBDIR)/config
e1fe05b9
JR		 84 #endif
85 #ifndef DocDir
86-#define DocDir $(LIBDIR)/doc
87+#define DocDir $(LIBDIR)/share/doc
88 #endif
89 #ifndef DocHtmlDir
90 #define DocHtmlDir $(DOCDIR)/html
e10fc0ec 91@@ -1795,31 +1799,31 @@
e9cc699d 92 #define DocPdfDir $(DOCDIR)/PDF
e1fe05b9
JR		 93 #endif
94 #ifndef FontDir
95-#define FontDir $(LIBDIR)/fonts
96+#define FontDir /usr/share/fonts
97 #endif
98 #ifndef AdmDir
99-#define AdmDir /usr/adm
100+#define AdmDir /var/log
101 #endif
102 #ifndef XinitDir
103-#define XinitDir $(LIBDIR)/xinit
104+#define XinitDir $(ETCX11DIR)/xinit
105 #endif
106 #ifndef XdmDir
107-#define XdmDir $(LIBDIR)/xdm
108+#define XdmDir $(ETCX11DIR)/xdm
109 #endif
110 #ifndef XdmVarDir
111 #define XdmVarDir $(VARLIBDIR)/xdm
112 #endif
113 #ifndef XdmAuthDir
114-#define XdmAuthDir $(LIBDIR)/xdm
115+#define XdmAuthDir $(ETCX11DIR)/xdm
116 #endif
117 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
118 #define XdmConfigurationSubdirectory config
119 #endif
120 #ifndef TwmDir
121-#define TwmDir $(LIBDIR)/twm
122+#define TwmDir $(ETCX11DIR)/twm
123 #endif
124 #ifndef XsmDir
125-#define XsmDir $(LIBDIR)/xsm
126+#define XsmDir $(ETCX11DIR)/xsm
127 #endif
128 #ifndef NlsDir
129 #define NlsDir $(LIBDIR)/nls
e10fc0ec 130@@ -1828,23 +1832,20 @@
e9cc699d 131 #define XLocaleDir $(LIBDIR)/locale
e1fe05b9
JR		 132 #endif
133 #ifndef LbxproxyDir
134-#define LbxproxyDir $(LIBDIR)/lbxproxy
135+#define LbxproxyDir $(ETCX11DIR)/lbxproxy
136 #endif
137 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
138 #define LbxproxyConfigSubdir config
139 #endif
140 #ifndef ProxyManagerDir
141-#define ProxyManagerDir $(LIBDIR)/proxymngr
142+#define ProxyManagerDir $(ETCX11DIR)/proxymngr
143 #endif
144 #ifndef ServerConfigDir
145-#define ServerConfigDir $(LIBDIR)/xserver
146+#define ServerConfigDir $(ETCX11DIR)/xserver
147 #endif
148 #ifndef XPrintDir
149 #define XPrintDir ServerConfigDir
e1fe05b9
JR		 150 #endif
151-#ifndef EtcX11Directory
152-#define EtcX11Directory /etc/X11
153-#endif
154 #ifndef InstallSecurityConfig
155 #define InstallSecurityConfig YES /* Install sample security policy */
156 #endif
e10fc0ec 157@@ -1876,10 +1877,10 @@
e1fe05b9
JR		 158 #define OsNameDefines /* as nothing */
159 #endif
160 #ifndef DefaultUserPath /* for xdm */
161-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
8a78032e 162+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
e1fe05b9
JR		 163 #endif
164 #ifndef DefaultSystemPath /* for xdm */
165-#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
8a78032e 166+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
e1fe05b9
JR		 167 #endif
168 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
169 #define DefaultSystemShell BourneShell
e10fc0ec 170@@ -2014,7 +2015,7 @@
e1fe05b9
JR		 171
172 HTMLINDEXCMD = HtmlIndexCmd
173
174- DOCUTILSRC = $(XTOP)/doc/util
175+ DOCUTILSRC = $(XTOP)/share/doc/util
176 CLIENTSRC = $(TOP)/clients
177 DEMOSRC = $(TOP)/demos
178 XDOCMACROS = $(DOCUTILSRC)/macros.t
e10fc0ec 179@@ -2028,7 +2029,7 @@
e1fe05b9
JR		 180 SERVERSRC = $(XTOP)/programs/Xserver
181 CONTRIBSRC = ContribDir
182 UNSUPPORTEDSRC = UnsupportedDir
183- DOCSRC = $(XTOP)/doc
184+ DOCSRC = $(XTOP)/share/doc
185 RGBSRC = $(XTOP)/programs/rgb
186 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
187 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
e10fc0ec 188--- xc/config/cf/linux.cf.orig 2006-04-03 01:12:46.000000000 +0200
189+++ xc/config/cf/linux.cf 2006-06-11 00:28:00.329502224 +0200
190@@ -335,7 +335,7 @@
42389106 191 */
192 #if BuildXF86DRI
193 # if defined(i386Architecture)
194-# define BuildLibGlxWithoutPIC YES
195+# define BuildLibGlxWithoutPIC NO
196 # endif
197 #endif
198
e10fc0ec 199@@ -749,7 +749,7 @@
42389106 200
201 #define HasVarRun YES
202 #ifndef VarDbDirectory
203-# define VarDbDirectory $(VARDIR)/lib
204+# define VarDbDirectory /var/lib
205 #endif
206
207 #ifndef XF86OSCardDrivers
e10fc0ec 208--- xc/config/cf/site.def.orig 2006-01-09 15:56:13.000000000 +0100
209+++ xc/config/cf/site.def 2006-06-11 00:28:00.330502072 +0200
19af2322 210@@ -104,10 +104,15 @@
42389106 211 #define HasSentinel YES
212 */
213
214-/*
215 #undef DefaultUserPath
216-#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
217-*/
218+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
219+#undef DefaultSystemPath
220+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
221+
222+
223+#define HasPam YES
224+#define HasPamMisc YES
19af2322 225+#define HasFontconfig YES
42389106 226
227
228 /* You do NOT need SetUID if you only run the server under xdm */
e10fc0ec 229--- xc/config/cf/xf86site.def.orig 2006-04-08 20:33:00.000000000 +0200
230+++ xc/config/cf/xf86site.def 2006-06-11 00:28:00.335501312 +0200
231@@ -257,8 +257,8 @@
2452d5b7 232 /*
233 * To not build/install the Cyrillic fonts, uncomment the following
234 *
235-#define BuildCyrillicFonts NO
236 */
237+#define BuildCyrillicFonts YES
238
239 /*
240 * To not install the local font directory, uncomment the following
e10fc0ec 241@@ -304,27 +304,26 @@
2452d5b7 242 * HasGlide2 to YES and set the Glide2IncDir variable.
243 * HasGlide2 is per default NO.
244 *
245-#define HasGlide2 YES
246 */
247+#define HasGlide2 YES
248
249 /*
250 * Set the path to your Glide include files.
251 *
252-#define Glide2IncDir /usr/include/glide
253 */
254+#define Glide2IncDir /usr/include/glide
255
256 /*
257 * Have glide 3?
258 *
259-#define HasGlide3 YES
260 */
261+#define HasGlide3 YES
262
263 /*
264 * Set the path to your Glide 3 include files.
265 *
266-#define Glide3IncDir /usr/include/glide3
267 */
268-
269+#define Glide3IncDir /usr/include/glide3
270
271
272 /*
e10fc0ec 273@@ -426,8 +425,8 @@
e1fe05b9
JR		 274 * Some Linux releases don't have a libtermcap. In this case you may need
275 * to uncomment the following
276 *
277-#define TermcapLibrary -lncurses
278 */
279+#define TermcapLibrary -lncurses
280
281 /*
e9cc699d 282 * Build a server that dynamically loads the modules by setting
e10fc0ec 283@@ -602,8 +601,8 @@
e1fe05b9
JR		 284 * To forceably build static libraries in addition to shared libraries,
285 * uncomment this.
286 *
287-#define ForceNormalLib YES
288 */
289+#define ForceNormalLib YES
290
291 /*
292 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
e10fc0ec 293--- xc/config/cf/xfree86.cf.orig 2006-04-26 02:28:16.000000000 +0200
294+++ xc/config/cf/xfree86.cf 2006-06-11 00:28:00.337501008 +0200
295@@ -148,7 +148,7 @@
e1fe05b9
JR		 296 #define XConfigFile XF86Config
297 #endif
298 #ifndef XConfigDir
299-#define XConfigDir $(LIBDIR)
300+#define XConfigDir $(ETCX11DIR)
301 #endif
b19d4d8b
JR		 302 #ifndef XLogFile
303 #define XLogFile XFree86
e10fc0ec 304@@ -788,7 +788,7 @@
e9cc699d 305
91e66983 306 # ifndef XF86CardDrivers
e9cc699d 307 # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
308- trident chips tdfx fbdev ati \
309+ trident chips fbdev ati \
310 DevelDrivers newport \
91e66983 311 XF86OSCardDrivers XF86ExtraCardDrivers
312 # endif
e10fc0ec 313--- xc/config/imake/imake.c.orig 2006-01-09 15:56:14.000000000 +0100
314+++ xc/config/imake/imake.c 2006-06-11 00:28:00.339500704 +0200
315@@ -1056,6 +1056,7 @@
2452d5b7 316 static char* suse = "/etc/SuSE-release";
e1fe05b9
JR		 317 static char* redhat = "/etc/redhat-release";
318 static char* debian = "/etc/debian_version";
319+ static char* pld = "/etc/pld-release";
320
321 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
322 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
e10fc0ec 323@@ -1070,6 +1071,7 @@
e1fe05b9
JR		 324 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
325 fprintf (inFile, "%s\n", "#define LinuxWare 11");
326 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
327+ fprintf (inFile, "%s\n", "#define LinuxPLD 13");
328
2452d5b7 329 #ifdef CROSSCOMPILE
330 if (CrossCompiling) {
e10fc0ec 331@@ -1096,6 +1098,11 @@
e1fe05b9 332 * at the content of /etc/debian_version */
2452d5b7 333 return;
334 }
e1fe05b9
JR		 335+ if (lstat (pld, &sb) == 0) {
336+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
337+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
2452d5b7 338+ return;
339+ }
e1fe05b9 340 /* what's the definitive way to tell what any particular distribution is? */
2452d5b7 341
342 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
e10fc0ec 343--- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig 2006-03-11 18:36:50.000000000 +0100
344+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2006-06-11 00:28:00.340500552 +0200
345@@ -108,7 +108,7 @@
2452d5b7 346
42389106 347 #if HasNCurses
348 CURSESLIB = NCursesLibName
349-CURSESDEFINES = -DHAS_NCURSES
350+CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
351 #endif
352
353 XF86CONFIGFILE = XConfigFile
e10fc0ec 354--- xc/programs/xdm/config/Xres.cpp.orig 2006-01-09 16:01:06.000000000 +0100
355+++ xc/programs/xdm/config/Xres.cpp 2006-06-11 00:28:00.341500400 +0200
356@@ -65,10 +65,10 @@
357 #endif /* XPM */
fa4a3447 358 XHASHendif
e1fe05b9 359 #ifdef XPM
8b7622d8 360-XHASHif PLANES >= 8
e1fe05b9 361-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
8b7622d8 362+XHASHif PLANES > 8
8a78032e 363+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
fa4a3447 364 XHASHelse
e1fe05b9
JR		 365-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
366+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
fa4a3447 367 XHASHendif
e1fe05b9
JR		 368 xlogin*useShape: true
369 xlogin*logoPadding: 10
e10fc0ec 370--- xc/programs/xdm/resource.c.orig 2006-01-09 16:01:04.000000000 +0100
371+++ xc/programs/xdm/resource.c 2006-06-11 00:28:00.342500248 +0200
372@@ -83,31 +83,31 @@
e1fe05b9 373 */
e9cc699d 374 #ifndef __EMX__
e1fe05b9
JR		 375 #ifndef DEF_SERVER_LINE
376-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
47559fe6 377+#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
e1fe05b9
JR		 378 #endif
379 #ifndef XRDB_PROGRAM
380-#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
47559fe6 381+#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
e1fe05b9
JR		 382 #endif
383 #ifndef DEF_SESSION
384-#define DEF_SESSION "/usr/bin/X11/xterm -ls"
47559fe6 385+#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
e1fe05b9
JR		 386 #endif
387 #ifndef DEF_USER_PATH
388-#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
47559fe6 389+#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
e1fe05b9
JR		 390 #endif
391 #ifndef DEF_SYSTEM_PATH
392-#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
47559fe6 393+#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
e1fe05b9
JR		 394 #endif
395 #ifndef DEF_SYSTEM_SHELL
396 #define DEF_SYSTEM_SHELL "/bin/sh"
397 #endif
398 #ifndef DEF_FAILSAFE_CLIENT
399-#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
47559fe6 400+#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
e1fe05b9
JR		 401 #endif
402 #ifndef DEF_XDM_CONFIG
403-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
404+#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
405 #endif
406 #ifndef DEF_CHOOSER
407-#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
408+#define DEF_CHOOSER "/etc/X11/xdm/chooser"
409 #endif
410 #ifndef DEF_AUTH_NAME
411 #ifdef HASXDMAUTH
e10fc0ec 412@@ -117,7 +117,7 @@
e1fe05b9
JR		 413 #endif
414 #endif
415 #ifndef DEF_AUTH_DIR
416-#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
417+#define DEF_AUTH_DIR "/etc/X11/xdm"
418 #endif
419 #ifndef DEF_USER_AUTH_DIR
420 #define DEF_USER_AUTH_DIR "/tmp"
e10fc0ec 421--- xc/programs/xinit/Imakefile.orig 2006-03-06 17:06:23.000000000 +0100
422+++ xc/programs/xinit/Imakefile 2006-06-11 00:28:00.342500248 +0200
423@@ -41,11 +41,12 @@
fa4a3447 424 #endif
e1fe05b9
JR		 425 InstallManPage(startx,$(MANDIR))
426
427-#if InstallXinitConfig
428-InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
429-#else
430-InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
431-#endif
432+XCOMM Red Hat gets this from a different package
433+XCOMM #if InstallXinitConfig
434+XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
435+XCOMM #else
436+XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
437+XCOMM #endif
e1fe05b9
JR		 438
439 LinkConfDirectory(xinit,.,xinit,.)
2452d5b7 440
e10fc0ec 441--- xc/programs/xterm/Imakefile.orig 2006-04-10 02:34:36.000000000 +0200
442+++ xc/programs/xterm/Imakefile 2006-06-11 00:48:09.508679048 +0200
443@@ -94,6 +94,10 @@
444 # endif
e1fe05b9
JR		 445 #endif
446
447+#if InstallXtermSetUID
448+#undef InstallXtermSetUID
449+#endif
450+
451 #ifndef SpecialCObjectRule
452 #define SpecialCObjectRule(module,ignore,defines) \
453 module.o: ; $(CC) -c defines $(CFLAGS) module.c
e10fc0ec 454@@ -179,7 +183,7 @@
e1fe05b9 455 XKB_DEFINES = XkbClientDefines
2452d5b7 456 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
e10fc0ec 457 DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
42389106 458- INCLUDES = -I. $(XRFINCLUDES)
459+ INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
e1fe05b9
JR		 460
461 #ifdef OS2Architecture
42389106 462 MAINSRC = os2main.c
XFree86 Window System servers and basic programs
This page took 0.171735 seconds and 4 git commands to generate.