Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre

3 files changed, 50 insertions, 11 deletions

diff --git a/libre/xscreensaver/PKGBUILD b/libre/xscreensaver/PKGBUILD
index 17f6a3284..b112658d5 100644
--- a/libre/xscreensaver/PKGBUILD
+++ b/libre/xscreensaver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 221813 2014-09-17 00:15:06Z eric $
+# $Id: PKGBUILD 226367 2014-11-18 18:55:57Z eric $
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=xscreensaver-libre
 pkgname=xscreensaver
-pkgver=5.30
+_pkgname=$pkgname-libre
+pkgver=5.31
 pkgrel=1.parabola1
 pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,11 +18,13 @@ 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)
-mksha1sums=('734e0861145ec67cb848348fc25ea29393dc4d95')
-sha1sums=('a19f632c67ec79e1cd9bf58bc1a1eb96c835b9bd'
+        xscreensaver-add-electricsheep.diff LICENSE
+	xscreensaver-5.31-1001-binaryring.c-include-stdint.patch)
+mksha1sums=('1b023a3b01f1f23aa136d13c37f79c0c01c3f1e6')
+sha1sums=('c2fbf24fee740938b2c6437b01a038e96bbd10c3'
           'e8dc57b6471fb3867ee099304ac6bf628351cb98'
-          '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
+          '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2'
+          '5a91e707f6482a3349609e8016b7668e3cd53161')
 
 mksource() {
   cd ${pkgname}-${pkgver}
@@ -34,6 +36,7 @@ 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
new file mode 100644
index 000000000..13f1f01b7
--- /dev/null
+++ b/libre/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 <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
+
diff --git a/nonprism/duplicity/PKGBUILD b/nonprism/duplicity/PKGBUILD
index 208891712..d917cec8e 100644
--- a/nonprism/duplicity/PKGBUILD
+++ b/nonprism/duplicity/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 121163 2014-10-21 19:14:35Z lfleischer $
+# $Id: PKGBUILD 122567 2014-11-14 10:39:15Z lfleischer $
 # Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor (Arch): Kaiting Chen <kaitocracy@gmail.com>
 # Contributor (Arch): Aaron Schaefer <aaron@elasticdog.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=duplicity
-pkgver=0.6.25
+pkgver=0.7.0
 pkgrel=1.nonprism1
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-boto and python2-gdata recommendation'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,8 +19,8 @@ optdepends=('lftp: FTPS backend'
             'python2-gobject: GIO backend'
             'gvfs: GIO backend'
             'rsync: rsync backend')
-source=("https://launchpad.net/$pkgname/0.6-series/$pkgver/+download/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('bf5aa7f09f8c96e732dd870c0abf5bbf'
+source=("https://launchpad.net/$pkgname/0.7-series/${pkgver}0/+download/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('1408856ecdfc2ec7fcf7e384fd87384d'
          'SKIP')
 
 build() {