[xscreensaver] Update to 5.27
Mamoru TASAKA
mtasaka at fedoraproject.org
Wed May 28 09:20:58 UTC 2014
commit 772718942bd11e3e3cb2e6a5152ef89efa7ffb1d
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Wed May 28 18:20:54 2014 +0900
Update to 5.27
.gitignore | 1 +
sources | 2 +-
...erver_dpms_settings-consistent-for-dpms_q.patch | 145 --------------------
...-5.26-0001-Kill-memleak-on-goop-on-resize.patch | 108 ---------------
...2.c-shut-down-error-message-from-cppcheck.patch | 29 ----
...k.c-shut-down-error-message-from-cppcheck.patch | 40 ------
...2.c-shut-down-error-message-from-cppcheck.patch | 33 -----
...c-shut-down-warning-message-from-cppcheck.patch | 35 -----
...6-0006-ya_rand_init-make-integer-unsigned.patch | 29 ----
...07-analyze_display-prevent-oversize-shift.patch | 34 -----
...08-apple2-wait-loading-image-when-timeout.patch | 60 --------
...0009-a2_goto-apple.2-fix-clipping-handing.patch | 26 ----
...dle-the-case-0-length-string-or-too-long-.patch | 86 ------------
...ix-fix-one-byte-ahead-access-in-hack_text.patch | 26 ----
...n-MoveShadeBob-set-some-marginal-value-fo.patch | 34 -----
...rusion-twistoid-fix-one-byte-ahead-access.patch | 29 ----
...ile.in-add-thread-related-flags-correctly.patch | 68 +++++++++
...aunay-don-t-use-double-backslash-comments.patch | 30 ++++
...r-Makefile.in-readd-INTLTOOL_DESKTOP_RULE.patch | 29 ++++
...le.in.in-add-comments-after-POTFILES-line.patch | 26 ++++
...-add-skeleten-definition-for-reset_watchd.patch | 27 ++++
xscreensaver.spec | 55 +++-----
22 files changed, 205 insertions(+), 747 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 186ca0d..0c30310 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ clog
/xscreensaver-5.22.tar.gz
/xscreensaver-5.23.tar.gz
/xscreensaver-5.26.tar.gz
+/xscreensaver-5.27.tar.gz
diff --git a/sources b/sources
index 95e4c63..3985b36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd4390f36b9c9d79b66d18b145ca62ad xscreensaver-5.26.tar.gz
+42582268cf7db0a12836a3240c83726e xscreensaver-5.27.tar.gz
diff --git a/xscreensaver-5.27-0001-hacks-Makefile.in-add-thread-related-flags-correctly.patch b/xscreensaver-5.27-0001-hacks-Makefile.in-add-thread-related-flags-correctly.patch
new file mode 100644
index 0000000..21db111
--- /dev/null
+++ b/xscreensaver-5.27-0001-hacks-Makefile.in-add-thread-related-flags-correctly.patch
@@ -0,0 +1,68 @@
+From 167e5b7297b8c5d7f0f4cdedc19e3a54bc5868a0 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Wed, 28 May 2014 15:38:17 +0900
+Subject: [PATCH 1/2] hacks/Makefile.in: add thread related flags correctly
+
+xanalogtv related hacks now needs pthread related cflags / ldflags.
+Add this correctly.
+---
+ hacks/Makefile.in | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/hacks/Makefile.in b/hacks/Makefile.in
+index a98b1a5..697e8cf 100644
+--- a/hacks/Makefile.in
++++ b/hacks/Makefile.in
+@@ -31,6 +31,9 @@ DEFS = -DSTANDALONE @DEFS@
+ LIBS = @LIBS@
+ PERL = @PERL@
+
++THREAD_LIBS = @PTHREAD_LIBS@
++THREAD_CFLAGS = @PTHREAD_CFLAGS@
++
+ DEPEND = @DEPEND@
+ DEPEND_FLAGS = @DEPEND_FLAGS@
+ DEPEND_DEFINES = @DEPEND_DEFINES@
+@@ -661,7 +664,7 @@ epicycle: epicycle.o $(HACK_OBJS) $(COL) $(ERASE)
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(ERASE) $(HACK_LIBS)
+
+ interference: interference.o $(HACK_OBJS) $(COL) $(SHM) $(DBE) $(THRD)
+- $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(SHM) $(DBE) $(THRD) $(HACK_LIBS)
++ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(SHM) $(DBE) $(THRD) $(HACK_LIBS) $(THREAD_CFLAGS) $(THREAD_LIBS)
+
+ truchet: truchet.o $(HACK_OBJS) $(COL)
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS)
+@@ -670,10 +673,10 @@ bsod: bsod.o $(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM)
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(XPM_LIBS)
+
+ apple2: apple2.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT)
+- $(CC_HACK) -o $@ $@.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS)
++ $(CC_HACK) -o $@ $@.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS) $(THREAD_CFLAGS) $(THREAD_LIBS)
+
+ xanalogtv: xanalogtv.o $(HACK_OBJS) $(ATV) $(GRAB) $(XPM)
+- $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS)
++ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS) $(THREAD_CFLAGS) $(THREAD_LIBS)
+
+ distort: distort.o $(HACK_OBJS) $(GRAB) $(SHM)
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB) $(SHM) $(HACK_LIBS)
+@@ -796,7 +799,7 @@ fontglide: fontglide.o $(HACK_OBJS) $(DBE) $(TEXT)
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(DBE) $(TEXT) $(HACK_LIBS) $(TEXT_LIBS)
+
+ pong: pong.o $(HACK_OBJS) $(ATV) $(GRAB) $(XPM)
+- $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS)
++ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS) $(THREAD_CFLAGS) $(THREAD_LIBS)
+
+ wormhole: wormhole.o $(HACK_OBJS)
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS)
+@@ -841,7 +844,7 @@ m6502.h:
+
+ m6502.o: m6502.h
+ m6502: m6502.o asm6502.o $(HACK_OBJS) $(ATV)
+- $(CC_HACK) -o $@ $@.o asm6502.o $(HACK_OBJS) $(ATV) $(HACK_LIBS)
++ $(CC_HACK) -o $@ $@.o asm6502.o $(HACK_OBJS) $(ATV) $(HACK_LIBS) $(THREAD_CFLAGS) $(THREAD_LIBS)
+
+ abstractile: abstractile.o $(HACK_OBJS) $(COL)
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS)
+--
+1.9.3
+
diff --git a/xscreensaver-5.27-0002-delaunay-don-t-use-double-backslash-comments.patch b/xscreensaver-5.27-0002-delaunay-don-t-use-double-backslash-comments.patch
new file mode 100644
index 0000000..1afffac
--- /dev/null
+++ b/xscreensaver-5.27-0002-delaunay-don-t-use-double-backslash-comments.patch
@@ -0,0 +1,30 @@
+From d209a09ad79761889363b14f379cce18716550b1 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Wed, 28 May 2014 15:39:35 +0900
+Subject: [PATCH 2/2] delaunay: don't use double-backslash comments
+
+gcc -std=c89 makes double-backslash comments an error, so wrap this
+with c89-supported comments
+---
+ hacks/delaunay.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hacks/delaunay.c b/hacks/delaunay.c
+index e57e77b..a9d3de5 100644
+--- a/hacks/delaunay.c
++++ b/hacks/delaunay.c
+@@ -87,9 +87,11 @@ circumcircle (double xp,double yp,
+ dy = yp - *yc;
+ drsqr = dx*dx + dy*dy;
+
++ /*
+ // Original
+ //return((drsqr <= *rsqr) ? TRUE : FALSE);
+ // Proposed by Chuck Morris
++ */
+ return((drsqr - *rsqr) <= EPSILON ? TRUE : FALSE);
+ }
+
+--
+1.9.3
+
diff --git a/xscreensaver-5.27-0003-driver-Makefile.in-readd-INTLTOOL_DESKTOP_RULE.patch b/xscreensaver-5.27-0003-driver-Makefile.in-readd-INTLTOOL_DESKTOP_RULE.patch
new file mode 100644
index 0000000..59111b0
--- /dev/null
+++ b/xscreensaver-5.27-0003-driver-Makefile.in-readd-INTLTOOL_DESKTOP_RULE.patch
@@ -0,0 +1,29 @@
+From 5573a905f2a1167765f04527c34819640ab1eff9 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Wed, 28 May 2014 16:27:47 +0900
+Subject: [PATCH] driver/Makefile.in: readd INTLTOOL_DESKTOP_RULE
+
+Installation fails with
+make[1]: *** No rule to make target `screensaver-properties.desktop', needed by `install-gnome'. Stop.
+Note that non-GNOME desktop environment still make use of this file.
+---
+ driver/Makefile.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/driver/Makefile.in b/driver/Makefile.in
+index c8317be..c1e9063 100644
+--- a/driver/Makefile.in
++++ b/driver/Makefile.in
+@@ -771,8 +771,7 @@ XScreenSaver_ad.h: XScreenSaver.ad
+ XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
+ $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h
+
+-# What was this for? Now it's undefined.
+-# @INTLTOOL_DESKTOP_RULE@
++ at INTLTOOL_DESKTOP_RULE@
+
+ # The executables linked in this directory.
+ #
+--
+1.9.3
+
diff --git a/xscreensaver-5.27-0004-po-Makefile.in.in-add-comments-after-POTFILES-line.patch b/xscreensaver-5.27-0004-po-Makefile.in.in-add-comments-after-POTFILES-line.patch
new file mode 100644
index 0000000..b8bbafb
--- /dev/null
+++ b/xscreensaver-5.27-0004-po-Makefile.in.in-add-comments-after-POTFILES-line.patch
@@ -0,0 +1,26 @@
+From 5ba95fa1b60287b4f85cb3fb060b95c5b4de84f4 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Wed, 28 May 2014 17:52:49 +0900
+Subject: [PATCH] po/Makefile.in.in: add comments after POTFILES line
+
+With recent intltool, the next line of POTFILES line is stripped out
+without comments, so just add a comment...
+---
+ po/Makefile.in.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/po/Makefile.in.in b/po/Makefile.in.in
+index 8fc246c..28d9313 100644
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
+@@ -151,6 +151,7 @@ DISTFILES = $(DISTFILES_1) $(GETTEXT_PACKAGE).pot \
+ TARFILES = $(DISTFILES_1) $(POFILES) $(SOURCES)
+
+ POTFILES = \
++# This comment gets stripped out
+
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+--
+1.9.3
+
diff --git a/xscreensaver-5.27-1001-test-passwd-add-skeleten-definition-for-reset_watchd.patch b/xscreensaver-5.27-1001-test-passwd-add-skeleten-definition-for-reset_watchd.patch
new file mode 100644
index 0000000..9139176
--- /dev/null
+++ b/xscreensaver-5.27-1001-test-passwd-add-skeleten-definition-for-reset_watchd.patch
@@ -0,0 +1,27 @@
+From e57fd5f1da0e5efb968ef72e0b80e15ebe0dce8e Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Wed, 28 May 2014 16:08:15 +0900
+Subject: [PATCH] test-passwd: add skeleten definition for reset_watchdog_timer
+
+Now lock.c needs reset_watchdog_timer definition. for test-passwd,
+just use skeleton definition
+---
+ driver/test-passwd.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/driver/test-passwd.c b/driver/test-passwd.c
+index 66cd3d4..0745274 100644
+--- a/driver/test-passwd.c
++++ b/driver/test-passwd.c
+@@ -80,6 +80,8 @@ idle_timer (XtPointer closure, XtIntervalId *id)
+ XPutBackEvent (si->dpy, &fake_event);
+ }
+
++/* Add fake function */
++void reset_watchdog_timer(saver_info *si, Bool on_p){}
+
+ static int
+ text_auth_conv (
+--
+1.9.3
+
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 22f9598..20e015e 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
%define name xscreensaver
-%define mainversion 5.26
+%define mainversion 5.27
%define beta_ver %{nil}
@@ -10,7 +10,7 @@
%define split_getimage 1
%endif
-%define fedora_rel 7
+%define fedora_rel 1
%global use_clang_analyze 0
%global use_cppcheck 0
@@ -68,30 +68,21 @@ Patch32: xscreensaver-5.13-dpmsQuickoff-japo.patch
Patch51: xscreensaver-5.12-test-passwd-segv-tty.patch
# patch to compile driver/test-xdpms
Patch52: xscreensaver-5.12-tests-miscfix.patch
+# Fix test-passwd compilation for lock.c change
+Patch61: xscreensaver-5.27-1001-test-passwd-add-skeleten-definition-for-reset_watchd.patch
#
## Patches which must be discussed with upstream
+# Patch for hacks under hacks/ using pthread
+Patch101: xscreensaver-5.27-0001-hacks-Makefile.in-add-thread-related-flags-correctly.patch
+# c89 compilation for delauary
+Patch102: xscreensaver-5.27-0002-delaunay-don-t-use-double-backslash-comments.patch
+# desktop file installation
+Patch103: xscreensaver-5.27-0003-driver-Makefile.in-readd-INTLTOOL_DESKTOP_RULE.patch
+# Recent intltool needs this
+Patch104: xscreensaver-5.27-0004-po-Makefile.in.in-add-comments-after-POTFILES-line.patch
# Patch with git format-patch format
-# Make sync_server_dpms_settings consistent for dpms_quickoff_p option
-# (bug 1047108)
-Patch100: xscreensaver-5.26-0000-make-sync_server_dpms_settings-consistent-for-dpms_q.patch
-# Kill memleak on goop
-Patch101: xscreensaver-5.26-0001-Kill-memleak-on-goop-on-resize.patch
# Shut down cppcheck error / warning messages
-Patch102: xscreensaver-5.26-0002-asm6502.c-shut-down-error-message-from-cppcheck.patch
-Patch103: xscreensaver-5.26-0003-demo-Gtk.c-shut-down-error-message-from-cppcheck.patch
-Patch104: xscreensaver-5.26-0004-asm6502.c-shut-down-error-message-from-cppcheck.patch
-Patch105: xscreensaver-5.26-0005-splash.c-shut-down-warning-message-from-cppcheck.patch
-# Patch100-105, all sent
# Shutdown gcc fsanitize error
-Patch106: xscreensaver-5.26-0006-ya_rand_init-make-integer-unsigned.patch
-Patch107: xscreensaver-5.26-0007-analyze_display-prevent-oversize-shift.patch
-Patch108: xscreensaver-5.26-0008-apple2-wait-loading-image-when-timeout.patch
-Patch109: xscreensaver-5.26-0009-a2_goto-apple.2-fix-clipping-handing.patch
-Patch110: xscreensaver-5.26-0010-noseguy-handle-the-case-0-length-string-or-too-long-.patch
-Patch111: xscreensaver-5.26-0011-xmatrix-fix-one-byte-ahead-access-in-hack_text.patch
-Patch112: xscreensaver-5.26-0012-shadebobs-in-MoveShadeBob-set-some-marginal-value-fo.patch
-#Patch106-112: all sent
-Patch113: xscreensaver-5.26-0013-extrusion-twistoid-fix-one-byte-ahead-access.patch
# Patches end
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -114,6 +105,7 @@ BuildRequires: libubsan
%endif
BuildRequires: git
BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: bc
BuildRequires: desktop-file-utils
BuildRequires: gawk
@@ -310,6 +302,8 @@ cat > .gitignore <<EOF
configure
config.guess
config.sub
+aclocal.m4
+config.h.in
EOF
%__git init
%__git config user.email "xscreensaver-owner at fedoraproject.org"
@@ -325,20 +319,11 @@ EOF
%__git commit -m "Base patches committed" -a
-cat %PATCH100 | %__git am
+cat %PATCH61 | %__git am
cat %PATCH101 | %__git am
cat %PATCH102 | %__git am
cat %PATCH103 | %__git am
cat %PATCH104 | %__git am
-cat %PATCH105 | %__git am
-cat %PATCH106 | %__git am
-cat %PATCH107 | %__git am
-cat %PATCH108 | %__git am
-cat %PATCH109 | %__git am
-cat %PATCH110 | %__git am
-cat %PATCH111 | %__git am
-cat %PATCH112 | %__git am
-cat %PATCH113 | %__git am
change_option(){
set +x
@@ -471,6 +456,7 @@ sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
%__git commit -m "Misc confuguration for Fedora" -a
+aclocal
autoconf
autoheader
@@ -539,7 +525,9 @@ ln -s ../configure .
rm -f configure
%if %{update_po}
-( cd po ; make generate_potfiles_in update-po )
+#( cd po ; make generate_potfiles_in update-po )
+# ???
+( cd po ; make generate_potfiles_in ; cp -p POTFILES.in .. ; export srcdir=.. ; make update-po ; rm -f ../POTFILES_in )
%endif
%if 0%{?use_clang_analyze} >= 1
@@ -944,6 +932,9 @@ exit 0
%endif
%changelog
+* Wed May 28 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.27-1
+- Update to 5.27
+
* Mon May 5 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.26-7
- Yet another segv fix (for extrusion), detected by
gcc49 -fsanitize=address
More information about the scm-commits
mailing list