diff options
| -rw-r--r-- | libre/xscreensaver/PKGBUILD | 17 | ||||
| -rw-r--r-- | libre/xscreensaver/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch | 36 |
2 files changed, 7 insertions, 46 deletions
diff --git a/libre/xscreensaver/PKGBUILD b/libre/xscreensaver/PKGBUILD index b112658d5..4e8bd7f85 100644 --- a/libre/xscreensaver/PKGBUILD +++ b/libre/xscreensaver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 226367 2014-11-18 18:55:57Z eric $ +# $Id: PKGBUILD 227068 2014-11-24 21:35:07Z eric $ # Maintainer (Arch): Eric Bélanger <eric@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=xscreensaver _pkgname=$pkgname-libre -pkgver=5.31 +pkgver=5.32 pkgrel=1.parabola1 pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files" arch=('i686' 'x86_64' 'mips64el') @@ -17,14 +17,12 @@ replaces=("${_pkgname}") conflicts=("${_pkgname}") backup=('etc/pam.d/xscreensaver') mksource=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz) -source=(https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz \ - xscreensaver-add-electricsheep.diff LICENSE - xscreensaver-5.31-1001-binaryring.c-include-stdint.patch) -mksha1sums=('1b023a3b01f1f23aa136d13c37f79c0c01c3f1e6') -sha1sums=('c2fbf24fee740938b2c6437b01a038e96bbd10c3' +source=(https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz + xscreensaver-add-electricsheep.diff LICENSE) +mksha1sums=('3131d45295b9a18a2901737c9b95f1c5434f53a6') +sha1sums=('0cab89487b8ad6ae81f6b9563fade4c1d9848504' 'e8dc57b6471fb3867ee099304ac6bf628351cb98' - '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2' - '5a91e707f6482a3349609e8016b7668e3cd53161') + '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2') mksource() { cd ${pkgname}-${pkgver} @@ -36,7 +34,6 @@ mksource() { prepare() { cd ${pkgname}-${pkgver} patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff" - patch -p1 -i "${srcdir}/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch" } build() { diff --git a/libre/xscreensaver/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch b/libre/xscreensaver/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch deleted file mode 100644 index 13f1f01b7..000000000 --- a/libre/xscreensaver/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3b9f847b4692d34f966af368a63d03887be11a79 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA <mtasaka@fedoraproject.org> -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 <stdint.h> -+ - #define ANTIALIAS 1 - #define BLACK 0 - #define WHITE 1 --- -2.1.0 - |