summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-11-20 11:03:34 +0000
committerJeroen Roovers <jer@gentoo.org>2014-11-20 11:03:34 +0000
commit03b791ce765b533930a6b5e103b6fba294154a44 (patch)
tree5b330bf3bb52f7b6660c6a5e9120fb9664872fe8 /x11-misc/xscreensaver
parentProxy commit for Emil Karlson. Fix x86-32 build failure on linux-3.17. See bu... (diff)
downloadgentoo-2-03b791ce765b533930a6b5e103b6fba294154a44.tar.gz
gentoo-2-03b791ce765b533930a6b5e103b6fba294154a44.tar.bz2
gentoo-2-03b791ce765b533930a6b5e103b6fba294154a44.zip
Version bump.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-misc/xscreensaver')
-rw-r--r--x11-misc/xscreensaver/ChangeLog8
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.31-uint32_t.patch10
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.32.ebuild (renamed from x11-misc/xscreensaver/xscreensaver-5.31.ebuild)5
3 files changed, 9 insertions, 14 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index b1edb13509ae..4480fe89d589 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-misc/xscreensaver
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.381 2014/11/17 12:19:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.382 2014/11/20 11:03:34 jer Exp $
+
+*xscreensaver-5.32 (20 Nov 2014)
+
+ 20 Nov 2014; Jeroen Roovers <jer@gentoo.org> -xscreensaver-5.31.ebuild,
+ +xscreensaver-5.32.ebuild, -files/xscreensaver-5.31-uint32_t.patch:
+ Version bump.
*xscreensaver-5.31 (17 Nov 2014)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.31-uint32_t.patch b/x11-misc/xscreensaver/files/xscreensaver-5.31-uint32_t.patch
deleted file mode 100644
index 2f539b5c866f..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.31-uint32_t.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/hacks/binaryring.c
-+++ b/hacks/binaryring.c
-@@ -23,6 +23,7 @@
- * implied warranty.
- */
-
-+#include <stdint.h> /* uint32_t */
- #include "screenhack.h"
- #include "colors.h"
- #include "hsv.h"
diff --git a/x11-misc/xscreensaver/xscreensaver-5.31.ebuild b/x11-misc/xscreensaver/xscreensaver-5.32.ebuild
index ff6a25336e28..bbc3cc645565 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.31.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.32.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.31.ebuild,v 1.1 2014/11/17 12:19:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.32.ebuild,v 1.1 2014/11/20 11:03:34 jer Exp $
EAPI=5
inherit autotools eutils flag-o-matic multilib pam
@@ -82,8 +82,7 @@ src_prepare() {
"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
"${FILESDIR}"/${PN}-5.28-comment-style.patch \
- "${FILESDIR}"/${PN}-5.31-pragma.patch \
- "${FILESDIR}"/${PN}-5.31-uint32_t.patch
+ "${FILESDIR}"/${PN}-5.31-pragma.patch
epatch_user