Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.547.2.15 diff -u -2 -0 -r1.547.2.15 ChangeLog --- xc/ChangeLog 5 Dec 2004 13:16:20 -0000 1.547.2.15 +++ xc/ChangeLog 5 Dec 2004 20:22:50 -0000 @@ -1,20 +1,28 @@ +2004-12-05 Roland Mainz + * xc/config/cf/X11.tmpl + * xc/config/cf/xprint_host.def + * xc/lib/X11/Imakefile + Bugzilla #1923 (https://bugs.freedesktop.org/show_bug.cgi?id=1923): + Testing standalone package system for Xprint server, part 12: + FreeBSD build fixes. + 2004-12-04 Roland Mainz * xc/list_files_not_used_by_xp.ksh * xc/lib/Imakefile * xc/lib/X11/Imakefile Bugzilla #1923 (https://bugs.freedesktop.org/show_bug.cgi?id=1923): Testing standalone package system for Xprint server, part 11: Re-add minimum set of libX11 includes required to build the tree when the build system doesn't have them installed. 2004-12-04 Roland Mainz * xc/programs/Xserver/Xprint/ps/PsInit.c Bugzilla #1800 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1800): Fix Postscript DDX's 1bit StaticGray visual to report only 1bit of significant bits in color specification (instead of 8bits). Patch by Julien Lafon 2004-12-04 Roland Mainz * xc/packager/rpm/xprint.spec Bugzilla #1923 (https://bugs.freedesktop.org/show_bug.cgi?id=1923): Remove old hack for Redhat Linux (platform no longer supported). Index: xc/config/cf/X11.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v retrieving revision 1.37.2.1 diff -u -2 -0 -r1.37.2.1 X11.tmpl --- xc/config/cf/X11.tmpl 3 Dec 2004 03:39:10 -0000 1.37.2.1 +++ xc/config/cf/X11.tmpl 5 Dec 2004 20:22:51 -0000 @@ -4754,30 +4754,30 @@ if [ "$(FORCEUPDATE)" = yes ]; then \ @@\ if [ "$(FOLLOWLINK)" = no ]; then \ @@\ (set -x; $(RM) dst); \ @@\ fi; \ @@\ set -x; cp src dst; \ @@\ else \ @@\ grep -v "XFree86:" src > __tmp1__; \ @@\ grep -v "XFree86:" dst > __tmp2__; \ @@\ if diff __tmp1__ __tmp2__ > /dev/null 2>&1; then :; \ @@\ else \ @@\ if [ "$(FOLLOWLINK)" = no ]; then \ @@\ (set -x; $(RM) dst); \ @@\ fi; \ @@\ set -x; cp src dst; \ @@\ fi; \ @@\ fi; \ @@\ fi @@\ @$(RM) __tmp1__ __tmp2__ #endif -#if !HasFreetype2 +#if !HasFreetype2 && SharedLibFreetype2 FT2PRELOADPATTERN = libfreetype.so.? #endif #if !HasFontconfig FCPRELOADPATTERN = libfontconfig.so.? #endif XFTPRELOADPATTERN = libXft.so.? XRENDERPRELOADPATTERN = libXrender.so.? XFONTPRELOADPATTERN = libXfont*.so.? Index: xc/config/cf/xprint_host.def =================================================================== RCS file: /cvs/xorg/xc/config/cf/xprint_host.def,v retrieving revision 1.1.2.5 diff -u -2 -0 -r1.1.2.5 xprint_host.def --- xc/config/cf/xprint_host.def 3 Dec 2004 23:13:15 -0000 1.1.2.5 +++ xc/config/cf/xprint_host.def 5 Dec 2004 20:22:52 -0000 @@ -147,40 +147,41 @@ #define SharedLibFontEnc NO #define SharedLibFont NO #define SharedLibXdmcp NO #define XserverStaticFontLib YES /* Build only Xprint applications */ #ifndef BuildXprintAppsOnly #define BuildXprintAppsOnly YES #endif /* BuildXprintAppsOnly */ /* Set our own XVendorString/XVendorRelease * (and to avoid that xorg.cf sets it's own stuff here) */ #define XVendorString "xprint.mozdev.org" #define XVendorRelease 100000 #define UseHackLinkAgainstInstalledX11Libs YES #if UseHackLinkAgainstInstalledX11Libs /* "Hack" to reuse an already installed X11 distribution when linking our * programs (this assumes that the installed X version is at least X11R6.4) */ # ifndef IBMArchitecture +# define X11ProjectDefines -I/usr/X11R6/include # define LdPreLib -L$(USRLIBDIR) -R$(USRLIBDIR) -L$(BUILDLIBDIR) # endif /* !IBMArchitecture */ #endif /* UseHackLinkAgainstInstalledX11Libs */ XCOMM #### Sun/Solaris-specifc stuff ... #### #if defined(SunArchitecture) && (OSMajorVersion > 4) #undef XsunServer #define XsunServer NO XCOMM X11R6.7's sun.cf does not set ProjectRoot to /usr/openwin anymore - why ? #define ProjectRoot /usr/openwin #define ServerConfigDir /usr/openwin/server/etc XCOMM Some build hacks for the GISWxprintglue package #if BuildGISWxprintglue # define ProjectRoot /usr/openwin # define ServerConfigDir /usr/openwin/server/etc # define BinDir /opt/GISWxprintglue/bin # define ManDirectoryRoot /opt/GISWxprintglue/man # undef XPrintDir Index: xc/lib/X11/Imakefile =================================================================== RCS file: /cvs/xorg/xc/lib/X11/Imakefile,v retrieving revision 1.7.10.1 diff -u -2 -0 -r1.7.10.1 Imakefile --- xc/lib/X11/Imakefile 5 Dec 2004 13:16:21 -0000 1.7.10.1 +++ xc/lib/X11/Imakefile 5 Dec 2004 20:22:55 -0000 @@ -1,14 +1,14 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:44:38 cpqbld Exp $ XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.52 2003/05/27 16:53:15 tsi Exp $ HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \ Xcms.h Xlocale.h XKBlib.h -BuildIncludes($(HEADERS),IncSubdir,..) +BuildIncludes($(HEADERS),X11,..)