dev-octave/strings: add 1.2.0, drop 1.2.0_p20211128

Closes: https://bugs.gentoo.org/843539
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri
2022-05-12 14:41:27 +02:00
parent 1c284417dc
commit 66a7c2b1d0
4 changed files with 51 additions and 11 deletions

View File

@@ -1 +1 @@
DIST octave-strings-98fa88db1ba85e108655f25b3ca96a821862eb85.zip 22632 BLAKE2B 88349886f16a5cee7f3576e7fbdaf826e3113f5b576c97985cb54c5568afbae5ae6dc84979b9aa62a7589e43bcf76f763caadb40438a16a099a7662cfed7334c SHA512 cfd66f6276ca523c0f9494e3cac7a54d03fdeffbb6dbb63692a7087eac05d625c0481ab44c477116a73ec88687a8221bf5aef2e433399f5c1976d69ce50abe48
DIST strings-1.2.0.tar.gz 8816 BLAKE2B 95e57377394324f0251dbc220f2c7a6286e2838015106df8e68e98a8900cf89cf1905ee11802581b660fe14c654871a0a94918e29ae4e573423d495a69a97a8c SHA512 5635e67796c7f04fe6bf8cd1d39f3aa6d473ceae067b8127edfade936359cea015efe4418a4865b9aacbb254b9c6f4cf0dfd681d7da33d3fa6e5015ec89fdc0f

View File

@@ -0,0 +1,30 @@
Description: Build against Octave 6.1
Replace the calls to the deprecated function toascii by double.
Author: Rafael Laboissière <rafael@debian.org>
Origin: upstream, https://sourceforge.net/p/octave/strings/ci/2db1dbb75557eef94605cb4ac682783ab78ac8d8/
Bug-Debian: https://bugs.debian.org/976200
Forwarded: not-needed
Last-Update: 2020-12-01
--- octave-strings-1.2.0.orig/inst/base64encode.m
+++ octave-strings-1.2.0/inst/base64encode.m
@@ -46,7 +46,7 @@ function Y = base64encode (X, row_vector
endif
if (ischar (X))
- X = toascii (X);
+ X = double (X);
endif
if (any (X != fix (X)) || any (X < 0 | X > 255))
--- octave-strings-1.2.0.orig/inst/base64decode.m
+++ octave-strings-1.2.0/inst/base64decode.m
@@ -60,7 +60,7 @@ function z = base64decode (X, as_string)
Y=[];
end
- X = toascii(X);
+ X = double(X);
Xa= X;
## Work backwards. Starting at step in table,

View File

@@ -0,0 +1,16 @@
Description: Use err_* functions instead of the deprecated gripes_*
Author: Rafael Laboissiere <rafael@debian.org>
Forwarded: https://savannah.gnu.org/bugs/index.php?57000
Last-Update: 2019-10-05
--- octave-strings-1.2.0.orig/src/pcregexp.cc
+++ octave-strings-1.2.0/src/pcregexp.cc
@@ -49,7 +49,7 @@ Check your system's @code{pcre} man page
std::string pattern = args(0).string_value();
std::string input = args(1).string_value();
if (error_state) {
- gripe_wrong_type_arg("pcregexp", args(0));
+ err_wrong_type_arg("pcregexp", args(0));
return retval;
}

View File

@@ -5,12 +5,8 @@ EAPI=8
inherit octaveforge
COMMIT="98fa88db1ba85e108655f25b3ca96a821862eb85"
DESCRIPTION="Additional functions for manipulation and analysis of strings"
HOMEPAGE="https://octave.sourceforge.io/strings/index.html"
SRC_URI="mirror://sourceforge/code-snapshots/hg/o/oc/octave/${PN}/octave-${PN}-${COMMIT}.zip"
S="${WORKDIR}/${PN}"
LICENSE="GPL-3+ BSD-2"
SLOT="0"
@@ -21,10 +17,8 @@ DEPEND="
dev-libs/libpcre
"
RDEPEND="${DEPEND}"
BDEPEND="app-arch/unzip"
src_unpack() {
octaveforge_src_unpack
pushd "${WORKDIR}" || die
mv "octave-${PN}-${COMMIT}" "${PN}" || die
}
PATCHES=(
"${FILESDIR}/${P}-build-against-octave-6.patch"
"${FILESDIR}/${P}-err-instead-of-gripes.patch"
)