Author: branden
Date: 2003-05-26 23:47:32 -0500 (Mon, 26 May 2003)
New Revision: 80
Added:
trunk/patches/001a_damn_cpp_3.3_to_hell.diff
Modified:
trunk/changelog
trunk/control
trunk/patches/077_man_dir_and_suffix_cleanup.diff
trunk/patches/085_bigass_imake_manpage_handling_overhaul.diff
trunk/patches/100_sparc_pci_domains.diff
trunk/patches/900_debian_config.diff
Log:
New patch: #define CppCmd as "cpp-3.2" in gnu.cf; same for linux.cf when
using a Debian system, since cpp-3.3 doesn't produce correct output (as
far as XFree86 is concerned) when the "-traditional" flag is used
("-traditional-cpp" doesn't work, either).
Fix offsets to later patches to {gnu,linux}.cf.
xfree86 now build-depends on cpp-3.2.
xbase-clients and xdm now depend on cpp-3.2 instead of just cpp.
Added: trunk/patches/001a_damn_cpp_3.3_to_hell.diff
==============================================================================
--- trunk/patches/001a_damn_cpp_3.3_to_hell.diff 2003-05-26 21:29:48 UTC
(rev 79)
+++ trunk/patches/001a_damn_cpp_3.3_to_hell.diff 2003-05-27 04:47:32 UTC
(rev 80)
@@ -0,0 +1,30 @@
+GNU CPP 3.3 doesn't handle the -traditional flag correctly. This causes
+bustication of xdm, xrdb, and probably manpage generation as well.
+
+This patch by Branden Robinson. Not submitted upstream. A temporary fix;
+stuff using cpp in the tree probably needs to be "ported" to work when
+-traditional is not set, if possible.
+
+--- xc/config/cf/gnu.cf~ 2003-05-26 23:27:33.000000000 -0500
++++ xc/config/cf/gnu.cf 2003-05-26 23:29:16.000000000 -0500
+@@ -105,9 +105,7 @@
+ #ifndef DoLoadableServer
+ #define DoLoadableServer YES
+ #endif
+-#ifndef
+-#define CppCmd /lib/cpp
+-#endif
++#define CppCmd cpp-3.2
+ #define YaccCmd bison -y
+ #define LexCmd flex -l
+ #define HasFlex YES
+--- xc/config/cf/linux.cf~ 2003-05-26 23:27:37.000000000 -0500
++++ xc/config/cf/linux.cf 2003-05-26 23:28:51.000000000 -0500
+@@ -94,6 +94,7 @@
+ # define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt
+ # define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt
+ # define SystemManDirectory /usr/share/man
++# define CppCmd cpp-3.2
+ # define HasPam YES
+ # define HasTk YES
+ # define TkLibDir /usr/lib
Modified: trunk/patches/900_debian_config.diff
==============================================================================
--- trunk/patches/900_debian_config.diff 2003-05-26 21:29:48 UTC (rev 79)
+++ trunk/patches/900_debian_config.diff 2003-05-27 04:47:32 UTC (rev 80)
@@ -1,6 +1,6 @@
--- xc/config/cf/linux.cf.orig 2002-09-07 03:43:34.000000000 -0500
+++ xc/config/cf/linux.cf 2002-09-07 03:43:35.000000000 -0500
-@@ -128,9 +128,9 @@
+@@ -129,9 +129,9 @@
/*
*
Modified: trunk/patches/100_sparc_pci_domains.diff
==============================================================================
--- trunk/patches/100_sparc_pci_domains.diff 2003-05-26 21:29:48 UTC (rev 79)
+++ trunk/patches/100_sparc_pci_domains.diff 2003-05-27 04:47:32 UTC (rev 80)
@@ -2,7 +2,7 @@
--- xc/config/cf/linux.cf.orig 2002-09-07 03:43:34.000000000 -0500
+++ xc/config/cf/linux.cf 2002-09-07 03:43:35.000000000 -0500
-@@ -773,7 +773,7 @@
+@@ -774,7 +774,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
Modified: trunk/patches/085_bigass_imake_manpage_handling_overhaul.diff
==============================================================================
--- trunk/patches/085_bigass_imake_manpage_handling_overhaul.diff
2003-05-26 21:29:48 UTC (rev 79)
+++ trunk/patches/085_bigass_imake_manpage_handling_overhaul.diff
2003-05-27 04:47:32 UTC (rev 80)
@@ -327,7 +327,7 @@
diff -urN xc/config/cf~/gnu.cf xc/config/cf/gnu.cf
--- xc/config/cf~/gnu.cf 2002-09-13 02:34:46.000000000 -0500
+++ xc/config/cf/gnu.cf 2002-09-13 02:37:41.000000000 -0500
-@@ -143,38 +143,6 @@
+@@ -141,38 +141,6 @@
#define ConnectionFlags -DUNIXCONN -DTCPCONN
@@ -369,7 +369,7 @@
diff -urN xc/config/cf~/linux.cf xc/config/cf/linux.cf
--- xc/config/cf~/linux.cf 2002-09-13 02:34:46.000000000 -0500
+++ xc/config/cf/linux.cf 2002-09-13 02:31:45.000000000 -0500
-@@ -152,6 +152,7 @@
+@@ -153,6 +153,7 @@
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n
xterm
# define BuildRman NO
# define BuildHtmlManPages NO
@@ -377,7 +377,7 @@
/* we build-depend on libfreetype6-dev (FreeType 2.x) */
# define BuildFreetype2Library NO
-@@ -833,38 +834,6 @@
+@@ -834,38 +835,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
Modified: trunk/patches/077_man_dir_and_suffix_cleanup.diff
==============================================================================
--- trunk/patches/077_man_dir_and_suffix_cleanup.diff 2003-05-26 21:29:48 UTC
(rev 79)
+++ trunk/patches/077_man_dir_and_suffix_cleanup.diff 2003-05-27 04:47:32 UTC
(rev 80)
@@ -90,7 +90,7 @@
diff -urN xc/config/cf~/gnu.cf xc/config/cf/gnu.cf
--- xc/config/cf~/gnu.cf 2002-08-17 22:48:28.000000000 -0500
+++ xc/config/cf/gnu.cf 2002-08-17 23:03:07.000000000 -0500
-@@ -153,8 +153,14 @@
+@@ -151,8 +151,14 @@
#ifndef LibManSuffix
# define LibManSuffix 3x
#endif
@@ -107,7 +107,7 @@
#endif
#ifndef FileManSuffix
# define FileManSuffix 5x
-@@ -162,6 +168,12 @@
+@@ -160,6 +166,12 @@
#ifndef FileManDir
# define FileManDir $(MANSOURCEPATH)5
#endif
@@ -122,7 +122,7 @@
#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath)
Concat(-l,libname) -Wl,-Bdynamic
--- xc/config/cf/linux.cf.orig 2002-09-07 03:40:05.000000000 -0500
+++ xc/config/cf/linux.cf 2002-09-07 03:40:07.000000000 -0500
-@@ -843,8 +843,14 @@
+@@ -844,8 +844,14 @@
#ifndef LibManSuffix
# define LibManSuffix 3x
#endif
@@ -139,7 +139,7 @@
#endif
#ifndef FileManSuffix
# define FileManSuffix 5x
-@@ -852,6 +858,12 @@
+@@ -853,6 +859,12 @@
#ifndef FileManDir
# define FileManDir $(MANSOURCEPATH)5
#endif
Modified: trunk/changelog
==============================================================================
--- trunk/changelog 2003-05-26 21:29:48 UTC (rev 79)
+++ trunk/changelog 2003-05-27 04:47:32 UTC (rev 80)
@@ -72,6 +72,8 @@
because of a broken string comparison in xttconv.c (#A.1647, Chisato
Yamauchi, Daisuke MASATSUNA). (Closes: #182835)
+ * patch #001a: #define CppCmd as "cpp-3.2" in gnu.cf; same for linux.cf when
+ using a Debian system
* patch #024,451: resynced with #000_stolen_from_HEAD_ati_driver
* patch #032: uh, actually define a ComplexCplusplusProgramTargetNoMan()
rule, instead of redefining ComplexCplusplusProgramTarget() (thanks, Colin
@@ -105,6 +107,10 @@
- bump Standards-Version from 3.5.7 to 3.5.10 (no changes required)
- Build-Depend on flex-old instead of flex, since flex recently broke
backwards compatibility (fixes FTBFS on any box with a recent flex)
+ - Build-Depend on cpp-3.2; xbase-clients and xdm now Depend on cpp-3.2
+ instead of just cpp, since cpp-3.3 doesn't produce correct output (as
+ far as XFree86 is concerned) when the "-traditional" flag is used
+ ("-traditional-cpp" doesn't work, either).
- minor tweak to xserver-xfree86's extended description
* debian/local/FAQ:
- removed reference to XFree86 FAQ; in the words of upstream
@@ -186,7 +192,7 @@
xserver-xfree86/config/device/driver from "atimisc", "r128", or "radeon"
to "ati"
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 26 May 2003 15:09:34 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 26 May 2003 23:44:49 -0500
xfree86 (4.2.1-6) unstable; urgency=medium
Modified: trunk/control
==============================================================================
--- trunk/control 2003-05-26 21:29:48 UTC (rev 79)
+++ trunk/control 2003-05-27 04:47:32 UTC (rev 80)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Branden Robinson <[EMAIL PROTECTED]>
Standards-Version: 3.5.10
-Build-Depends: dpkg (>= 1.7.0), flex-old, bison, bsdmainutils, groff,
zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev |
libpam-dev, libfreetype6-dev, libpaperg, libstdc++5-dev, tetex-bin, po-debconf,
debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386],
libglide3-dev (>> 2001.01.26) [i386], libglide3-alpha-dev [alpha],
kernel-headers-2.4 | hurd | freebsd | netbsd | openbsd
+Build-Depends: dpkg (>= 1.7.0), cpp-3.2, flex-old, bison, bsdmainutils, groff,
zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev |
libpam-dev, libfreetype6-dev, libpaperg, libstdc++5-dev, tetex-bin, po-debconf,
debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386],
libglide3-dev (>> 2001.01.26) [i386], libglide3-alpha-dev [alpha],
kernel-headers-2.4 | hurd | freebsd | netbsd | openbsd
Package: lbxproxy
Architecture: any
@@ -181,7 +181,7 @@
Package: xbase-clients
Architecture: any
-Depends: cpp, ${shlibs:Depends}, ${misc:Depends}
+Depends: cpp-3.2, ${shlibs:Depends}, ${misc:Depends}
Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap,
xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<<
3.3.3.1-3), xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3),
xfonts-scalable (<< 3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<=
3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), xfntcyr (<= 3.3.2.3a-1), xfntscl (<=
3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, xpm4g-dev, xpm-bin
Replaces: xbase (<< 3.3.2.3a-2), xf86setup (<< 3.3.2.3a-9), xserver-common (<<
4.0), xmodmap, xcontrib, xpm4g-dev, xpm-bin, xsm
Provides: xmodmap, xcontrib, xpm-bin, xsm
@@ -272,7 +272,7 @@
Package: xdm
Architecture: any
-Depends: debconf (>= 1.2.9), xbase-clients, cpp, ${shlibs:Depends},
${misc:Depends}
+Depends: debconf (>= 1.2.9), xbase-clients, cpp-3.2, ${shlibs:Depends},
${misc:Depends}
Suggests: xutils
Replaces: xbase (<< 3.3.2.3a-2), xbase-clients (<< 4.0)
Provides: x-display-manager
