[xscreensaver/f17] Update to 5.16
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Jun 20 16:18:45 UTC 2012
commit abdbd30fcd318421138086933e47cdc064a72436
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Thu Jun 21 01:18:44 2012 +0900
Update to 5.16
.gitignore | 1 +
sources | 2 +-
...eensaver-5.15-feedurl-doubleslash-warning.patch | 70 ---------
xscreensaver-5.15-pair-quit-segv.patch | 11 --
xscreensaver-5.15-pam-account-type.patch | 151 --------------------
...nsaver-5.15-vidwhacker-with-relative-path.patch | 10 --
...nsaver-5.15-webcollage-chomp-getimagefile.patch | 10 --
xscreensaver-5.16-ptylink.patch | 62 ++++++++
...screensaver-5.16-webcollage-default-nonet.patch | 12 +-
xscreensaver.spec | 38 ++----
10 files changed, 79 insertions(+), 288 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b779607..8b44db9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ xscreensaver-5.11.tar.gz
clog
/xscreensaver-5.14.tar.gz
/xscreensaver-5.15.tar.gz
+/xscreensaver-5.16.tar.gz
diff --git a/sources b/sources
index 6e61002..18d6a4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0b8b2c817a9a7371f51a82e80602d10 xscreensaver-5.15.tar.gz
+8d459220586637c09e5507f52f2e334a xscreensaver-5.16.tar.gz
diff --git a/xscreensaver-5.16-ptylink.patch b/xscreensaver-5.16-ptylink.patch
new file mode 100644
index 0000000..ef25390
--- /dev/null
+++ b/xscreensaver-5.16-ptylink.patch
@@ -0,0 +1,62 @@
+--- xscreensaver-5.16/hacks/Makefile.in.pty 2012-06-21 00:11:40.000000000 +0900
++++ xscreensaver-5.16/hacks/Makefile.in 2012-06-21 00:35:38.000000000 +0900
+@@ -606,7 +606,7 @@
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(DBE) $(HACK_LIBS)
+
+ noseguy: noseguy.o $(HACK_OBJS) $(XPM) $(TEXT)
+- $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(XPM) $(TEXT) $(XPM_LIBS)
++ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(XPM) $(TEXT) $(XPM_LIBS) $(PTY_LIBS)
+
+ pedal: pedal.o $(HACK_OBJS) $(HSV) $(ERASE)
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HSV) $(ERASE) $(HACK_LIBS)
+@@ -705,7 +705,7 @@
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(TEXT) $(COL) $(HACK_LIBS) $(PTY_LIBS)
+
+ xmatrix: xmatrix.o $(HACK_OBJS) $(TEXT) $(XPM)
+- $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(TEXT) $(XPM) $(XPM_LIBS)
++ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(TEXT) $(XPM) $(XPM_LIBS) $(PTY_LIBS)
+
+ petri: petri.o $(HACK_OBJS) $(COL) $(SPL)
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)
+@@ -786,7 +786,7 @@
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(DBE) $(HACK_LIBS)
+
+ fontglide: fontglide.o $(HACK_OBJS) $(DBE) $(TEXT)
+- $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(DBE) $(TEXT) $(HACK_LIBS)
++ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(DBE) $(TEXT) $(HACK_LIBS) $(PTY_LIBS)
+
+ pong: pong.o $(HACK_OBJS) $(ATV) $(GRAB) $(XPM)
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS)
+--- xscreensaver-5.16/hacks/glx/Makefile.in.pty 2012-06-21 00:11:40.000000000 +0900
++++ xscreensaver-5.16/hacks/glx/Makefile.in 2012-06-21 00:40:40.000000000 +0900
+@@ -57,6 +57,7 @@
+ HACK_LIBS = $(HACK_PRE) $(HACK_POST2)
+ XPM_LIBS = $(HACK_PRE) @XPM_LIBS@ $(HACK_POST2)
+ GLE_LIBS = $(HACK_PRE) @GLE_LIBS@ @XPM_LIBS@ $(HACK_POST2)
++PTY_LIBS = @PTY_LIBS@
+ MINIXPM = $(UTILS_BIN)/minixpm.o
+
+ HACK_SRC = $(srcdir)/..
+@@ -577,11 +578,11 @@
+ SW_OBJS=starwars.o glut_stroke.o glut_swidth.o \
+ $(TEXT) ${FONT_OBJS} $(HACK_OBJS)
+ starwars: $(SW_OBJS)
+- $(CC_HACK) -o $@ $(SW_OBJS) $(HACK_LIBS)
++ $(CC_HACK) -o $@ $(SW_OBJS) $(HACK_LIBS) $(PTY_LIBS)
+
+ GLT_OBJS=gltext.o glut_stroke.o glut_swidth.o tube.o $(TEXT) $(HACK_TRACK_OBJS)
+ gltext: $(GLT_OBJS)
+- $(CC_HACK) -o $@ $(GLT_OBJS) $(HACK_LIBS)
++ $(CC_HACK) -o $@ $(GLT_OBJS) $(HACK_LIBS) $(PTY_LIBS)
+
+ DB_OBJS=sphere.o tube.o $(HACK_TRACK_OBJS)
+ dangerball: dangerball.o $(DB_OBJS)
+@@ -730,7 +731,7 @@
+ $(CC_HACK) -o $@ $@.o ${FONT_OBJS} $(HACK_TRACK_GRAB_OBJS) $(HACK_LIBS)
+
+ fliptext: fliptext.o $(TEXT) ${FONT_OBJS} $(HACK_OBJS)
+- $(CC_HACK) -o $@ $@.o $(TEXT) ${FONT_OBJS} $(HACK_OBJS) $(HACK_LIBS)
++ $(CC_HACK) -o $@ $@.o $(TEXT) ${FONT_OBJS} $(HACK_OBJS) $(HACK_LIBS) $(PTY_LIBS)
+
+ antmaze: antmaze.o sphere.o tube.o $(HACK_TRACK_OBJS)
+ $(CC_HACK) -o $@ $@.o sphere.o tube.o $(HACK_TRACK_OBJS) $(HACK_LIBS)
diff --git a/xscreensaver-5.11-webcollage-default-nonet.patch b/xscreensaver-5.16-webcollage-default-nonet.patch
similarity index 74%
rename from xscreensaver-5.11-webcollage-default-nonet.patch
rename to xscreensaver-5.16-webcollage-default-nonet.patch
index c5c96a6..719f26a 100644
--- a/xscreensaver-5.11-webcollage-default-nonet.patch
+++ b/xscreensaver-5.16-webcollage-default-nonet.patch
@@ -1,5 +1,5 @@
---- xscreensaver-5.11/hacks/config/webcollage.xml.nonet 2008-08-04 04:23:41.000000000 +0900
-+++ xscreensaver-5.11/hacks/config/webcollage.xml 2010-04-12 20:25:26.000000000 +0900
+--- xscreensaver-5.16/hacks/config/webcollage.xml.nonet 2012-06-19 16:14:11.000000000 +0900
++++ xscreensaver-5.16/hacks/config/webcollage.xml 2012-06-21 00:07:11.000000000 +0900
@@ -28,8 +28,8 @@
<string id="filter" _label="Per-image filter program" arg="-filter %"/>
<string id="filter2" _label="Overall filter program" arg="-filter2 %"/>
@@ -9,8 +9,8 @@
+ <file id="dir" _label="Image directory" arg="-directory %"/>
<_description>
- This makes collages out of random images pulled off of the
-@@ -44,6 +44,11 @@
+ This is what the Internet looks like.
+@@ -47,6 +47,11 @@
See also http://www.jwz.org/webcollage/
@@ -22,8 +22,8 @@
Written by Jamie Zawinski; 1999.
</_description>
</screensaver>
---- xscreensaver-5.11/hacks/webcollage.man.nonet 2009-10-14 06:12:31.000000000 +0900
-+++ xscreensaver-5.11/hacks/webcollage.man 2010-04-12 20:29:34.000000000 +0900
+--- xscreensaver-5.16/hacks/webcollage.man.nonet 2009-10-14 06:12:31.000000000 +0900
++++ xscreensaver-5.16/hacks/webcollage.man 2012-06-21 00:04:50.000000000 +0900
@@ -178,6 +178,11 @@
.TP 8
.B \-fps
diff --git a/xscreensaver.spec b/xscreensaver.spec
index bf14d3c..cca9e60 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
%define name xscreensaver
-%define mainversion 5.15
+%define mainversion 5.16
%define beta_ver %{nil}
@@ -10,7 +10,7 @@
%define split_getimage 1
%endif
-%define fedora_rel 10
+%define fedora_rel 1
%undefine extrarel
@@ -45,8 +45,6 @@ Source10: update-xscreensaver-hacks
Source11: xscreensaver-autostart
Source12: xscreensaver-autostart.desktop
%endif
-# New xscreensaver-getimage-file from jwz
-Source13: xscreensaver-getimage-file
##
## Patches
##
@@ -55,32 +53,18 @@ Source13: xscreensaver-getimage-file
Patch1: xscreensaver-5.00b5-sanitize-hacks.patch
# Change webcollage not to access to net
# Also see bug 472061
-Patch21: xscreensaver-5.11-webcollage-default-nonet.patch
+Patch21: xscreensaver-5.16-webcollage-default-nonet.patch
#
## Patches already sent to the upsteam
# Remove "AC_PROG_CC' was expanded before it was required" warning
Patch30: xscreensaver-5.11-conf264.patch
#
## Patches which must be discussed with upstream
-## Patch33 34 35 36 37: sent upstream
#
# Update Japanese po file
Patch32: xscreensaver-5.13-dpmsQuickoff-japo.patch
-# Remove newline of the output from xsreensaver-getimage-file in
-# webcollage
-Patch33: xscreensaver-5.15-webcollage-chomp-getimagefile.patch
-# Make vidwhacker work correctly when xscreensaver-getimage-file
-# returns relative path (bug 746847)
-Patch34: xscreensaver-5.15-vidwhacker-with-relative-path.patch
-# With -pair option, quitting hack will cause segv (bug 819349)
-Patch35: xscreensaver-5.15-pair-quit-segv.patch
-# xscreensaver-demo should not truncate http:// to http:/
-# also xscreensaver-demo should not warn for http://
-# (partial fix for bug 827771)
-Patch36: xscreensaver-5.15-feedurl-doubleslash-warning.patch
-# Enable account type pam validation
-# (debian bug 656766)
-Patch37: xscreensaver-5.15-pam-account-type.patch
+# Fix linkage related to forkpty (in utils/textclient.c)
+Patch33: xscreensaver-5.16-ptylink.patch
#
# driver/test-passwd tty segfaults
Patch41: xscreensaver-5.12-test-passwd-segv-tty.patch
@@ -275,17 +259,10 @@ This package contains some test programs to debug XScreenSaver.
%patch1 -p1 -b .sanitize-hacks
%patch21 -p1 -b .nonet
%patch32 -p1 -b .dpmsoff_japo
-%patch33 -p1 -b .chomp
-%patch34 -p1 -b .relative
-%patch35 -p1 -b .pair
-%patch36 -p1 -b .feedurl
-%patch37 -p1 -b .usermod
+%patch33 -p1 -b .pty
%patch41 -p1 -b .test_passwd
%patch42 -p1 -b .test_misc
-# new xscreensaver-getimage-file by jwz
-install -cpm 0755 -b --suffix=.jwz %{SOURCE13} driver/
-
change_option(){
set +x
ADFILE=$1
@@ -834,6 +811,9 @@ exit 0
%defattr(-,root,root,-)
%changelog
+* Thu Jun 21 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.16-1
+- Update to 5.16
+
* Mon Jun 18 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.15-10
- Enable account type pam validation on F-18+ (debian bug 656766)
- Try new xscreensaver-getimage-file from jwz
More information about the scm-commits
mailing list