hurd-i386 updates
Hello,
I've brought the hurd-i386 port of xfree86 back on track. The hurd port
had some 4.1 packages and later on some 4.3.0-0pre1 or something
packages from before the xlibs-split. Both of them were not available on
ftp.debian.org due to extra hacking required.
Initially, I took the xfree86-4.3.0.dfsg.1-4 source package and the
k*BSD patch from
http://glibc-bsd.alioth.debian.org/patches/xfree86_4.3.0.dfsg.1-4.diff I
needed to tweak a couple of .install files to .install.hurd-i386 and fix
a parse error in xc/programs/xterm/xterm_io.h or similar introduced in
the k*BSD patch but that was it. The resulting packages are up at the
ftp.gnuab.org repository and they work well on my Radeon7500 with the
ati driver.
However, the k*BSD patches are pretty big and Robert Millan apparently
wants to get them applied upstream, which seems works quite well. On the
other hand, the hurd-i386 needs updated xfree86 packages on
ftp.debian.org ASAP to continue the development effort. Thus, I've just
updated the 80* series of patches to make xfree86 build and install on
hurd-i386. The attached file xfree86_gnu_patches.diff contains those.
In order to have a clear look at the differences between linux.cf and
gnu.cf, I shuffled gnu.cf around and reformatted some parts, in order to
sync the two and make the diff somewhat easy to read. The main questions
are the following defines, which were missing in gnu.cf (diff from
linux.cf to gnu.cf):
-# define StaticNeedsPicForShared NO
-# define KernelVersionInBanner YES
Should we have those? What is the default for the first? I did not add
them for now.
-# define BuildRenderLibrary NO
-# define HasRenderLibrary YES
-# define BuildXcursorLibrary NO
-# define HasXcursorLibrary YES
-#ifndef HasLibpng
-#define HasLibpng YES
-#ifndef HasGroff
-#define HasGroff YES
As hurd-i386 has those libraries/programs now, I added those.
-# define FontLibSharedFreeType NO
This one causes a build failure even with the current trunk, as
xc/lib/font/libXFont apparently does not get built on Linux and
xc/lib/font/Freetype/fcfuncs.c needs to be updated for current
libfreetype6. I added the #define to gnu.cf as well, is that reasonable?
The addition of the xcursor stuff and the definition of Groff resulted
in a changed MANIFEST.hurd-i386, which I updated.
Those changes are attached in xfree86_hurd-i386.diff. Please tell me
whether the changes are good or whether I should proceed differently. I
tested them against subversion trunk (revision 1623) as well as revision
-6 of 4.3.0.dfsg.1 and they applied (after a bit of fussing around) and
worked (as in built and ran) fine. However, I did no test build on
GNU/Linux, so if you feel this is required let me know. I doubt it
should break something, though.
It would be nice if hurd-i386 could be back on line with the next
upload.
cheers,
Michael
diff -Naur debian.orig/MANIFEST.hurd-i386 debian/MANIFEST.hurd-i386
--- debian.orig/MANIFEST.hurd-i386 2004-07-11 19:38:16.000000000 +0200
+++ debian/MANIFEST.hurd-i386 2004-07-11 19:38:30.000000000 +0200
@@ -505,6 +505,7 @@
usr/X11R6/bin/xclock
usr/X11R6/bin/xcmsdb
usr/X11R6/bin/xconsole
+usr/X11R6/bin/xcursorgen
usr/X11R6/bin/xcutsel
usr/X11R6/bin/xditview
usr/X11R6/bin/xdm
@@ -1193,6 +1194,49 @@
usr/X11R6/lib/X11/doc/evi.txt
usr/X11R6/lib/X11/doc/fontlib.txt
usr/X11R6/lib/X11/doc/fsproto.txt
+usr/X11R6/lib/X11/doc/html/DPMS.html
+usr/X11R6/lib/X11/doc/html/DPMSLib.html
+usr/X11R6/lib/X11/doc/html/ICElib.html
+usr/X11R6/lib/X11/doc/html/LocaleDB.html
+usr/X11R6/lib/X11/doc/html/SMlib.html
+usr/X11R6/lib/X11/doc/html/XIMTransport.html
+usr/X11R6/lib/X11/doc/html/XiLib.html
+usr/X11R6/lib/X11/doc/html/XiPorting.html
+usr/X11R6/lib/X11/doc/html/XiProtocol.html
+usr/X11R6/lib/X11/doc/html/Xtrans.html
+usr/X11R6/lib/X11/doc/html/appgroup.html
+usr/X11R6/lib/X11/doc/html/bdf.html
+usr/X11R6/lib/X11/doc/html/bigreq.html
+usr/X11R6/lib/X11/doc/html/buffer.html
+usr/X11R6/lib/X11/doc/html/ctext.html
+usr/X11R6/lib/X11/doc/html/ctlseqs.html
+usr/X11R6/lib/X11/doc/html/ddx.html
+usr/X11R6/lib/X11/doc/html/evi.html
+usr/X11R6/lib/X11/doc/html/fontlib.html
+usr/X11R6/lib/X11/doc/html/fsproto.html
+usr/X11R6/lib/X11/doc/html/i18nFramework.html
+usr/X11R6/lib/X11/doc/html/icccm.html
+usr/X11R6/lib/X11/doc/html/ice.html
+usr/X11R6/lib/X11/doc/html/intrinsics.html
+usr/X11R6/lib/X11/doc/html/mit-shm.html
+usr/X11R6/lib/X11/doc/html/proto.html
+usr/X11R6/lib/X11/doc/html/record.html
+usr/X11R6/lib/X11/doc/html/recordlib.html
+usr/X11R6/lib/X11/doc/html/rstart.html
+usr/X11R6/lib/X11/doc/html/shape.html
+usr/X11R6/lib/X11/doc/html/shapelib.html
+usr/X11R6/lib/X11/doc/html/tog-cup.html
+usr/X11R6/lib/X11/doc/html/widgets.html
+usr/X11R6/lib/X11/doc/html/xc-misc.html
+usr/X11R6/lib/X11/doc/html/xdmcp.html
+usr/X11R6/lib/X11/doc/html/xfs-design.html
+usr/X11R6/lib/X11/doc/html/xim.html
+usr/X11R6/lib/X11/doc/html/xlfd.html
+usr/X11R6/lib/X11/doc/html/xlib.html
+usr/X11R6/lib/X11/doc/html/xmu.html
+usr/X11R6/lib/X11/doc/html/xsmp.html
+usr/X11R6/lib/X11/doc/html/xtest.html
+usr/X11R6/lib/X11/doc/html/xtestlib.html
usr/X11R6/lib/X11/doc/i18nFramework.txt
usr/X11R6/lib/X11/doc/icccm.txt
usr/X11R6/lib/X11/doc/ice.txt
@@ -5591,6 +5635,131 @@
usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
usr/X11R6/lib/X11/fonts/util/map-KOI8-R
+usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
+usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
+usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
+usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_left_corner
+usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_right_corner
+usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_side
+usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_tee
+usr/X11R6/lib/X11/icons/handhelds/cursors/center_ptr
+usr/X11R6/lib/X11/icons/handhelds/cursors/circle
+usr/X11R6/lib/X11/icons/handhelds/cursors/cross
+usr/X11R6/lib/X11/icons/handhelds/cursors/dot
+usr/X11R6/lib/X11/icons/handhelds/cursors/dotbox
+usr/X11R6/lib/X11/icons/handhelds/cursors/double_arrow
+usr/X11R6/lib/X11/icons/handhelds/cursors/draped_box
+usr/X11R6/lib/X11/icons/handhelds/cursors/fleur
+usr/X11R6/lib/X11/icons/handhelds/cursors/gumby
+usr/X11R6/lib/X11/icons/handhelds/cursors/hand2
+usr/X11R6/lib/X11/icons/handhelds/cursors/left_ptr
+usr/X11R6/lib/X11/icons/handhelds/cursors/left_ptr_watch
+usr/X11R6/lib/X11/icons/handhelds/cursors/left_side
+usr/X11R6/lib/X11/icons/handhelds/cursors/left_tee
+usr/X11R6/lib/X11/icons/handhelds/cursors/ll_angle
+usr/X11R6/lib/X11/icons/handhelds/cursors/pencil
+usr/X11R6/lib/X11/icons/handhelds/cursors/right_ptr
+usr/X11R6/lib/X11/icons/handhelds/cursors/right_side
+usr/X11R6/lib/X11/icons/handhelds/cursors/right_tee
+usr/X11R6/lib/X11/icons/handhelds/cursors/sb_h_double_arrow
+usr/X11R6/lib/X11/icons/handhelds/cursors/sb_right_arrow
+usr/X11R6/lib/X11/icons/handhelds/cursors/sb_up_arrow
+usr/X11R6/lib/X11/icons/handhelds/cursors/sb_v_double_arrow
+usr/X11R6/lib/X11/icons/handhelds/cursors/shuttle
+usr/X11R6/lib/X11/icons/handhelds/cursors/top_left_corner
+usr/X11R6/lib/X11/icons/handhelds/cursors/top_right_corner
+usr/X11R6/lib/X11/icons/handhelds/cursors/top_side
+usr/X11R6/lib/X11/icons/handhelds/cursors/top_tee
+usr/X11R6/lib/X11/icons/handhelds/cursors/watch
+usr/X11R6/lib/X11/icons/handhelds/cursors/xterm
+usr/X11R6/lib/X11/icons/redglass/cursors/X_cursor
+usr/X11R6/lib/X11/icons/redglass/cursors/based_arrow_down
+usr/X11R6/lib/X11/icons/redglass/cursors/based_arrow_up
+usr/X11R6/lib/X11/icons/redglass/cursors/bottom_left_corner
+usr/X11R6/lib/X11/icons/redglass/cursors/bottom_right_corner
+usr/X11R6/lib/X11/icons/redglass/cursors/bottom_side
+usr/X11R6/lib/X11/icons/redglass/cursors/bottom_tee
+usr/X11R6/lib/X11/icons/redglass/cursors/center_ptr
+usr/X11R6/lib/X11/icons/redglass/cursors/circle
+usr/X11R6/lib/X11/icons/redglass/cursors/cross
+usr/X11R6/lib/X11/icons/redglass/cursors/dot
+usr/X11R6/lib/X11/icons/redglass/cursors/dotbox
+usr/X11R6/lib/X11/icons/redglass/cursors/double_arrow
+usr/X11R6/lib/X11/icons/redglass/cursors/draped_box
+usr/X11R6/lib/X11/icons/redglass/cursors/fleur
+usr/X11R6/lib/X11/icons/redglass/cursors/gumby
+usr/X11R6/lib/X11/icons/redglass/cursors/hand2
+usr/X11R6/lib/X11/icons/redglass/cursors/left_ptr
+usr/X11R6/lib/X11/icons/redglass/cursors/left_ptr_watch
+usr/X11R6/lib/X11/icons/redglass/cursors/left_side
+usr/X11R6/lib/X11/icons/redglass/cursors/left_tee
+usr/X11R6/lib/X11/icons/redglass/cursors/ll_angle
+usr/X11R6/lib/X11/icons/redglass/cursors/pencil
+usr/X11R6/lib/X11/icons/redglass/cursors/right_ptr
+usr/X11R6/lib/X11/icons/redglass/cursors/right_side
+usr/X11R6/lib/X11/icons/redglass/cursors/right_tee
+usr/X11R6/lib/X11/icons/redglass/cursors/sb_h_double_arrow
+usr/X11R6/lib/X11/icons/redglass/cursors/sb_right_arrow
+usr/X11R6/lib/X11/icons/redglass/cursors/sb_up_arrow
+usr/X11R6/lib/X11/icons/redglass/cursors/sb_v_double_arrow
+usr/X11R6/lib/X11/icons/redglass/cursors/shuttle
+usr/X11R6/lib/X11/icons/redglass/cursors/top_left_corner
+usr/X11R6/lib/X11/icons/redglass/cursors/top_right_corner
+usr/X11R6/lib/X11/icons/redglass/cursors/top_side
+usr/X11R6/lib/X11/icons/redglass/cursors/top_tee
+usr/X11R6/lib/X11/icons/redglass/cursors/watch
+usr/X11R6/lib/X11/icons/redglass/cursors/xterm
+usr/X11R6/lib/X11/icons/whiteglass/cursors/X_cursor
+usr/X11R6/lib/X11/icons/whiteglass/cursors/base_arrow_down
+usr/X11R6/lib/X11/icons/whiteglass/cursors/base_arrow_up
+usr/X11R6/lib/X11/icons/whiteglass/cursors/boat
+usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_left_corner
+usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_right_corner
+usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_side
+usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_tee
+usr/X11R6/lib/X11/icons/whiteglass/cursors/center_ptr
+usr/X11R6/lib/X11/icons/whiteglass/cursors/circle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/cross
+usr/X11R6/lib/X11/icons/whiteglass/cursors/dot
+usr/X11R6/lib/X11/icons/whiteglass/cursors/dot_box_mask
+usr/X11R6/lib/X11/icons/whiteglass/cursors/double_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/draped_box
+usr/X11R6/lib/X11/icons/whiteglass/cursors/exchange
+usr/X11R6/lib/X11/icons/whiteglass/cursors/fleur
+usr/X11R6/lib/X11/icons/whiteglass/cursors/gumby
+usr/X11R6/lib/X11/icons/whiteglass/cursors/hand1
+usr/X11R6/lib/X11/icons/whiteglass/cursors/hand2
+usr/X11R6/lib/X11/icons/whiteglass/cursors/left_ptr
+usr/X11R6/lib/X11/icons/whiteglass/cursors/left_ptr_watch
+usr/X11R6/lib/X11/icons/whiteglass/cursors/left_side
+usr/X11R6/lib/X11/icons/whiteglass/cursors/left_tee
+usr/X11R6/lib/X11/icons/whiteglass/cursors/ll_angle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/lr_angle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/pencil
+usr/X11R6/lib/X11/icons/whiteglass/cursors/pirate
+usr/X11R6/lib/X11/icons/whiteglass/cursors/question_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/right_ptr
+usr/X11R6/lib/X11/icons/whiteglass/cursors/right_side
+usr/X11R6/lib/X11/icons/whiteglass/cursors/right_tee
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sailboat
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_down_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_h_double_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_left_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_right_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_up_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sb_v_double_arrow
+usr/X11R6/lib/X11/icons/whiteglass/cursors/shuttle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/sizing
+usr/X11R6/lib/X11/icons/whiteglass/cursors/target
+usr/X11R6/lib/X11/icons/whiteglass/cursors/top_left_corner
+usr/X11R6/lib/X11/icons/whiteglass/cursors/top_right_corner
+usr/X11R6/lib/X11/icons/whiteglass/cursors/top_side
+usr/X11R6/lib/X11/icons/whiteglass/cursors/top_tee
+usr/X11R6/lib/X11/icons/whiteglass/cursors/trek
+usr/X11R6/lib/X11/icons/whiteglass/cursors/ul_angle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/ur_angle
+usr/X11R6/lib/X11/icons/whiteglass/cursors/watch
+usr/X11R6/lib/X11/icons/whiteglass/cursors/xterm
usr/X11R6/lib/X11/locale/C/XI18N_OBJS
usr/X11R6/lib/X11/locale/C/XLC_LOCALE
usr/X11R6/lib/X11/locale/armscii-8/Compose
@@ -6038,6 +6207,7 @@
usr/X11R6/man/man1/xclock.1x
usr/X11R6/man/man1/xcmsdb.1x
usr/X11R6/man/man1/xconsole.1x
+usr/X11R6/man/man1/xcursorgen.1x
usr/X11R6/man/man1/xcutsel.1x
usr/X11R6/man/man1/xditview.1x
usr/X11R6/man/man1/xdm.1x
diff -Naur debian.orig/patches/800_gnu_config.diff debian/patches/800_gnu_config.diff
--- debian.orig/patches/800_gnu_config.diff 2004-07-11 19:38:16.000000000 +0200
+++ debian/patches/800_gnu_config.diff 2004-07-11 19:38:38.000000000 +0200
@@ -8,81 +8,311 @@
Robert Millan <zeratul2@wanadoo.es> and
Daniel Stone <dstone@trinity.unimelb.edu.au>.
---- xc/config/cf/gnu.cf.orig Fri Aug 24 04:16:54 2001
-+++ xc/config/cf/gnu.cf Sun Apr 13 11:19:47 2003
-@@ -18,6 +18,75 @@
- #endif
- XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-+#define HasPam YES
-+#define PamLibraries -lpam -rdynamic -ldl
-+#define XFree86Devel YES
-+#define SystemManDirectory /usr/share/man
-+#define HasTk YES
-+#define TkLibDir /usr/lib
-+#define TkIncDir /usr/include
-+#define TkLibName tk8.3
-+#define XF86SetupUsesStaticTk NO
-+#define HasTcl YES
-+#define TclLibDir /usr/lib
-+#define TclIncDir /usr/include
-+#define TclLibName tcl8.3
-+#define XF86SetupUsesStaticTcl NO
-+#define InstallXinitConfig YES
-+#define InstallXdmConfig YES
-+#define InstallFSConfig YES
-+#define HasXdmAuth YES
-+#define DebuggableLibraries YES
-+#define ForceNormalLib YES
-+#define BuildSpecsDocs YES
-+#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
-+#define BuildAllSpecsDocs YES
-+#define HasLatex YES
-+/* We build-dep on expat, fontconfig, freetype and Xft. */
-+#define BuildFreetype2Library NO
-+#define HasFreetype2 YES
-+#define Freetype2Dir /usr
-+#define BuildExpatLibrary NO
-+#define HasExpat YES
-+#define ExpatIncDirStandard YES
-+#define BuildFontconfigLibrary NO
-+#define HasFontconfig YES
-+#define UseFontconfig YES
-+#define FontconfigIncDir /usr/include/fontconfig
-+#define BuildXftLibrary NO
-+#define XAppLoadDir EtcX11Directory/app-defaults
-+#define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
+diff -ruN xc-old/config/cf/gnu.cf xc/config/cf/gnu.cf
+--- xc-old/config/cf/gnu.cf 2004-07-11 19:21:19.000000000 +0200
++++ xc/config/cf/gnu.cf 2004-07-11 19:23:24.000000000 +0200
+@@ -1,45 +1,152 @@
+ XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.11 2001/02/28 18:58:49 dawes Exp $
+
+ #ifndef OSName
+-#define OSName DefaultOSName
++# define OSName DefaultOSName
+ #endif
+
+ #ifndef OSVendor
+-#define OSVendor /**/
++# define OSVendor /**/
+ #endif
+ #ifndef OSMajorVersion
+-#define OSMajorVersion DefaultOSMajorVersion
++# define OSMajorVersion DefaultOSMajorVersion
+ #endif
+ #ifndef OSMinorVersion
+-#define OSMinorVersion DefaultOSMinorVersion
++# define OSMinorVersion DefaultOSMinorVersion
+ #endif
+ #ifndef OSTeenyVersion
+-#define OSTeenyVersion DefaultOSTeenyVersion
++# define OSTeenyVersion DefaultOSTeenyVersion
+ #endif
+-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+-
+-#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
+- -D_POSIX_SOURCE -D_XOPEN_SOURCE \
+- -D_BSD_SOURCE -D_SVID_SOURCE
+
++XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
++# define SystemManDirectory /usr/share/man
++# define HasPam YES
++# define HasTk YES
++# define TkLibDir /usr/lib
++# define TkIncDir /usr/include
++# define TkLibName tk8.3
++# define XF86SetupUsesStaticTk NO
++# define HasTcl YES
++# define TclLibDir /usr/lib
++# define TclIncDir /usr/include
++# define TclLibName tcl8.3
++# define XF86SetupUsesStaticTcl NO
++# define XAppLoadDir EtcX11Directory/app-defaults
++# define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
++# define InstallAppDefFiles YES
+/* the relative symlink created by this rule causes problems for us */
-+#if InstallAppDefFiles
-+# define InstallAppDefaultsLong(file,class) @@\
++# ifdef InstallAppDefFiles
++# if InstallAppDefFiles
++# define InstallAppDefaultsLong(file,class) @@\
+InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-+#else
-+# define InstallAppDefaultsLong(file,class) @@\
++# else
++# define InstallAppDefaultsLong(file,class) @@\
+InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-+#endif /* InstallAppDefFiles */
-+#ifndef BuilderEMailAddr
-+# define BuilderEMailAddr "submit@bugs.debian.org"
++# endif
++# endif /* InstallAppDefFiles */
++# define SharedLibXdmGreet NO
++# define LinkGLToUsrInclude NO
++# define LinkGLToUsrLib NO
++# define SharedLibFont NO
++# define HasZlib YES
++# define SharedLibGlu YES
++# define NormalLibGlu YES
++# define FSUseSyslog YES
++
++# define DebianMaintainer YES
++
++# ifdef DebianMaintainer
++# ifndef XFree86CustomVersion
++# define XFree86CustomVersion "Debian"
++# endif
++# ifndef BuilderEMailAddr
++# define BuilderEMailAddr "debian-x@lists.debian.org"
++# endif
++# define XFree86Devel YES
++# define BuildAllSpecsDocs YES
++# define InstallXinitConfig YES
++# define InstallXdmConfig YES
++# define InstallFSConfig YES
++# define DebuggableLibraries YES
++# define ForceNormalLib YES
++# define BuildSpecsDocs YES
++# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
++# define BuildRman NO
++# define BuildHtmlManPages NO
++# define ProjectManSuffix x
++/* The TT/Meltho fonts are all under non-free licenses. */
++# define BuildTrueTypeFonts NO
++# define BuildBethMarduthoFonts NO
++/*
++ * The XFree86 Debian package build-depends on external Expat, Fontconfig,
++ * Freetype, Render, Xcursor, and Xft libraries.
++ */
++# define BuildExpatLibrary NO
++# define HasExpat YES
++# define ExpatIncDirStandard YES
++# define BuildFontconfigLibrary NO
++# define HasFontconfig YES
++# define UseFontconfig YES
++# define FontconfigIncDir /usr/include/fontconfig
++# define BuildFreetype2Library NO
++# define HasFreetype2 YES
++# define BuildRenderLibrary NO
++# define HasRenderLibrary YES
++# define BuildXcursorLibrary NO
++# define HasXcursorLibrary YES
++/* Xlib needs to know the available version of Xcursor. */
++# define SharedXcursorRev 1
++# define IconDir Concat(ProjectRoot,/lib/X11/icons)
++# define BuildXftLibrary NO
++# define HasXftLibrary YES
++
++# ifdef UseInstalled
++# define RenderLibraryDir /usr/X11R6
++# define XftLibraryDir /usr/X11R6
++# define XcursorLibraryDir /usr
++# else
++/* for Debian xfree86 build hack */
++# define RenderLibraryDir $(TOP)/../../debian/local/exports
++# define XftLibraryDir $(TOP)/../../debian/local/exports
++# define XcursorLibraryDir $(TOP)/../../debian/local/exports
++# endif
++
++/*
++ * We want to be sure that the normal XFree86 X server and the debugging X
++ * server use the same FreeType2 library. We'd *like* it if we could
++ * achieve this by both packages dynamically linking against the system's
++ * FreeType2 library; however, the normal X server package
++ * (xserver-xfree86) *cannot* be built dynamically linked against the
++ * FreeType2 library when the module loader is enabled because of
++ * code/design issues. Therefore, we encapsulate XFree86's internal "fork"
++ * of the FreeType2 library into *both* xserver-xfree86 and
++ * xserver-xfree86-dbg. When it becomes possible to build the
++ * module-loading server against an external FreeType2 shared library, we
++ * can drop this define:
++ */
++# define FontLibSharedFreeType NO
++
++# define HasXdmAuth YES
++# define HasLatex YES
++# endif /* DebianMaintainer */
++
++# define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
++ -D_POSIX_SOURCE -D_XOPEN_SOURCE \
++ -D_BSD_SOURCE -D_SVID_SOURCE
+ XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
+-
+-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+-
++# define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+ XCOMM Enable this when we have pthreads.
+ XCOMM #define HasPosixThreads YES
+ XCOMM #define ThreadedX YES
+ XCOMM #define HasThreadSafeAPI YES
+ XCOMM #define ThreadsLibraries -lpthread
+ XCOMM #define SystemMTDefines -D_REENTRANT
+-
+-#define HasDevRandom YES
+-#define PollDevRandom YES
+-
+-#ifndef HasLibCrypt
+-#define HasLibCrypt YES
+-#endif
+-
++# ifndef HasLibCrypt
++# define HasLibCrypt YES
++# endif
++
++/*
++ * The Rush extension support.
++ */
+ #ifndef BuildXF86RushExt
+ # define BuildXF86RushExt YES
+ #endif
+@@ -48,16 +155,13 @@
+ #define GccUsesGas YES
+ #define UseGas YES
+ #define GnuCpp YES
+-#define HasDlopen YES
++# define HasDlopen YES
+ #ifndef HasShadowPasswd
+ # define HasShadowPasswd YES
+ #endif
+ #define HasPutenv YES
+-
+ XCOMM Not implemented and will always fail.
+ #define HasShm YES
+-
+-#define HasBSD44Sockets YES
+ #define HasSockets YES
+ #define HasSnprintf YES
+ #define HasMkstemp YES
+@@ -66,6 +170,17 @@
+ #define HasNCurses YES
+ #endif
+
++#ifndef HasGroff
++#define HasGroff YES
+#endif
-+#define SharedLibXdmGreet NO
-+#define LinkGLToUsrInclude NO
-+#define LinkGLToUsrLib NO
-+#define SharedLibFont NO
-+#define HasZlib YES
-+#define SharedLibGlu YES
-+#define NormalLibGlu YES
-+#define BuildRman NO
-+#define BuildHtmlManPages NO
-+#define FSUseSyslog YES
-+#ifndef HasKatmaiSupport
-+# define HasKatmaiSupport NO
++
++#ifndef HasLibpng
++#define HasLibpng YES
+#endif
-+#define ProjectManSuffix x
-+#define IconDir Concat(ProjectRoot,/lib/X11/icons)
+
-+/* The TT/Meltho fonts are all under non-free licenses. */
-+# define BuildTrueTypeFonts NO
-+# define BuildBethMarduthoFonts NO
++#define HasDevRandom YES
++#define PollDevRandom YES
++
+ #define AvoidNullMakeCommand YES
+ #ifndef DebuggableLibraries
+ #define DebuggableLibraries NO
+@@ -86,6 +201,8 @@
+ #endif
+
+ #define MkdirHierCmd mkdir -p
+
- #define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
- -D_POSIX_SOURCE -D_XOPEN_SOURCE \
- -D_BSD_SOURCE -D_SVID_SOURCE
++#define HasBSD44Sockets YES
+ #ifndef CcCmd
+ #define CcCmd gcc
+ #endif
+@@ -105,11 +222,12 @@
+ #define TermcapLibrary -lncurses
+ #endif
+ #endif
+-#ifndef DoLoadableServer
+-#define DoLoadableServer YES
++
++# ifndef DoLoadableServer
++# define DoLoadableServer YES
+ #endif
+-#ifndef
+-#define CppCmd /lib/cpp
++#ifndef CppCmd
++# define CppCmd /usr/bin/cpp
+ #endif
+ #define YaccCmd bison -y
+ #define LexCmd flex -l
+@@ -119,41 +237,54 @@
+ #define PostIncDir DefaultGccIncludeDir
+ #define LdCombineFlags -r
+ #ifndef LdPostLib
+-#define LdPostLib /* Never needed */
++# define LdPostLib /* Never needed */
+ #endif
+ #define HasWChar32 YES
+ #define StandardCppOptions -traditional
+ #define StandardCppDefines StandardDefines
+
+ #define HasVarRun YES
+-#define VarDbDirectory $(VARDIR)/lib
++#ifndef VarDbDirectory
++# define VarDbDirectory $(VARDIR)/lib
++#endif
+
+ XCOMM i386Architecture
+-#define OptimizedCDebugFlags DefaultGcc2i386Opt
+-#define GNUMachineDefines -D__i386__
+-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
+-#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+-#define HasPlugin YES
+-#define VendorHasX11R6_3libXext YES
++# ifndef OptimizedCDebugFlags
++# define OptimizedCDebugFlags DefaultGcc2i386Opt
++# endif
++# define GNUMachineDefines -D__i386__
++# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
++
++# define HasPlugin YES
++# define VendorHasX11R6_3libXext YES
+
+ #ifndef StandardDefines
+-#define StandardDefines -D__GNU__ GNUMachineDefines GNUSourceDefines
++# define StandardDefines -D__GNU__ GNUMachineDefines GNUSourceDefines
+ #endif
+
+-#define DlLibrary -rdynamic -ldl
++# define DlLibrary -rdynamic -ldl
+
+ #define ServerExtraSysLibs /**/
+
+-#define ConnectionFlags -DUNIXCONN -DTCPCONN
++#ifndef PamLibraries
++#define PamLibraries -lpam DlLibrary
++#endif
++
++#ifndef PamMiscLibraries
++#define PamMiscLibraries -lpam_misc
++#endif
++
++# define ConnectionFlags -DUNIXCONN -DTCPCONN
+
+ #ifndef StaticLibrary
+-#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
++# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
+ #endif
+
+-#define HasGnuMake YES
++#define HasGnuMake YES
+
+ #define MakeNamedTargetSubdir(dir,flags,subname)\
+- $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
++ $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
+
+ #define ArchitectureDefines -DGNU_ARCHITECTURE
+
diff -Naur debian.orig/patches/803_gnu_xterm_openpty.diff debian/patches/803_gnu_xterm_openpty.diff
--- debian.orig/patches/803_gnu_xterm_openpty.diff 1970-01-01 01:00:00.000000000 +0100
+++ debian/patches/803_gnu_xterm_openpty.diff 2004-07-11 19:38:38.000000000 +0200
@@ -0,0 +1,13 @@
+
+ on Glibc-based systems, openpty needs -lutil
+
+--- xc/programs/xterm/Imakefile~ 2004-03-15 01:22:17.000000000 +0100
++++ xc/programs/xterm/Imakefile 2004-03-15 02:01:31.000000000 +0100
+@@ -58,6 +58,7 @@
+ #endif
+
+ #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
++ defined(GNUArchitecture) || \
+ (defined(LinuxArchitecture) && \
+ (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
+ PTYLIB = -lutil
diff -Naur debian.orig/patches/804_gnu_xdm.diff debian/patches/804_gnu_xdm.diff
--- debian.orig/patches/804_gnu_xdm.diff 1970-01-01 01:00:00.000000000 +0100
+++ debian/patches/804_gnu_xdm.diff 2004-07-11 19:38:38.000000000 +0200
@@ -0,0 +1,92 @@
+
+ merged upstream (4.4)
+
+diff -ur xc/programs/xdm.old/chooser.c xc/programs/xdm/chooser.c
+--- xc/programs/xdm.old/chooser.c 2003-11-29 16:07:50.000000000 +0100
++++ xc/programs/xdm/chooser.c 2003-11-29 16:11:30.000000000 +0100
+@@ -130,9 +130,7 @@
+ # include <sync/queue.h>
+ # include <sync/sema.h>
+ #endif
+-#ifndef __GNU__
+-# include <net/if.h>
+-#endif /* __GNU__ */
++#include <net/if.h>
+ #endif /* hpux */
+
+ #include <netdb.h>
+@@ -550,8 +548,6 @@
+ * addresses on the local host.
+ */
+
+-#if !defined(__GNU__)
+-
+ /* Handle variable length ifreq in BNR2 and later */
+ #ifdef VARIABLE_IFREQ
+ #define ifr_size(p) (sizeof (struct ifreq) + \
+@@ -712,53 +708,6 @@
+ QUERY);
+ }
+ }
+-#else /* __GNU__ */
+-static void
+-RegisterHostname (char *name)
+-{
+- struct hostent *hostent;
+- struct sockaddr_in in_addr;
+-
+- if (!strcmp (name, BROADCAST_HOSTNAME))
+- {
+- in_addr.sin_addr.s_addr= htonl(0xFFFFFFFF);
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- BROADCAST_QUERY);
+- }
+- else
+- {
+-
+- /* address as hex string, e.g., "12180022" (deprecated) */
+- if (strlen(name) == 8 &&
+- FromHex(name, (char *)&in_addr.sin_addr, strlen(name)) == 0)
+- {
+- in_addr.sin_family = AF_INET;
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- QUERY);
+- } else {
+- /* Per RFC 1123, check first for IP address in dotted-decimal form */
+- else if ((in_addr.sin_addr.s_addr = inet_addr(name)) != -1)
+- in_addr.sin_family = AF_INET;
+- else
+- {
+- hostent = gethostbyname (name);
+- if (!hostent)
+- return;
+- if (hostent->h_addrtype != AF_INET || hostent->h_length != 4)
+- return;
+- in_addr.sin_family = hostent->h_addrtype;
+- memmove( &in_addr.sin_addr, hostent->h_addr, 4);
+- }
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- QUERY);
+- }
+-
+- }
+-}
+-#endif /* __GNU__ */
+
+ static ARRAYofARRAY8 AuthenticationNames;
+
+diff -ur xc/programs/xdm.old/config/Imakefile xc/programs/xdm/config/Imakefile
+--- xc/programs/xdm.old/config/Imakefile 2003-11-29 16:07:56.000000000 +0100
++++ xc/programs/xdm/config/Imakefile 2003-11-29 16:09:08.000000000 +0100
+@@ -9,7 +9,7 @@
+
+ all:: Xservers.ws xdm-config Xservers Xresources
+
+-#if defined(i386Architecture) && (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture))
++#if defined(i386Architecture) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture))
+ DEFAULTVT=vt05
+ #endif
+
Reply to: