X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86-PLD.patch;h=62d5fb9ca6e9e86f1ef6b1fd72c928e77e622077;hb=d04ee9f7ed22cfebe21d8156558911f3ea9ff948;hp=4c9a0d59f6739fd146884f872ddfabf0f320e438;hpb=e9cc699d165b9d23975106a4a4762323201dfded;p=packages%2FXFree86.git

diff --git a/XFree86-PLD.patch b/XFree86-PLD.patch
index 4c9a0d5..62d5fb9 100644
--- a/XFree86-PLD.patch
+++ b/XFree86-PLD.patch
@@ -1,6 +1,6 @@
 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
+--- xc.orig/Makefile	2003-11-02 05:38:01.000000000 +0100
++++ xc/Makefile	2003-12-23 12:09:12.071230112 +0100
 @@ -8,7 +8,7 @@
  # or add "MAKE = make" to this file.
  
@@ -11,9 +11,9 @@ diff -Nru xc.orig/Makefile xc/Makefile
  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 @@
+--- xc.orig/config/cf/Imake.cf	2003-12-19 05:40:33.000000000 +0100
++++ xc/config/cf/Imake.cf	2003-12-23 12:09:11.983243488 +0100
+@@ -784,6 +784,10 @@
  #   define s390Architecture
  #  undef __s390__
  # endif /* s390 */
@@ -25,8 +25,8 @@ diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
  #  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
+--- xc.orig/config/cf/Imake.tmpl	2003-11-21 06:55:02.000000000 +0100
++++ xc/config/cf/Imake.tmpl	2003-12-23 12:09:11.992242120 +0100
 @@ -261,7 +261,7 @@
  
  #ifndef BuildHtmlManPages
@@ -36,7 +36,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 +48,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 +57,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
@@ -67,9 +67,9 @@ diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
  #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 @@
+--- xc.orig/config/cf/X11.tmpl	2003-12-19 05:41:17.000000000 +0100
++++ xc/config/cf/X11.tmpl	2003-12-23 12:09:12.042234520 +0100
+@@ -1262,8 +1262,12 @@
  # define UsbMouseSupport NO
  #endif
  
@@ -83,7 +83,7 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
  #endif
  
  /* X-TrueType settings */
-@@ -1364,7 +1368,7 @@
+@@ -1389,7 +1393,7 @@
  #define ConfigDir $(LIBDIR)/config
  #endif
  #ifndef DocDir
@@ -92,7 +92,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 @@
+@@ -1401,31 +1405,31 @@
  #define DocPdfDir $(DOCDIR)/PDF
  #endif
  #ifndef FontDir
@@ -131,7 +131,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 @@
+@@ -1434,23 +1438,20 @@
  #define XLocaleDir $(LIBDIR)/locale
  #endif
  #ifndef LbxproxyDir
@@ -158,7 +158,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 @@
+@@ -1482,10 +1483,10 @@
  #define OsNameDefines /* as nothing */
  #endif
  #ifndef DefaultUserPath			/* for xdm */
@@ -171,7 +171,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 @@
+@@ -1614,7 +1615,7 @@
  
       HTMLINDEXCMD = HtmlIndexCmd
  
@@ -180,7 +180,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 @@
+@@ -1628,7 +1629,7 @@
          SERVERSRC = $(XTOP)/programs/Xserver
         CONTRIBSRC = ContribDir
     UNSUPPORTEDSRC = UnsupportedDir
@@ -190,9 +190,9 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
        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 @@
+--- xc.orig/config/cf/linux.cf	2003-12-19 05:41:59.000000000 +0100
++++ xc/config/cf/linux.cf	2003-12-23 12:09:12.008239688 +0100
+@@ -333,7 +333,7 @@
   */
  #if BuildXF86DRI
  # if defined(i386Architecture)
@@ -201,16 +201,7 @@ diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
  # 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 @@
+@@ -720,7 +720,7 @@
  
  #define HasVarRun		YES
  #ifndef VarDbDirectory
@@ -221,7 +212,7 @@ diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
  #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
++++ xc/config/cf/site.def	2003-12-23 12:09:12.014238776 +0100
 @@ -119,10 +119,14 @@
  #define HasSentinel	YES
  */
@@ -242,7 +233,7 @@ diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def
  /* 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
++++ xc/config/cf/xf86site.def	2003-12-23 12:09:12.050233304 +0100
 @@ -260,8 +260,8 @@
  /*
   * To not build/install the Cyrillic fonts, uncomment the following
@@ -306,8 +297,8 @@ 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
+--- xc.orig/config/cf/xfree86.cf	2003-11-21 06:55:07.000000000 +0100
++++ xc/config/cf/xfree86.cf	2003-12-23 12:09:12.055232544 +0100
 @@ -128,7 +128,7 @@
  #define XConfigFile		XF86Config
  #endif
@@ -328,7 +319,7 @@ diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
  # 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
++++ xc/config/imake/imake.c	2003-12-23 12:09:12.060231784 +0100
 @@ -1057,6 +1057,7 @@
    static char* suse = "/etc/SuSE-release";
    static char* redhat = "/etc/redhat-release";
@@ -358,9 +349,9 @@ diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c
  
    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 @@
+--- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	2003-12-19 05:48:39.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	2003-12-23 12:09:12.000000000 +0100
+@@ -107,7 +107,7 @@
  
  #if HasNCurses
  CURSESLIB = NCursesLibName
@@ -370,25 +361,24 @@ diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xser
  
  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
+--- xc.orig/programs/xdm/config/Xres.cpp	2003-11-21 07:01:06.000000000 +0100
++++ xc/programs/xdm/config/Xres.cpp	2003-12-23 12:09:12.000000000 +0100
+@@ -71,9 +71,9 @@
+ XHASHendif
  #ifdef XPM
--/**/#if PLANES >= 8
+-XHASHif PLANES >= 8
 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
-+/**/#if PLANES >= 15
++XHASHif PLANES > 8
 +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
++++ xc/programs/xdm/resource.c	2003-12-23 12:09:12.000000000 +0100
 @@ -84,31 +84,31 @@
   */
  #ifndef __EMX__
@@ -439,10 +429,10 @@ diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
  #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))
+--- xc.orig/programs/xinit/Imakefile	2003-11-21 07:01:12.000000000 +0100
++++ xc/programs/xinit/Imakefile	2003-12-23 12:09:12.000000000 +0100
+@@ -46,11 +46,12 @@
+ #endif
  InstallManPage(startx,$(MANDIR))
  
 -#if InstallXinitConfig
@@ -460,8 +450,8 @@ 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
+--- xc.orig/programs/xterm/Imakefile	2003-12-19 05:51:51.000000000 +0100
++++ xc/programs/xterm/Imakefile	2003-12-23 12:11:05.000000000 +0100
 @@ -36,6 +36,10 @@
  #define XkbClientLibs /**/
  #endif
@@ -482,18 +472,18 @@ diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
  #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
      (defined(LinuxArchitecture) && \
       (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
-@@ -115,7 +121,7 @@
-    MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
+@@ -116,7 +122,7 @@
      XKB_DEFINES = XkbClientDefines
     PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
--        DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
-+        DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
-        INCLUDES = $(XRFINCLUDES)
+         DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
+-       INCLUDES = -I. $(XRFINCLUDES)
++       INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
  
  #ifdef OS2Architecture
+         MAINSRC = os2main.c
 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
+--- xc.orig/programs/xterm/xterm.h	2003-12-19 05:51:52.000000000 +0100
++++ xc/programs/xterm/xterm.h	2003-12-23 12:09:12.000000000 +0100
 @@ -73,7 +73,7 @@
  #endif