Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.547.2.5
diff -u -2 -0 -r1.547.2.5 ChangeLog
--- xc/ChangeLog	26 Nov 2004 09:45:46 -0000	1.547.2.5
+++ xc/ChangeLog	26 Nov 2004 09:59:33 -0000
@@ -1,21 +1,27 @@
 2004-11-25 Roland Mainz <roland.mainz@nrubsig.org>
+        * 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 <roland.mainz@nrubsig.org>
         * 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
         * xc/programs/Xserver/Xprint/Imakefile
         * xc/programs/Xserver/Xprint/Xprint.html
         * xc/programs/Xserver/Xprint/Xprint.man
         * xc/programs/Xserver/Xprint/Xprint.sgml
         Bugzilla #1923 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1923)
         and Bugzilla #811 (https://freedesktop.org/bugzilla/show_bug.cgi?id=811):
         Fixing build bustage caused by first patch of bug 811.
 
 2004-11-25 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/packager/rpm/xprint.spec
         Bugzilla #1923 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1923):
         Testing standalone package system for Xprint server, part 4:
         Fixing RPM build bustage.
Index: xc/config/cf/xprint_host.def
===================================================================
RCS file: /cvs/xorg/xc/config/cf/xprint_host.def,v
retrieving revision 1.1.2.1
diff -u -2 -0 -r1.1.2.1 xprint_host.def
--- xc/config/cf/xprint_host.def	26 Nov 2004 03:29:50 -0000	1.1.2.1
+++ xc/config/cf/xprint_host.def	26 Nov 2004 09:59:34 -0000
@@ -93,40 +93,42 @@
 #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
+
 /* 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
 #define NormalLibFreetype2             YES
Index: xc/programs/Xserver/miext/damage/damagestr.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/miext/damage/damagestr.h,v
retrieving revision 1.3
diff -u -2 -0 -r1.3 damagestr.h
--- xc/programs/Xserver/miext/damage/damagestr.h	11 Aug 2004 22:40:14 -0000	1.3
+++ xc/programs/Xserver/miext/damage/damagestr.h	26 Nov 2004 09:59:43 -0000
@@ -9,41 +9,43 @@
  * copyright notice and this permission notice appear in supporting
  * documentation, and that the name of Keith Packard not be used in
  * advertising or publicity pertaining to distribution of the software without
  * specific, written prior permission.  Keith Packard makes no
  * representations about the suitability of this software for any purpose.  It
  * is provided "as is" without express or implied warranty.
  *
  * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
  * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
 #ifndef _DAMAGESTR_H_
 #define _DAMAGESTR_H_
 
 #include "damage.h"
-#include "picturestr.h"
+#ifdef RENDER
+# include "picturestr.h"
+#endif
 
 typedef struct _damage {
     DamagePtr		pNext;
     DamagePtr		pNextWin;
     RegionRec		damage;
     
     DamageReportLevel	damageLevel;
     Bool		isInternal;
     void		*closure;
     Bool		isWindow;
     DrawablePtr		pDrawable;
     
     DamageReportFunc	damageReport;
     DamageDestroyFunc	damageDestroy;
 } DamageRec;
 
 typedef struct _damageScrPriv {
     int				internalLevel;
 
     /*