packages: xscreensaver/xscreensaver-build.patch - 5.13 fixes

[baggins]

Author: baggins                      Date: Fri May  6 10:34:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 5.13 fixes

---- Files affected:
packages/xscreensaver:
   xscreensaver-build.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/xscreensaver/xscreensaver-build.patch
diff -u packages/xscreensaver/xscreensaver-build.patch:1.1 packages/xscreensaver/xscreensaver-build.patch:1.2
--- packages/xscreensaver/xscreensaver-build.patch:1.1	Sun Jul 26 20:40:53 2009
+++ packages/xscreensaver/xscreensaver-build.patch	Fri May  6 12:34:01 2011
@@ -1,5 +1,14 @@
 --- xscreensaver-5.06/configure.in~	2009-07-26 20:25:37.933814582 +0200
 +++ xscreensaver-5.06/configure.in	2009-07-26 20:31:08.133988822 +0200
+@@ -315,7 +315,7 @@
+ ###############################################################################
+ 
+ AC_DEFUN(AC_PROG_CC_ANSI,
+- [AC_PROG_CC
++ [AC_REQUIRE([AC_PROG_CC])
+ 
+   if test -z "$GCC"; then
+     # not using GCC
 @@ -472,6 +472,8 @@
  #
  ###############################################################################
@@ -9,3 +18,37 @@
  AC_DEFUN(AC_PROG_INSTALL_DIRS,
   [AC_CACHE_CHECK([whether "\${INSTALL} -d" creates intermediate directories],
      ac_cv_install_d_creates_dirs,
+--- xscreensaver-5.11/Makefile.in.debug	2010-04-12 13:49:19.000000000 +0900
++++ xscreensaver-5.11/Makefile.in	2010-04-12 20:36:05.000000000 +0900
+@@ -99,8 +99,8 @@
+ # or later, feel free.  Personally, I can't be bothered.
+ #
+ configure::
+-	autoconf263
+-	autoheader263
++	autoconf
++	autoheader
+ 	@TMP=configure.$$$$ ;						     \
+ 	echo "munging configure's --help message..." ;			     \
+ 	( perl -e '							     \
+--- xscreensaver-5.12/driver/test-xdpms.c.extra	2002-03-19 08:57:42.000000000 +0900
++++ xscreensaver-5.12/driver/test-xdpms.c	2011-04-03 22:05:01.000000000 +0900
+@@ -29,7 +29,6 @@
+ 
+ #include <X11/Xproto.h>
+ #include <X11/extensions/dpms.h>
+-#include <X11/extensions/dpmsstr.h>
+ 
+ extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret);
+ extern Bool DPMSCapable (Display *dpy);
+--- xscreensaver-5.12/driver/Makefile.in	2011-04-03 22:49:32.000000000 +0900
++++ xscreensaver-5.12/driver/Makefile.in.save	2011-04-03 22:49:32.000000000 +0900
+@@ -850,7 +850,7 @@
+ test-mlstring: test-mlstring.o
+ 	$(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)
+ 
+-TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
++TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS)
+ test-fade: test-fade.o $(UTILS_BIN)/fade.o
+ 	$(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xscreensaver/xscreensaver-build.patch?r1=1.1&r2=1.2&f=u