Package: xorg-x11 Version: 6.9.0.dfsg.1-1 Severity: important Tags: patch Hi,
attached is a patch which forward-ports #800, #806 and #900. cheers, Michael -- Michael Banck Debian Developer [EMAIL PROTECTED] http://www.advogato.org/person/mbanck/diary.html
Index: patches/debian/900_debian_config.diff =================================================================== --- patches/debian/900_debian_config.diff (revision 979) +++ patches/debian/900_debian_config.diff (working copy) @@ -40,3 +40,19 @@ # ifdef DebianMaintainer +--- xc/config/cf/gnu.cf.orig 2005-12-30 03:03:01.000000000 +0100 ++++ xc/config/cf/gnu.cf 2005-12-30 03:03:11.000000000 +0100 +@@ -80,13 +80,7 @@ + + # define ProjectManSuffix x + +-/* +- * +- * + # define DebianMaintainer YES +- * +- * +- */ + + # ifdef DebianMaintainer + Index: patches/series =================================================================== --- patches/series (revision 978) +++ patches/series (working copy) @@ -85,8 +85,10 @@ arm/315_arm_is_not_x86_and_has_no_vga.diff -p0 s390/500_s390_support.diff -p0 amd64/600_amd64_support.diff -p0 +hurd/800_gnu_config.diff -p0 hurd/803_gnu_xterm_openpty.diff -p0 hurd/804_maxhostnamelen.diff -p0 +hurd/806_gnuLib_update.diff -p0 netbsd/840_netbsd_bsdLib.rules_fix.diff -p0 netbsd/841_netbsd_imake.c_fixes.diff -p0 netbsd/842_netbsd_NetBSD.cf_fixes.diff -p0 Index: patches/hurd/806_gnuLib_update.diff =================================================================== --- patches/hurd/806_gnuLib_update.diff (revision 979) +++ patches/hurd/806_gnuLib_update.diff (working copy) @@ -15,7 +15,7 @@ #ifndef FixupLibReferences #define FixupLibReferences() @@\ -@@ -14,17 +15,71 @@ +@@ -14,15 +15,71 @@ #define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif @@ -42,13 +42,11 @@ +#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) #define SharedXiReqs $(LDPRELIB) $(XLIB) --#define SharedPexReqs $(LDPRELIB) $(XONLYLIB) MathLibrary +#define SharedXpReqs $(LDPRELIB) $(XLIB) +#define SharedXpmReqs $(LDPRELIB) $(XLIB) +#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) +#define SharedXrenderReqs $(LDPRELIB) $(XLIB) #define SharedXtstReqs $(LDPRELIB) $(XLIB) --#define SharedXieReqs $(LDPRELIB) $(XONLYLIB) +#define SharedXvReqs $(LDPRELIB) $(XLIB) #define SharedSMReqs $(LDPRELIB) $(ICELIB) +#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) Index: patches/hurd/800_gnu_config.diff =================================================================== --- patches/hurd/800_gnu_config.diff (revision 979) +++ patches/hurd/800_gnu_config.diff (working copy) @@ -1,17 +1,21 @@ ---- xc/config/cf/gnu.cf.orig 2005-09-03 13:28:29.241654464 +0200 -+++ xc/config/cf/gnu.cf 2005-09-03 13:29:16.432480368 +0200 -@@ -1,6 +1,3 @@ --XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.12 2003/11/24 02:02:26 dawes Exp $ --XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.2 2004/04/23 18:41:58 eich Exp $ -- +--- xc/config/cf/gnu.cf 2005-12-30 04:00:57.000000000 +0100 ++++ xc/config/cf/gnu.cf.new 2005-12-30 04:00:22.000000000 +0100 +@@ -1,5 +1,5 @@ + XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.12 2003/11/24 02:02:26 dawes Exp $ +-XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.3 2005/02/09 04:09:54 gisburn Exp $ ++XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.2 2004/04/23 18:41:58 eich Exp $ + #ifndef OSName #define OSName DefaultOSName - #endif -@@ -17,55 +14,367 @@ +@@ -17,57 +17,368 @@ #ifndef OSTeenyVersion #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 +#ifndef HasGhostScript +# define HasGhostScript YES +#endif @@ -22,18 +26,16 @@ +#ifndef GnuBinUtilsMajorVersion +# define GnuBinUtilsMajorVersion DefaultGnuBinUtilsMajorVersion +#endif -+ - XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) + +-XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled? ++XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) +XCOMM libc: (GnuCLibMajorVersion./**/GnuCLibMinorVersion./**/GnuCLibTeenyVersion) +XCOMM binutils: (GnuBinUtilsMajorVersion) --#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \ -- -D_POSIX_SOURCE -D_XOPEN_SOURCE \ -- -D_BSD_SOURCE -D_SVID_SOURCE +-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H +#define HasDevRandom NO +#define PollDevRandom NO --XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled? +/* Path setup. */ +# ifndef NothingOutsideProjectRoot +# define NothingOutsideProjectRoot NO @@ -41,8 +43,7 @@ +# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot +# define SystemManDirectory /usr/share/man +# endif - --#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H ++ +/* Default GCC options. */ +# ifndef DefaultGcc2OptimizeOpt +# define DefaultGcc2OptimizeOpt -O2 @@ -242,7 +243,7 @@ +# define GnuGnuSourceDefines -D_GNU_SOURCE +# endif +#endif - ++ +# define GnuSourceDefines -D_POSIX_C_SOURCE=199309L \ + -D_POSIX_SOURCE -D_XOPEN_SOURCE \ + -D_BSD_SOURCE -D_SVID_SOURCE \ @@ -254,7 +255,7 @@ #define HasThreadSafeAPI YES #define ThreadsLibraries -lpthread #define SystemMTDefines -D_REENTRANT -- + -#define HasDevRandom YES -#define PollDevRandom YES - @@ -345,11 +346,12 @@ #define HasPutenv YES - -XCOMM Not implemented and will always fail. -+#ifndef HasShm - #define HasShm YES + #ifndef HasShm +-# define HasShm YES ++#define HasShm YES + #endif - -#define HasBSD44Sockets YES -+#endif #define HasSockets YES +#ifndef HasSnprintf #define HasSnprintf YES @@ -388,7 +390,7 @@ #define AvoidNullMakeCommand YES #ifndef DebuggableLibraries #define DebuggableLibraries NO -@@ -85,32 +394,64 @@ +@@ -87,32 +398,64 @@ #define UseStaticTermcapLib NO #endif @@ -448,21 +450,20 @@ -#ifndef DoLoadableServer -#define DoLoadableServer YES #endif --#ifndef --#define CppCmd /lib/cpp + +/* + * Some older distros still need /lib/cpp. There's probably a better + * test, but this handles the older Red Hat releases at least. + */ -+#ifndef CppCmd + #ifndef CppCmd +-#define CppCmd /lib/cpp +# define CppCmd cpp #endif + #define YaccCmd bison -y #define LexCmd flex -l #define HasFlex YES -@@ -126,30 +467,68 @@ +@@ -128,30 +471,68 @@ #define StandardCppDefines StandardDefines #define HasVarRun YES @@ -537,16 +538,16 @@ #define HasGnuMake YES #define MakeNamedTargetSubdir(dir,flags,subname)\ -@@ -157,12 +536,16 @@ +@@ -159,12 +540,16 @@ #define ArchitectureDefines -DGNU_ARCHITECTURE -#define XserverNeedsSetUID YES -- --#include <gnuLib.rules> +#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) +#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) +-#include <gnuLib.rules> +- -XCOMM XXX Might need this if they are not careful with slashes. -XCOMM #define DirFailPrefix - +#ifndef BuildDmx
