Gentoo Archives: gentoo-commits

From: Alessandro Barbieri <lssndrbarbieri@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-octave/quaternion/files/, dev-octave/quaternion/
Date: Tue, 10 May 2022 00:21:36
Message-Id: 1652142090.decb9691ca5461e2d6a3386a09947a01044eb6cb.Alessandro-Barbieri@gentoo
1 commit: decb9691ca5461e2d6a3386a09947a01044eb6cb
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Tue May 10 00:20:53 2022 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Tue May 10 00:21:30 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=decb9691
7
8 dev-octave/quaternion: add patch from debian
9
10 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
11
12 .../quaternion-2.4.0-build-against-octave-6.patch | 23 ++++++++++++++++++++++
13 dev-octave/quaternion/quaternion-2.4.0.ebuild | 2 ++
14 2 files changed, 25 insertions(+)
15
16 diff --git a/dev-octave/quaternion/files/quaternion-2.4.0-build-against-octave-6.patch b/dev-octave/quaternion/files/quaternion-2.4.0-build-against-octave-6.patch
17 new file mode 100644
18 index 000000000..756f872dc
19 --- /dev/null
20 +++ b/dev-octave/quaternion/files/quaternion-2.4.0-build-against-octave-6.patch
21 @@ -0,0 +1,23 @@
22 +Description: Build against Octave 6.1
23 + Replace deprecated methods is_numeric_type, is_real_type, and
24 + is_bool_type by isnumeric, isreal, and islogical, respectively.
25 +Author: Rafael Laboissière <rafael@××××××.org>
26 +Origin: other, https://hg.octave.org/mxe-octave/file/tip/src/of-quaternion-2-dev-fixes.patch
27 +Bug: https://savannah.gnu.org/bugs/?59163
28 +Bug-Debian: https://bugs.debian.org/976203
29 +Forwarded: not-needed
30 +Last-Update: 2020-12-01
31 +
32 +--- octave-quaternion-2.4.0.orig/src/is_real_array.cc
33 ++++ octave-quaternion-2.4.0/src/is_real_array.cc
34 +@@ -46,8 +46,8 @@ Avoid nasty stuff like @code{true = isre
35 + {
36 + // args(i).ndims () should be always >= 2
37 + if (args(i).ndims () < 2
38 +- || ! ((args(i).is_numeric_type () && args(i).is_real_type ())
39 +- || args(i).is_bool_type ()))
40 ++ || ! ((args(i).isnumeric () && args(i).isreal ())
41 ++ || args(i).islogical ()))
42 + {
43 + retval = false;
44 + break;
45
46 diff --git a/dev-octave/quaternion/quaternion-2.4.0.ebuild b/dev-octave/quaternion/quaternion-2.4.0.ebuild
47 index d8ef1a095..c84091f9d 100644
48 --- a/dev-octave/quaternion/quaternion-2.4.0.ebuild
49 +++ b/dev-octave/quaternion/quaternion-2.4.0.ebuild
50 @@ -14,3 +14,5 @@ KEYWORDS="~amd64"
51
52 DEPEND=">=sci-mathematics/octave-3.8.0"
53 RDEPEND="${DEPEND}"
54 +
55 +PATCHES=( "${FILESDIR}/${P}-build-against-octave-6.patch" )