summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Levine <plevine457@gmail.com>2017-06-29 04:05:31 -0400
committerAlexis Ballier <aballier@gentoo.org>2017-06-30 07:32:26 +0200
commit811e5db14f48f6e7a843a2a95222c73f1cb42386 (patch)
treee94552832879175c7cc536da8a40107a575624a3 /media-sound/din
parentwww-apache/mod_wsgi: keyword ~arm64 (diff)
downloadgentoo-811e5db14f48f6e7a843a2a95222c73f1cb42386.tar.gz
gentoo-811e5db14f48f6e7a843a2a95222c73f1cb42386.tar.bz2
gentoo-811e5db14f48f6e7a843a2a95222c73f1cb42386.zip
media-sound/din: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=594996 Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'media-sound/din')
-rw-r--r--media-sound/din/din-5.2.1.ebuild3
-rw-r--r--media-sound/din/files/fix-random-constants.patch30
2 files changed, 32 insertions, 1 deletions
diff --git a/media-sound/din/din-5.2.1.ebuild b/media-sound/din/din-5.2.1.ebuild
index 4e825cf206f6..592a773fe05f 100644
--- a/media-sound/din/din-5.2.1.ebuild
+++ b/media-sound/din/din-5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -28,6 +28,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-makefile.patch
epatch "${FILESDIR}"/${P}-tcl.patch
epatch "${FILESDIR}"/${P}-desktop.patch
+ epatch "${FILESDIR}"/fix-random-constants.patch
# force script to be regenerated so it uses the right data path
rm data/checkdotdin || die
diff --git a/media-sound/din/files/fix-random-constants.patch b/media-sound/din/files/fix-random-constants.patch
new file mode 100644
index 000000000000..f055b10140d6
--- /dev/null
+++ b/media-sound/din/files/fix-random-constants.patch
@@ -0,0 +1,30 @@
+Description: Redefine some constants in include/random.h as unsigned
+ These constants are used with unsigned variables, so redefine them
+ for consistency.
+ .
+ This also fixes compilation errors under C++11: In C++11, array initialization
+ is considered list initialization and so prohibits narrowing conversions
+ (from negative signed values to unsigned).
+Author: Philip Chung <philipchung1995@yahoo.com>
+Bug-Debian: https://bugs.debian.org/811778
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ include/random.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- din-5.2.1.orig/include/random.h
++++ din-5.2.1/include/random.h
+@@ -28,9 +28,9 @@
+
+ const int N = 624;
+ const int M = 397;
+-const int MATRIX_A = 0x9908b0df; /* constant vector a */
+-const int UPPER_MASK = 0x80000000; /* most significant w-r bits */
+-const int LOWER_MASK = 0x7fffffff; /* least significant r bits */
++const unsigned int MATRIX_A = 0x9908b0df; /* constant vector a */
++const unsigned int UPPER_MASK = 0x80000000; /* most significant w-r bits */
++const unsigned int LOWER_MASK = 0x7fffffff; /* least significant r bits */
+
+ static unsigned int mt[N]; /* the array for the state vector */
+ static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */