diff --git a/xscreensaver/.footprint b/xscreensaver/.footprint index 8b4a216d3..ff243f54f 100644 --- a/xscreensaver/.footprint +++ b/xscreensaver/.footprint @@ -26,6 +26,7 @@ drwxr-xr-x root/root usr/lib/xscreensaver/ -rwxr-xr-x root/root usr/lib/xscreensaver/attraction -rwxr-xr-x root/root usr/lib/xscreensaver/atunnel -rwxr-xr-x root/root usr/lib/xscreensaver/barcode +-rwxr-xr-x root/root usr/lib/xscreensaver/binaryring -rwxr-xr-x root/root usr/lib/xscreensaver/blaster -rwxr-xr-x root/root usr/lib/xscreensaver/blinkbox -rwxr-xr-x root/root usr/lib/xscreensaver/blitspin @@ -44,6 +45,7 @@ drwxr-xr-x root/root usr/lib/xscreensaver/ -rwxr-xr-x root/root usr/lib/xscreensaver/ccurve -rwxr-xr-x root/root usr/lib/xscreensaver/celtic -rwxr-xr-x root/root usr/lib/xscreensaver/circuit +-rwxr-xr-x root/root usr/lib/xscreensaver/cityflow -rwxr-xr-x root/root usr/lib/xscreensaver/cloudlife -rwxr-xr-x root/root usr/lib/xscreensaver/companioncube -rwxr-xr-x root/root usr/lib/xscreensaver/compass @@ -85,6 +87,7 @@ drwxr-xr-x root/root usr/lib/xscreensaver/ -rwxr-xr-x root/root usr/lib/xscreensaver/galaxy -rwxr-xr-x root/root usr/lib/xscreensaver/gears -rwxr-xr-x root/root usr/lib/xscreensaver/geodesic +-rwxr-xr-x root/root usr/lib/xscreensaver/geodesicgears -rwxr-xr-x root/root usr/lib/xscreensaver/gflux -rwxr-xr-x root/root usr/lib/xscreensaver/glblur -rwxr-xr-x root/root usr/lib/xscreensaver/glcells @@ -212,6 +215,7 @@ drwxr-xr-x root/root usr/lib/xscreensaver/ -rwxr-xr-x root/root usr/lib/xscreensaver/webcollage -rwxr-xr-x root/root usr/lib/xscreensaver/webcollage-helper -rwxr-xr-x root/root usr/lib/xscreensaver/whirlwindwarp +-rwxr-xr-x root/root usr/lib/xscreensaver/winduprobot -rwxr-xr-x root/root usr/lib/xscreensaver/wormhole -rwxr-xr-x root/root usr/lib/xscreensaver/xanalogtv -rwxr-xr-x root/root usr/lib/xscreensaver/xflame @@ -243,6 +247,7 @@ drwxr-xr-x root/root usr/man/man6/ -rw-r--r-- root/root usr/man/man6/attraction.6.gz -rw-r--r-- root/root usr/man/man6/atunnel.6.gz -rw-r--r-- root/root usr/man/man6/barcode.6.gz +-rw-r--r-- root/root usr/man/man6/binaryring.6.gz -rw-r--r-- root/root usr/man/man6/blaster.6.gz -rw-r--r-- root/root usr/man/man6/blinkbox.6.gz -rw-r--r-- root/root usr/man/man6/blitspin.6.gz @@ -261,6 +266,7 @@ drwxr-xr-x root/root usr/man/man6/ -rw-r--r-- root/root usr/man/man6/ccurve.6.gz -rw-r--r-- root/root usr/man/man6/celtic.6.gz -rw-r--r-- root/root usr/man/man6/circuit.6.gz +-rw-r--r-- root/root usr/man/man6/cityflow.6.gz -rw-r--r-- root/root usr/man/man6/cloudlife.6.gz -rw-r--r-- root/root usr/man/man6/companioncube.6.gz -rw-r--r-- root/root usr/man/man6/compass.6.gz @@ -303,6 +309,7 @@ drwxr-xr-x root/root usr/man/man6/ -rw-r--r-- root/root usr/man/man6/galaxy.6.gz -rw-r--r-- root/root usr/man/man6/gears.6.gz -rw-r--r-- root/root usr/man/man6/geodesic.6.gz +-rw-r--r-- root/root usr/man/man6/geodesicgears.6.gz -rw-r--r-- root/root usr/man/man6/gflux.6.gz -rw-r--r-- root/root usr/man/man6/glblur.6.gz -rw-r--r-- root/root usr/man/man6/glcells.6.gz @@ -427,6 +434,7 @@ drwxr-xr-x root/root usr/man/man6/ -rw-r--r-- root/root usr/man/man6/wander.6.gz -rw-r--r-- root/root usr/man/man6/webcollage.6.gz -rw-r--r-- root/root usr/man/man6/whirlwindwarp.6.gz +-rw-r--r-- root/root usr/man/man6/winduprobot.6.gz -rw-r--r-- root/root usr/man/man6/wormhole.6.gz -rw-r--r-- root/root usr/man/man6/xanalogtv.6.gz -rw-r--r-- root/root usr/man/man6/xflame.6.gz @@ -457,6 +465,7 @@ drwxr-xr-x root/root usr/share/xscreensaver/config/ -rw-r--r-- root/root usr/share/xscreensaver/config/attraction.xml -rw-r--r-- root/root usr/share/xscreensaver/config/atunnel.xml -rw-r--r-- root/root usr/share/xscreensaver/config/barcode.xml +-rw-r--r-- root/root usr/share/xscreensaver/config/binaryring.xml -rw-r--r-- root/root usr/share/xscreensaver/config/blaster.xml -rw-r--r-- root/root usr/share/xscreensaver/config/blinkbox.xml -rw-r--r-- root/root usr/share/xscreensaver/config/blitspin.xml @@ -475,6 +484,7 @@ drwxr-xr-x root/root usr/share/xscreensaver/config/ -rw-r--r-- root/root usr/share/xscreensaver/config/ccurve.xml -rw-r--r-- root/root usr/share/xscreensaver/config/celtic.xml -rw-r--r-- root/root usr/share/xscreensaver/config/circuit.xml +-rw-r--r-- root/root usr/share/xscreensaver/config/cityflow.xml -rw-r--r-- root/root usr/share/xscreensaver/config/cloudlife.xml -rw-r--r-- root/root usr/share/xscreensaver/config/companioncube.xml -rw-r--r-- root/root usr/share/xscreensaver/config/compass.xml @@ -516,6 +526,7 @@ drwxr-xr-x root/root usr/share/xscreensaver/config/ -rw-r--r-- root/root usr/share/xscreensaver/config/galaxy.xml -rw-r--r-- root/root usr/share/xscreensaver/config/gears.xml -rw-r--r-- root/root usr/share/xscreensaver/config/geodesic.xml +-rw-r--r-- root/root usr/share/xscreensaver/config/geodesicgears.xml -rw-r--r-- root/root usr/share/xscreensaver/config/gflux.xml -rw-r--r-- root/root usr/share/xscreensaver/config/glblur.xml -rw-r--r-- root/root usr/share/xscreensaver/config/glcells.xml @@ -641,6 +652,7 @@ drwxr-xr-x root/root usr/share/xscreensaver/config/ -rw-r--r-- root/root usr/share/xscreensaver/config/wander.xml -rw-r--r-- root/root usr/share/xscreensaver/config/webcollage.xml -rw-r--r-- root/root usr/share/xscreensaver/config/whirlwindwarp.xml +-rw-r--r-- root/root usr/share/xscreensaver/config/winduprobot.xml -rw-r--r-- root/root usr/share/xscreensaver/config/wormhole.xml -rw-r--r-- root/root usr/share/xscreensaver/config/xanalogtv.xml -rw-r--r-- root/root usr/share/xscreensaver/config/xflame.xml diff --git a/xscreensaver/.md5sum b/xscreensaver/.md5sum index 763f3ad3e..88479b9a1 100644 --- a/xscreensaver/.md5sum +++ b/xscreensaver/.md5sum @@ -1 +1,2 @@ -14f9104fa03f85371f885bdad956764d xscreensaver-5.29.tar.gz +effb80cc6bbcc9b3b82fdcc21640de59 xscreensaver-5.31-1001-binaryring.c-include-stdint.patch +edad550c27660f2018927eaf3ca3999c xscreensaver-5.31.tar.gz diff --git a/xscreensaver/Pkgfile b/xscreensaver/Pkgfile index 0c7c0eb5c..2b8324e50 100644 --- a/xscreensaver/Pkgfile +++ b/xscreensaver/Pkgfile @@ -5,12 +5,15 @@ # Depends on: bc fortune libglade giflib intltool netpbm xorg-libxmu glu name=xscreensaver -version=5.29 +version=5.31 release=1 -source=(http://www.jwz.org/$name/$name-$version.tar.gz) +source=(http://www.jwz.org/$name/$name-$version.tar.gz + xscreensaver-5.31-1001-binaryring.c-include-stdint.patch) build() { cd $name-$version + + patch -p1 -i $SRC/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch sed -i configure \ -e 's/USE_NLS=yes/USE_NLS=no/' \ diff --git a/xscreensaver/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch b/xscreensaver/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch new file mode 100644 index 000000000..13f1f01b7 --- /dev/null +++ b/xscreensaver/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch @@ -0,0 +1,36 @@ +From 3b9f847b4692d34f966af368a63d03887be11a79 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Sun, 16 Nov 2014 16:55:48 +0900 +Subject: [PATCH] binaryring.c: include stdint +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On Fedora 21, binaryring.c fails to compile as: + +../../hacks/binaryring.c:40:9: error: unknown type name ‘uint32_t’ + typedef uint32_t pixel_t; + ^ +Makefile:542: recipe for target 'binaryring.o' failed + +Just include stdint.h for this type. +--- + hacks/binaryring.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/hacks/binaryring.c b/hacks/binaryring.c +index 2432073..e3a58d9 100644 +--- a/hacks/binaryring.c ++++ b/hacks/binaryring.c +@@ -27,6 +27,8 @@ + #include "colors.h" + #include "hsv.h" + ++#include ++ + #define ANTIALIAS 1 + #define BLACK 0 + #define WHITE 1 +-- +2.1.0 +