From: Arkadiusz Miśkiewicz Date: Sun, 23 Nov 2003 22:52:13 +0000 (+0000) Subject: - updated for 4.3.99.16 X-Git-Tag: auto/ac/XFree86-4_3_99_901-0_1~13 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=fa4a3447cce35112987bc4c45baefa9b4a8f9587;p=packages%2FXFree86.git - updated for 4.3.99.16 Changed files: XFree86-PLD.patch -> 1.17 XFree86-alpha_GLX_align_fix.patch -> 1.2 XFree86-mandir-fix.patch -> 1.2 XFree86-xdm-fixes.patch -> 1.7 --- diff --git a/XFree86-PLD.patch b/XFree86-PLD.patch index 4c9a0d5..e2dec39 100644 --- a/XFree86-PLD.patch +++ b/XFree86-PLD.patch @@ -1,19 +1,7 @@ -diff -Nru xc.orig/Makefile xc/Makefile ---- xc.orig/Makefile 2003-04-25 13:00:01.000000000 +0200 -+++ xc/Makefile 2003-09-26 10:27:39.655002672 +0200 -@@ -8,7 +8,7 @@ - # or add "MAKE = make" to this file. - - RELEASE = "Release 6.6" --SHELL = /bin/sh -+SHELL = /bin/sh -e - RM = rm -f - MV = mv - WORLDOPTS = -diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf ---- xc.orig/config/cf/Imake.cf 2003-07-10 13:00:02.000000000 +0200 -+++ xc/config/cf/Imake.cf 2003-09-26 10:27:39.710994160 +0200 -@@ -746,6 +746,10 @@ +diff -urN xc.org/config/cf/Imake.cf xc/config/cf/Imake.cf +--- xc.org/config/cf/Imake.cf 2003-11-21 15:13:57.000000000 +0100 ++++ xc/config/cf/Imake.cf 2003-11-21 15:20:56.000000000 +0100 +@@ -766,6 +766,10 @@ # define s390Architecture # undef __s390__ # endif /* s390 */ @@ -24,9 +12,9 @@ diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf # ifdef __alpha # define AlphaArchitecture # undef __alpha -diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl ---- xc.orig/config/cf/Imake.tmpl 2003-09-25 13:00:02.000000000 +0200 -+++ xc/config/cf/Imake.tmpl 2003-09-26 10:27:39.733990664 +0200 +diff -urN xc.org/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl +--- xc.org/config/cf/Imake.tmpl 2003-11-21 15:13:57.000000000 +0100 ++++ xc/config/cf/Imake.tmpl 2003-11-21 15:20:56.000000000 +0100 @@ -261,7 +261,7 @@ #ifndef BuildHtmlManPages @@ -36,7 +24,7 @@ diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl #else #define BuildHtmlManPages NO #endif -@@ -845,11 +845,7 @@ +@@ -854,11 +854,7 @@ #define LintlibDir $(USRLIBDIR)/lint #endif #ifndef SystemManDirectory @@ -48,7 +36,7 @@ diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl #endif #ifndef ManDirectoryRoot #ifdef ProjectRoot -@@ -986,7 +982,7 @@ +@@ -998,7 +994,7 @@ #define NoRConst NO /* YES if const for structs of funcs is bad */ #endif #ifndef InstPgmFlags @@ -57,7 +45,7 @@ diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl #endif #ifndef InstBinFlags #define InstBinFlags -m 0755 -@@ -1124,7 +1120,7 @@ +@@ -1140,7 +1136,7 @@ #define CppCmd /LibDirName/cpp #endif #ifndef RawCppCmd @@ -66,10 +54,61 @@ diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl #endif #ifndef CppNoLineInfoOption #define CppNoLineInfoOption /**/ -diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl ---- xc.orig/config/cf/X11.tmpl 2003-09-25 13:00:02.000000000 +0200 -+++ xc/config/cf/X11.tmpl 2003-09-26 10:27:39.755987320 +0200 -@@ -1240,8 +1240,12 @@ +diff -urN xc.org/config/cf/linux.cf xc/config/cf/linux.cf +--- xc.org/config/cf/linux.cf 2003-11-21 15:13:57.000000000 +0100 ++++ xc/config/cf/linux.cf 2003-11-21 15:20:56.000000000 +0100 +@@ -325,7 +325,7 @@ + */ + #if BuildXF86DRI + # if defined(i386Architecture) +-# define BuildLibGlxWithoutPIC YES ++# define BuildLibGlxWithoutPIC NO + # endif + #endif + +@@ -344,7 +344,7 @@ + # if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(AMD64Architecture) + # if OSMajorVersion == 2 + /* Only tested for Linux 2.2.0 through 2.2.12 */ +-# if OSMinorVersion == 2 && OSTeenyVersion <= 12 ++# if OSMinorVersion == 2 + # define BuildXF86DRM YES + # else + /* Only tested for Linux 2.3.0 through 2.3.18 */ +@@ -740,7 +740,7 @@ + + #define HasVarRun YES + #ifndef VarDbDirectory +-# define VarDbDirectory $(VARDIR)/lib ++# define VarDbDirectory /var/lib + #endif + + #ifndef XF86OSCardDrivers +diff -urN xc.org/config/cf/site.def xc/config/cf/site.def +--- xc.org/config/cf/site.def 2003-11-21 15:13:57.000000000 +0100 ++++ xc/config/cf/site.def 2003-11-21 15:20:56.000000000 +0100 +@@ -119,10 +119,14 @@ + #define HasSentinel YES + */ + +-/* + #undef DefaultUserPath +-#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin +-*/ ++#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR) ++#undef DefaultSystemPath ++#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR) ++ ++ ++#define HasPam YES ++#define HasPamMisc YES + + + /* You do NOT need SetUID if you only run the server under xdm */ +diff -urN xc.org/config/cf/X11.tmpl xc/config/cf/X11.tmpl +--- xc.org/config/cf/X11.tmpl 2003-11-21 15:13:57.000000000 +0100 ++++ xc/config/cf/X11.tmpl 2003-11-21 15:20:56.000000000 +0100 +@@ -1261,8 +1261,12 @@ # define UsbMouseSupport NO #endif @@ -83,7 +122,7 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #endif /* X-TrueType settings */ -@@ -1364,7 +1368,7 @@ +@@ -1385,7 +1389,7 @@ #define ConfigDir $(LIBDIR)/config #endif #ifndef DocDir @@ -92,7 +131,7 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #endif #ifndef DocHtmlDir #define DocHtmlDir $(DOCDIR)/html -@@ -1376,31 +1380,31 @@ +@@ -1397,31 +1401,31 @@ #define DocPdfDir $(DOCDIR)/PDF #endif #ifndef FontDir @@ -131,7 +170,7 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #endif #ifndef NlsDir #define NlsDir $(LIBDIR)/nls -@@ -1409,23 +1413,20 @@ +@@ -1430,23 +1434,20 @@ #define XLocaleDir $(LIBDIR)/locale #endif #ifndef LbxproxyDir @@ -158,7 +197,7 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #ifndef InstallSecurityConfig #define InstallSecurityConfig YES /* Install sample security policy */ #endif -@@ -1457,10 +1458,10 @@ +@@ -1478,10 +1479,10 @@ #define OsNameDefines /* as nothing */ #endif #ifndef DefaultUserPath /* for xdm */ @@ -171,7 +210,7 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #endif #ifndef DefaultSystemShell /* for xdm to set in SHELL */ #define DefaultSystemShell BourneShell -@@ -1587,7 +1588,7 @@ +@@ -1608,7 +1609,7 @@ HTMLINDEXCMD = HtmlIndexCmd @@ -180,7 +219,7 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl CLIENTSRC = $(TOP)/clients DEMOSRC = $(TOP)/demos XDOCMACROS = $(DOCUTILSRC)/macros.t -@@ -1601,7 +1602,7 @@ +@@ -1622,7 +1623,7 @@ SERVERSRC = $(XTOP)/programs/Xserver CONTRIBSRC = ContribDir UNSUPPORTEDSRC = UnsupportedDir @@ -189,60 +228,9 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl RGBSRC = $(XTOP)/programs/rgb BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir -diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf ---- xc.orig/config/cf/linux.cf 2003-09-10 13:00:02.000000000 +0200 -+++ xc/config/cf/linux.cf 2003-09-26 10:27:39.767985496 +0200 -@@ -309,7 +309,7 @@ - */ - #if BuildXF86DRI - # if defined(i386Architecture) --# define BuildLibGlxWithoutPIC YES -+# define BuildLibGlxWithoutPIC NO - # endif - #endif - -@@ -328,7 +328,7 @@ - # if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(AMD64Architecture) - # if OSMajorVersion == 2 - /* Only tested for Linux 2.2.0 through 2.2.12 */ --# if OSMinorVersion == 2 && OSTeenyVersion <= 12 -+# if OSMinorVersion == 2 - # define BuildXF86DRM YES - # else - /* Only tested for Linux 2.3.0 through 2.3.18 */ -@@ -716,7 +716,7 @@ - - #define HasVarRun YES - #ifndef VarDbDirectory --# define VarDbDirectory $(VARDIR)/lib -+# define VarDbDirectory /var/lib - #endif - - #ifndef XF86OSCardDrivers -diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def ---- xc.orig/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100 -+++ xc/config/cf/site.def 2003-09-26 10:27:39.773984584 +0200 -@@ -119,10 +119,14 @@ - #define HasSentinel YES - */ - --/* - #undef DefaultUserPath --#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin --*/ -+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR) -+#undef DefaultSystemPath -+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR) -+ -+ -+#define HasPam YES -+#define HasPamMisc YES - - - /* You do NOT need SetUID if you only run the server under xdm */ -diff -Nru xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def ---- xc.orig/config/cf/xf86site.def 2003-09-10 13:00:03.000000000 +0200 -+++ xc/config/cf/xf86site.def 2003-09-26 10:27:39.790982000 +0200 +diff -urN xc.org/config/cf/xf86site.def xc/config/cf/xf86site.def +--- xc.org/config/cf/xf86site.def 2003-11-21 15:13:57.000000000 +0100 ++++ xc/config/cf/xf86site.def 2003-11-21 15:20:56.000000000 +0100 @@ -260,8 +260,8 @@ /* * To not build/install the Cyrillic fonts, uncomment the following @@ -305,9 +293,9 @@ diff -Nru xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def /* * Uncomment this if your default tools (eg, gcc, ld, as, etc) are -diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf ---- xc.orig/config/cf/xfree86.cf 2003-09-25 13:00:04.000000000 +0200 -+++ xc/config/cf/xfree86.cf 2003-09-26 10:31:13.596478624 +0200 +diff -urN xc.org/config/cf/xfree86.cf xc/config/cf/xfree86.cf +--- xc.org/config/cf/xfree86.cf 2003-11-21 15:13:57.000000000 +0100 ++++ xc/config/cf/xfree86.cf 2003-11-21 15:20:56.000000000 +0100 @@ -128,7 +128,7 @@ #define XConfigFile XF86Config #endif @@ -326,9 +314,9 @@ diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf DevelDrivers newport \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c ---- xc.orig/config/imake/imake.c 2003-04-10 13:00:03.000000000 +0200 -+++ xc/config/imake/imake.c 2003-09-26 10:27:39.803980024 +0200 +diff -urN xc.org/config/imake/imake.c xc/config/imake/imake.c +--- xc.org/config/imake/imake.c 2003-11-21 15:13:57.000000000 +0100 ++++ xc/config/imake/imake.c 2003-11-21 15:20:56.000000000 +0100 @@ -1057,6 +1057,7 @@ static char* suse = "/etc/SuSE-release"; static char* redhat = "/etc/redhat-release"; @@ -357,38 +345,36 @@ diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c /* what's the definitive way to tell what any particular distribution is? */ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); -diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile ---- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-03-04 17:25:10.000000000 +0100 -+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-09-26 10:27:39.000000000 +0200 -@@ -93,7 +93,7 @@ - - #if HasNCurses - CURSESLIB = NCursesLibName --CURSESDEFINES = -DHAS_NCURSES -+CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses - #endif +diff -urN xc.org/Makefile xc/Makefile +--- xc.org/Makefile 2003-11-21 15:13:57.000000000 +0100 ++++ xc/Makefile 2003-11-21 15:20:56.000000000 +0100 +@@ -8,7 +8,7 @@ + # or add "MAKE = make" to this file. - XF86CONFIGFILE = XConfigFile -diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp ---- xc.orig/programs/xdm/config/Xres.cpp 2003-01-04 04:11:31.000000000 +0100 -+++ xc/programs/xdm/config/Xres.cpp 2003-09-26 10:27:39.000000000 +0200 -@@ -70,10 +70,10 @@ - #endif /* XPM */ - /**/#endif + RELEASE = "Release 6.6" +-SHELL = /bin/sh ++SHELL = /bin/sh -e + RM = rm -f + MV = mv + WORLDOPTS = +diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp +--- xc.org/programs/xdm/config/Xres.cpp 2003-11-21 15:18:39.000000000 +0100 ++++ xc/programs/xdm/config/Xres.cpp 2003-11-21 15:21:45.000000000 +0100 +@@ -71,9 +71,9 @@ + XHASHendif #ifdef XPM --/**/#if PLANES >= 8 + XHASHif PLANES >= 8 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP -+/**/#if PLANES >= 15 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm - /**/#else + XHASHelse -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm - /**/#endif + XHASHendif xlogin*useShape: true xlogin*logoPadding: 10 -diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c ---- xc.orig/programs/xdm/resource.c 2003-09-25 13:06:32.000000000 +0200 -+++ xc/programs/xdm/resource.c 2003-09-26 10:27:39.000000000 +0200 +diff -urN xc.org/programs/xdm/resource.c xc/programs/xdm/resource.c +--- xc.org/programs/xdm/resource.c 2003-11-21 15:18:38.000000000 +0100 ++++ xc/programs/xdm/resource.c 2003-11-21 15:20:56.000000000 +0100 @@ -84,31 +84,31 @@ */ #ifndef __EMX__ @@ -438,11 +424,11 @@ diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c #endif #ifndef DEF_USER_AUTH_DIR #define DEF_USER_AUTH_DIR "/tmp" -diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile ---- xc.orig/programs/xinit/Imakefile 2003-06-10 13:08:06.000000000 +0200 -+++ xc/programs/xinit/Imakefile 2003-09-26 10:27:39.000000000 +0200 -@@ -39,11 +39,12 @@ - InstallNamedProg(startx,startx,$(BINDIR)) +diff -urN xc.org/programs/xinit/Imakefile xc/programs/xinit/Imakefile +--- xc.org/programs/xinit/Imakefile 2003-11-21 15:18:47.000000000 +0100 ++++ xc/programs/xinit/Imakefile 2003-11-21 15:20:56.000000000 +0100 +@@ -46,11 +46,12 @@ + #endif InstallManPage(startx,$(MANDIR)) -#if InstallXinitConfig @@ -459,9 +445,21 @@ diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile LinkConfDirectory(xinit,.,xinit,.) -diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile ---- xc.orig/programs/xterm/Imakefile 2003-09-25 13:06:59.000000000 +0200 -+++ xc/programs/xterm/Imakefile 2003-09-26 10:27:39.000000000 +0200 +diff -urN xc.org/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile +--- xc.org/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-11-21 15:17:43.000000000 +0100 ++++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-11-21 15:20:56.000000000 +0100 +@@ -100,7 +100,7 @@ + + #if HasNCurses + CURSESLIB = NCursesLibName +-CURSESDEFINES = -DHAS_NCURSES ++CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses + #endif + + XF86CONFIGFILE = XConfigFile +diff -urN xc.org/programs/xterm/Imakefile xc/programs/xterm/Imakefile +--- xc.org/programs/xterm/Imakefile 2003-11-21 15:19:09.000000000 +0100 ++++ xc/programs/xterm/Imakefile 2003-11-21 15:20:56.000000000 +0100 @@ -36,6 +36,10 @@ #define XkbClientLibs /**/ #endif @@ -491,9 +489,9 @@ diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile INCLUDES = $(XRFINCLUDES) #ifdef OS2Architecture -diff -Nru xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h ---- xc.orig/programs/xterm/xterm.h 2003-09-25 13:07:01.000000000 +0200 -+++ xc/programs/xterm/xterm.h 2003-09-26 10:27:39.000000000 +0200 +diff -urN xc.org/programs/xterm/xterm.h xc/programs/xterm/xterm.h +--- xc.org/programs/xterm/xterm.h 2003-11-21 15:19:12.000000000 +0100 ++++ xc/programs/xterm/xterm.h 2003-11-21 15:20:56.000000000 +0100 @@ -73,7 +73,7 @@ #endif diff --git a/XFree86-alpha_GLX_align_fix.patch b/XFree86-alpha_GLX_align_fix.patch index eed6263..041f2c9 100644 --- a/XFree86-alpha_GLX_align_fix.patch +++ b/XFree86-alpha_GLX_align_fix.patch @@ -7,9 +7,9 @@ This patch by Brian Paul. xfont.o +#if defined(AlphaArchitecture) -+ GLX_DEFS = GlxDefines -D__GLX_ALIGN64 ++ GLX_DEFS = GlxDefines VidModeExtensionDefines -D__GLX_ALIGN64 +#else - GLX_DEFS = GlxDefines + GLX_DEFS = GlxDefines VidModeExtensionDefines +#endif #if BuildXF86DRI diff --git a/XFree86-mandir-fix.patch b/XFree86-mandir-fix.patch index 48faea8..9ca3a0f 100644 --- a/XFree86-mandir-fix.patch +++ b/XFree86-mandir-fix.patch @@ -1,14 +1,3 @@ ---- XFree86-4.3.99.15/xc/lib/XRes/Imakefile.orig 2003-11-02 05:43:10.000000000 +0100 -+++ XFree86-4.3.99.15/xc/lib/XRes/Imakefile 2003-11-03 07:56:18.646373856 +0100 -@@ -28,7 +28,7 @@ - MANSUFFIX=$(LIBMANSUFFIX) - InstallManPage(LibName,$(LIBMANDIR)) - #if ExpandManNames --InstallManPageAliases(LibName,$(MANDIR),XResQueryExtension XResQueryVersion XResQueryClients XResQueryClientResources XResQueryClientPixmapBytes) -+InstallManPageAliases(LibName,$(LIBMANDIR),XResQueryExtension XResQueryVersion XResQueryClients XResQueryClientResources XResQueryClientPixmapBytes) - #endif - - DependTarget() --- XFree86-4.3.99.15/xc/lib/Xfontcache/Imakefile.orig 2003-11-02 05:43:16.000000000 +0100 +++ XFree86-4.3.99.15/xc/lib/Xfontcache/Imakefile 2003-11-03 07:58:44.399216056 +0100 @@ -36,7 +36,7 @@ @@ -20,14 +9,3 @@ #endif DependTarget() ---- XFree86-4.3.99.15/xc/lib/Xss/Imakefile.orig 2003-11-02 05:43:20.000000000 +0100 -+++ XFree86-4.3.99.15/xc/lib/Xss/Imakefile 2003-11-03 07:56:38.534350424 +0100 -@@ -31,7 +31,7 @@ - MANSUFFIX=$(LIBMANSUFFIX) - InstallManPage(LibName,$(LIBMANDIR)) - #if ExpandManNames --InstallManPageAliases(LibName,$(MANDIR), XScreenSaverQueryExtension \ @@\ -+InstallManPageAliases(LibName,$(LIBMANDIR), XScreenSaverQueryExtension \ @@\ - XScreenSaverQueryVersion \ @@\ - XScreenSaverAllocInfo \ @@\ - XScreenSaverQueryInfo \ @@\ diff --git a/XFree86-xdm-fixes.patch b/XFree86-xdm-fixes.patch index f50bf0c..ad9d2f2 100644 --- a/XFree86-xdm-fixes.patch +++ b/XFree86-xdm-fixes.patch @@ -54,13 +54,13 @@ diff -urN xc.orig/programs/xdm/config/Imakefile xc/programs/xdm/config/Imakefile CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter) LinkFile(Xservers,Xservers.$(SERVERSTYPE)) -diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp ---- xc.orig/programs/xdm/config/Xres.cpp Mon Dec 30 15:54:07 2002 -+++ xc/programs/xdm/config/Xres.cpp Mon Dec 30 18:41:24 2002 +diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp +--- xc.org/programs/xdm/config/Xres.cpp 2003-11-23 23:32:35.000000000 +0100 ++++ xc/programs/xdm/config/Xres.cpp 2003-11-23 23:33:41.000000000 +0100 @@ -41,9 +41,7 @@ - /**/#endif + XHASHendif #endif /* XPM */ - /**/#ifdef COLOR + XHASHifdef COLOR -#ifndef XPM -xlogin*greetColor: CadetBlue -#else