Index: patches/xscreensaver-51-dpms-headers.diff =================================================================== --- patches/xscreensaver-51-dpms-headers.diff (revision 0) +++ patches/xscreensaver-51-dpms-headers.diff (revision 0) @@ -0,0 +1,24 @@ +--- xscreensaver-5.01/driver/dpms.c 2009-12-22 14:23:22.893934846 -0800 ++++ xscreensaver-5.01/driver/dpms.c 2009-12-22 15:31:14.890542664 -0800 +@@ -56,21 +56,6 @@ + + # include <X11/Xproto.h> + # include <X11/extensions/dpms.h> +-# include <X11/extensions/dpmsstr.h> +- +- /* Why this crap is not in a header file somewhere, I have no idea. Losers! +- */ +- extern Bool DPMSQueryExtension (Display *, int *event_ret, int *err_ret); +- extern Status DPMSGetVersion (Display *, int *major_ret, int *minor_ret); +- extern Bool DPMSCapable (Display *); +- extern Status DPMSInfo (Display *, CARD16 *power_level, BOOL *state); +- extern Status DPMSEnable (Display *dpy); +- extern Status DPMSDisable (Display *dpy); +- extern Status DPMSForceLevel (Display *, CARD16 level); +- extern Status DPMSSetTimeouts (Display *, CARD16 standby, CARD16 suspend, +- CARD16 off); +- extern Bool DPMSGetTimeouts (Display *, CARD16 *standby, +- CARD16 *suspend, CARD16 *off); + + #endif /* HAVE_DPMS_EXTENSION */ + Index: SUNWxscreensaver.spec =================================================================== --- SUNWxscreensaver.spec (revision 20299) +++ SUNWxscreensaver.spec (working copy) @@ -152,6 +152,8 @@ Patch49: xscreensaver-49-bug-6845488.diff # date:2009-11-25 owner:ng228438 type:bug bugster:6845488 Patch50: xscreensaver-50-bug-6865652.diff +# date:2009-12-22 owner:alanc type:bug +Patch51: xscreensaver-51-dpms-headers.diff
# date:2008-03-07 owner:alanc type:branding Patch101: rss-glx-101-matrixview.diff @@ -332,6 +334,7 @@ %patch48 -p1 %patch49 -p1 %patch50 -p1 +%patch51 -p1 chmod a+x install-sh configure @@ -668,6 +671,7 @@ %changelog * Tue Dec 22 2009 - alan.coopersmith at sun.com +- Add xscreensaver-51-dpms-headers.diff to build with snv_130 X headers - Use /usr/lib/ld/map.noexbss now that it's shipped in snv_125 & later builds (CR 6843010) * Mon Oct 19 2009 - alan.coopersmith at sun.com
