]> 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
- 4.8.0 (probably the last XFree86 version ever, for comparison and archival reasons)
[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
62f02f09 210@@ -104,10 +104,10 @@
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)
42389106 221
222
223 /* You do NOT need SetUID if you only run the server under xdm */
e10fc0ec 224--- xc/config/cf/xf86site.def.orig 2006-04-08 20:33:00.000000000 +0200
225+++ xc/config/cf/xf86site.def 2006-06-11 00:28:00.335501312 +0200
226@@ -257,8 +257,8 @@
2452d5b7 227 /*
228 * To not build/install the Cyrillic fonts, uncomment the following
229 *
230-#define BuildCyrillicFonts NO
231 */
232+#define BuildCyrillicFonts YES
233
234 /*
235 * To not install the local font directory, uncomment the following
e10fc0ec 236@@ -426,8 +425,8 @@
e1fe05b9
JR		 237 * Some Linux releases don't have a libtermcap. In this case you may need
238 * to uncomment the following
239 *
240-#define TermcapLibrary -lncurses
241 */
62f02f09 242+#define TermcapLibrary -ltinfo
e1fe05b9
JR		 243
244 /*
e9cc699d 245 * Build a server that dynamically loads the modules by setting
e10fc0ec 246@@ -602,8 +601,8 @@
e1fe05b9
JR		 247 * To forceably build static libraries in addition to shared libraries,
248 * uncomment this.
249 *
250-#define ForceNormalLib YES
251 */
252+#define ForceNormalLib YES
253
254 /*
255 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
62f02f09
JB		 256@@ -691,4 +691,8 @@
257 #define X86EMU_LIBPATH /usr/local/lib
258 */
259
260-
261+/* these must be before linux.cf is included */
262+#define UsePam YES
263+#define HasPam YES
264+#define HasPamMisc YES
265+#define HasFontconfig YES
e10fc0ec 266--- xc/config/cf/xfree86.cf.orig 2006-04-26 02:28:16.000000000 +0200
267+++ xc/config/cf/xfree86.cf 2006-06-11 00:28:00.337501008 +0200
268@@ -148,7 +148,7 @@
e1fe05b9
JR		 269 #define XConfigFile XF86Config
270 #endif
271 #ifndef XConfigDir
272-#define XConfigDir $(LIBDIR)
273+#define XConfigDir $(ETCX11DIR)
274 #endif
b19d4d8b
JR		 275 #ifndef XLogFile
276 #define XLogFile XFree86
e10fc0ec 277@@ -788,7 +788,7 @@
e9cc699d 278
91e66983 279 # ifndef XF86CardDrivers
e9cc699d 280 # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
281- trident chips tdfx fbdev ati \
282+ trident chips fbdev ati \
283 DevelDrivers newport \
91e66983 284 XF86OSCardDrivers XF86ExtraCardDrivers
285 # endif
e10fc0ec 286--- xc/config/imake/imake.c.orig 2006-01-09 15:56:14.000000000 +0100
287+++ xc/config/imake/imake.c 2006-06-11 00:28:00.339500704 +0200
288@@ -1056,6 +1056,7 @@
2452d5b7 289 static char* suse = "/etc/SuSE-release";
e1fe05b9
JR		 290 static char* redhat = "/etc/redhat-release";
291 static char* debian = "/etc/debian_version";
292+ static char* pld = "/etc/pld-release";
293
294 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
295 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
e10fc0ec 296@@ -1070,6 +1071,7 @@
e1fe05b9
JR		 297 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
298 fprintf (inFile, "%s\n", "#define LinuxWare 11");
299 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
300+ fprintf (inFile, "%s\n", "#define LinuxPLD 13");
301
2452d5b7 302 #ifdef CROSSCOMPILE
303 if (CrossCompiling) {
e10fc0ec 304@@ -1096,6 +1098,11 @@
e1fe05b9 305 * at the content of /etc/debian_version */
2452d5b7 306 return;
307 }
e1fe05b9
JR		 308+ if (lstat (pld, &sb) == 0) {
309+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
310+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
2452d5b7 311+ return;
312+ }
e1fe05b9 313 /* what's the definitive way to tell what any particular distribution is? */
2452d5b7 314
315 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
e10fc0ec 316--- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig 2006-03-11 18:36:50.000000000 +0100
317+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2006-06-11 00:28:00.340500552 +0200
318@@ -108,7 +108,7 @@
2452d5b7 319
42389106 320 #if HasNCurses
321 CURSESLIB = NCursesLibName
322-CURSESDEFINES = -DHAS_NCURSES
323+CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
324 #endif
325
326 XF86CONFIGFILE = XConfigFile
e10fc0ec 327--- xc/programs/xdm/config/Xres.cpp.orig 2006-01-09 16:01:06.000000000 +0100
328+++ xc/programs/xdm/config/Xres.cpp 2006-06-11 00:28:00.341500400 +0200
329@@ -65,10 +65,10 @@
330 #endif /* XPM */
fa4a3447 331 XHASHendif
e1fe05b9 332 #ifdef XPM
8b7622d8 333-XHASHif PLANES >= 8
e1fe05b9 334-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
8b7622d8 335+XHASHif PLANES > 8
8a78032e 336+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
fa4a3447 337 XHASHelse
e1fe05b9
JR		 338-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
339+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
fa4a3447 340 XHASHendif
e1fe05b9
JR		 341 xlogin*useShape: true
342 xlogin*logoPadding: 10
e10fc0ec 343--- xc/programs/xdm/resource.c.orig 2006-01-09 16:01:04.000000000 +0100
344+++ xc/programs/xdm/resource.c 2006-06-11 00:28:00.342500248 +0200
345@@ -83,31 +83,31 @@
e1fe05b9 346 */
e9cc699d 347 #ifndef __EMX__
e1fe05b9
JR		 348 #ifndef DEF_SERVER_LINE
349-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
47559fe6 350+#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
e1fe05b9
JR		 351 #endif
352 #ifndef XRDB_PROGRAM
353-#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
47559fe6 354+#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
e1fe05b9
JR		 355 #endif
356 #ifndef DEF_SESSION
357-#define DEF_SESSION "/usr/bin/X11/xterm -ls"
47559fe6 358+#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
e1fe05b9
JR		 359 #endif
360 #ifndef DEF_USER_PATH
361-#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
47559fe6 362+#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
e1fe05b9
JR		 363 #endif
364 #ifndef DEF_SYSTEM_PATH
365-#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
47559fe6 366+#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
e1fe05b9
JR		 367 #endif
368 #ifndef DEF_SYSTEM_SHELL
369 #define DEF_SYSTEM_SHELL "/bin/sh"
370 #endif
371 #ifndef DEF_FAILSAFE_CLIENT
372-#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
47559fe6 373+#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
e1fe05b9
JR		 374 #endif
375 #ifndef DEF_XDM_CONFIG
376-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
377+#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
378 #endif
379 #ifndef DEF_CHOOSER
380-#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
381+#define DEF_CHOOSER "/etc/X11/xdm/chooser"
382 #endif
383 #ifndef DEF_AUTH_NAME
384 #ifdef HASXDMAUTH
e10fc0ec 385@@ -117,7 +117,7 @@
e1fe05b9
JR		 386 #endif
387 #endif
388 #ifndef DEF_AUTH_DIR
389-#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
390+#define DEF_AUTH_DIR "/etc/X11/xdm"
391 #endif
392 #ifndef DEF_USER_AUTH_DIR
393 #define DEF_USER_AUTH_DIR "/tmp"
e10fc0ec 394--- xc/programs/xinit/Imakefile.orig 2006-03-06 17:06:23.000000000 +0100
395+++ xc/programs/xinit/Imakefile 2006-06-11 00:28:00.342500248 +0200
396@@ -41,11 +41,12 @@
fa4a3447 397 #endif
e1fe05b9
JR		 398 InstallManPage(startx,$(MANDIR))
399
400-#if InstallXinitConfig
401-InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
402-#else
403-InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
404-#endif
62f02f09 405+XCOMM PLD gets this from a different package
e1fe05b9
JR		 406+XCOMM #if InstallXinitConfig
407+XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
408+XCOMM #else
409+XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
410+XCOMM #endif
e1fe05b9
JR		 411
412 LinkConfDirectory(xinit,.,xinit,.)
2452d5b7 413
2bb45ae5
JB		 414--- xc/programs/xterm/Imakefile.orig 2008-11-01 20:57:39.000000000 +0100
415+++ xc/programs/xterm/Imakefile 2013-02-15 18:39:33.885210018 +0100
62f02f09 416@@ -102,6 +102,10 @@
e10fc0ec 417 # endif
e1fe05b9
JR		 418 #endif
419
420+#if InstallXtermSetUID
421+#undef InstallXtermSetUID
422+#endif
423+
424 #ifndef SpecialCObjectRule
425 #define SpecialCObjectRule(module,ignore,defines) \
426 module.o: ; $(CC) -c defines $(CFLAGS) module.c
2bb45ae5 427@@ -209,7 +213,7 @@
62f02f09 428 $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) \
2bb45ae5
JB		 429 $(XTERM_FEATURE_OPTIONS) $(PUTENVDEF) \
430 $(IMAKEDEFINES) $(TRACEDEF)
62f02f09
JB		 431- INCLUDES = $(OBSOLETE_INCLUDES) $(XRFINCLUDES)
432+ INCLUDES = $(OBSOLETE_INCLUDES) $(XRFINCLUDES) -I/usr/include/ncurses
e1fe05b9
JR		 433
434 #ifdef OS2Architecture
42389106 435 MAINSRC = os2main.c
XFree86 Window System servers and basic programs
This page took 0.305739 seconds and 4 git commands to generate.