[arch-commits] Commit in xscreensaver/trunk (2 files)

[Eric Bélanger]

    Date: Monday, November 24, 2014 @ 22:35:07
  Author: eric
Revision: 227068

upgpkg: xscreensaver 5.32-1

Upstream update, Remove old patch

Modified:
  xscreensaver/trunk/PKGBUILD
Deleted:
  xscreensaver/trunk/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch

----------------------------------------------------------+
 PKGBUILD                                                 |   11 +--
 xscreensaver-5.31-1001-binaryring.c-include-stdint.patch |   36 -------------
 2 files changed, 4 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-24 20:45:48 UTC (rev 227067)
+++ PKGBUILD	2014-11-24 21:35:07 UTC (rev 227068)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=xscreensaver
-pkgver=5.31
+pkgver=5.32
 pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System"
 arch=('i686' 'x86_64')
@@ -13,17 +13,14 @@
 optdepends=('gdm: for login manager support')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
-        xscreensaver-add-electricsheep.diff LICENSE
-	xscreensaver-5.31-1001-binaryring.c-include-stdint.patch)
-sha1sums=('1b023a3b01f1f23aa136d13c37f79c0c01c3f1e6'
+        xscreensaver-add-electricsheep.diff LICENSE)
+sha1sums=('3131d45295b9a18a2901737c9b95f1c5434f53a6'
           'e8dc57b6471fb3867ee099304ac6bf628351cb98'
-          '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2'
-          '5a91e707f6482a3349609e8016b7668e3cd53161')
+          '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
 
 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() {

Deleted: xscreensaver-5.31-1001-binaryring.c-include-stdint.patch
===================================================================
--- xscreensaver-5.31-1001-binaryring.c-include-stdint.patch	2014-11-24 20:45:48 UTC (rev 227067)
+++ xscreensaver-5.31-1001-binaryring.c-include-stdint.patch	2014-11-24 21:35:07 UTC (rev 227068)
@@ -1,36 +0,0 @@
-From 3b9f847b4692d34f966af368a63d03887be11a79 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka at 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
-