Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.547.2.7 diff -u -2 -0 -r1.547.2.7 ChangeLog --- xc/ChangeLog 26 Nov 2004 11:27:34 -0000 1.547.2.7 +++ xc/ChangeLog 3 Dec 2004 02:53:43 -0000 @@ -1,20 +1,28 @@ +2004-12-02 Roland Mainz + * xc/config/cf/xprint_host.def + * xc/packager/tarball/startxprint.sh + Bugzilla #1923 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1923): + Testing standalone package system for Xprint server, part 8: + Fixing problems with XDMCP code on Solaris and pre-Solaris 10 Motif + bits. + 2004-11-25 Roland Mainz * xc/packager/rpm/xprint.spec Bugzilla #1923 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1923): Testing standalone package system for Xprint server, part 7: (Hopefully) final round of RPM build fixes. 2004-11-25 Roland Mainz * xc/config/cf/xprint_host.def * xc/programs/Xserver/miext/damage/damagestr.h Bugzilla #1923 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1923): Build fixes for Solaris 8. 2004-11-25 Roland Mainz * xc/list_files_not_used_by_xp.ksh * xc/doc/Imakefile * xc/doc/man/Imakefile * xc/doc/man/general/Imakefile * xc/doc/man/general/Xprint.html * xc/doc/man/general/Xprint.man * xc/doc/man/general/Xprint.sgml Index: xc/config/cf/xprint_host.def =================================================================== RCS file: /cvs/xorg/xc/config/cf/xprint_host.def,v retrieving revision 1.1.2.2 diff -u -2 -0 -r1.1.2.2 xprint_host.def --- xc/config/cf/xprint_host.def 26 Nov 2004 10:02:41 -0000 1.1.2.2 +++ xc/config/cf/xprint_host.def 3 Dec 2004 02:53:44 -0000 @@ -93,41 +93,41 @@ #define BuildXInputExt NO #define BuildScreenSaverExt NO #define BuildXvExt NO #define BuildXvMCExt NO #define BuildDmx NO #define BuildXF86DRI NO #define BuildRender NO #define BuildXfixes NO #define BuildDamage NO #define BuildComposite NO #define BuildXevie NO #define BuildXF86DGA NO #define BuildRandR NO #define BuildXinerama NO /* X extensions needed */ #define BuildGlxExt YES /* LBX is needed for compatibility to the XWeb stuff */ #define BuildLBX YES -#define HasXdmAuth YES +#define HasXdmAuth NO /* Xprt's non-bitmap based DDX (PS, PCL, PDF, SVGprint etc.) cannot support MIT-SHM */ #undef HasShm #define HasShm NO /* Disable stipple code due portability issues * (see http://xprint.mozdev.org/bugs/show_bug.cgi?id=2220) */ #define BuildStippleCode NO /* Temporary for Xorg tree */ #define BuildFontconfigLibrary NO #define XorgServer NO #define XF86Server NO #define XnestServer NO #define XVirtualFramebufferServer NO #define XdmxServer NO #define GzipFontCompression YES #define BuildFreeType YES #define BuildFreetype2Library YES #define SharedLibFreetype2 NO @@ -207,42 +207,45 @@ /* PCL DDXs are currently defunct in Solaris Xprt, so do not ship the * config files for now */ # undef XpColorPclDDX # define XpColorPclDDX NO # undef XpMonoPclDDX # define XpMonoPclDDX NO /* Make sure we install our own encoding files since Solaris uses a format we * (currently) do not support (yet). */ # define InstallXF86EncodingFiles YES # undef XF86EncodingsPath # define XF86EncodingsPath /opt/GISWxprint/lib/X11/fonts/encodings #endif /* GISWxprint */ /* Install XF86 encoding files since that's the only format we currently support */ #ifndef InstallXF86EncodingFiles #define InstallXF86EncodingFiles YES #endif /* InstallXF86EncodingFiles */ #define HasVarDirectory NO + +#undef HasMotif #undef HasMotif2 -#define HasMotif2 YES +#define HasMotif NO +#define HasMotif2 NO #if 1 /* Switch for 32bit binaries or 64bit binaries */ /* 32bit SPARC */ # define CcCmd /opt/SUNWspro/bin/cc # define CplusplusCmd /opt/SUNWspro/bin/CC #else /* 64bit sparc (Doesn't really work yet because the Xservers cannot link properly... ;-( */ # define ServerExtraDefines -D_XSERVER64 # define CcCmd /opt/SUNWspro/bin/cc -xarch=v9a # define CplusplusCmd /opt/SUNWspro/bin/CC -xarch=v9a # define UsrLibDir /usr/openwin/lib/sparcv9 #endif #if 0 /* Development only */ XCOMM Explicitly use "-xs" to make Rational Purify "happy" # undef OptimizedCDebugFlags # define OptimizedCDebugFlags -xs -g -DDEBUG_$(LOGNAME) #endif XCOMM #### FreeBSD-specifc stuff ... #### Index: xc/packager/tarball/startxprint.sh =================================================================== RCS file: /cvs/xorg/xc/packager/tarball/Attic/startxprint.sh,v retrieving revision 1.1.4.1 diff -u -2 -0 -r1.1.4.1 startxprint.sh --- xc/packager/tarball/startxprint.sh 26 Nov 2004 03:29:51 -0000 1.1.4.1 +++ xc/packager/tarball/startxprint.sh 3 Dec 2004 02:53:49 -0000 @@ -47,39 +47,39 @@ ) return 0 } ##### main this_script="$(relpath2abspath "${0}")" unpackdir="$(dirname "${this_script}")/install" if [ -d ${unpackdir}/usr/X11R6/etc/rc.d ]; then xinitdir="usr/X11R6/etc/rc.d" else xinitdir="etc/init.d" fi ## prechecks [ ! -d "${unpackdir}/usr" ] && fatal_error "${unpackdir}/usr not found" [ ! -r "${unpackdir}/${xinitdir}/xprint" ] && fatal_error "${unpackdir}/${xinitdir}/xprint not found" xprt_path="$(find "${unpackdir}" -name Xprt -print)" xplsprinters_path="$(find "${unpackdir}" -name xplsprinters -print)" psdefault_path="$(find "${unpackdir}" -name PSdefault -print)" -xf86encodingsdir_path="$(find "${unpackdir}" -name encodings.dir -print)" +xf86encodingsdir_path="$(find "${unpackdir}" -name encodings.dir -print | fgrep -v /large)" [ "${psdefault_path}" = "" ] && fatal_error "no PSdefault model found in ${unpackdir}" [ "${xprt_path}" = "" ] && fatal_error "no Xprt binary found in ${unpackdir}" [ "${xplsprinters_path}" = "" ] && fatal_error "no xplsprinters binary found in ${unpackdir}" [ ! -r "${psdefault_path}" ] && fatal_error "PSdefault model \"${psdefault_path}\" found in ${unpackdir} not accessible" [ ! -x "${xprt_path}" ] && fatal_error "Xprt binary \"${xprt_path}\" found in ${unpackdir} not accessible/executable" xpconfig_dir="${psdefault_path%*/C/print/models/PSdefault}" # run the "/etc/init.d/xprint start" using the binaries/config files/scripts in the tarball ETC_INITD_XPRINT_XPRT_PATH="${xprt_path}" ETC_INITD_XPRINT_XPLSPRINTERS_PATH="${xplsprinters_path}" ETC_INITD_XPRINT_XPCONFIGDIR="${xpconfig_dir}" ETC_INITD_XPRINT_XF86ENCODINGSDIR="${xf86encodingsdir_path}" export ETC_INITD_XPRINT_XPRT_PATH ETC_INITD_XPRINT_XPCONFIGDIR ETC_INITD_XPRINT_XPLSPRINTERS_PATH ETC_INITD_XPRINT_XF86ENCODINGSDIR /bin/sh "${unpackdir}/${xinitdir}/xprint" "$@" # EOF.