Apply patch

2 files changed, 26 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d31be7b32c68..dda3d8ba3a4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = octave-secs2d
 	pkgdesc = A Drift-Diffusion simulator for 2d semiconductor devices
 	pkgver = 0.0.8
-	pkgrel = 4
+	pkgrel = 5
 	url = https://octave.sourceforge.io/secs2d
 	install = octave-secs2d.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index ebcbb3fe30f9..850ef7df47d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 _pack=secs2d
 pkgname=octave-${_pack}
 pkgver=0.0.8
-pkgrel=4
+pkgrel=5
 pkgdesc="A Drift-Diffusion simulator for 2d semiconductor devices"
 arch=(any)
 url="https://octave.sourceforge.io/${_pack}"
@@ -26,46 +26,48 @@ install=${pkgname}.install
 _archive=${_pack}-${pkgver}.tar.gz
 _archive_patched=${_pack}-${pkgver}-patched.tar.gz
 source=("https://downloads.sourceforge.net/octave/${_archive}"
-	"octave_map.patch")
+  "octave_map.patch")
 noextract=("${_archive}")
 sha512sums=('25828a2972e9c5e5572b1fd33ece3546f8089e9fac51b53987491a0d74ca8704aa3caae351719ae2db3fda1a1f343a03a988e3dd2f989f57054623ff9a90ccfe'
-	'd05462dc6cd77c4de6d6983778b9fc1a9e42e6638a6e694a837c7b54981338af42c3faf69aac86a6766b566cc5fdbbde7ed4d71fb6853f45c8f745fd538e193b')
+  'd05462dc6cd77c4de6d6983778b9fc1a9e42e6638a6e694a837c7b54981338af42c3faf69aac86a6766b566cc5fdbbde7ed4d71fb6853f45c8f745fd538e193b')
 
 _octave_run() {
-	octave --no-history --no-init-file --no-window-system -q -f --eval "$*"
+  octave --no-history --no-init-file --no-window-system -q -f --eval "$*"
 }
 
 _install_dir() {
-	src=$1
-	dst=$2
-	mkdir -p "$(dirname "$dst")"
-	cp -rT "$src" "$dst"
+  src=$1
+  dst=$2
+  mkdir -p "$(dirname "$dst")"
+  cp -rT "$src" "$dst"
 }
 
 prepare() {
-	cd "$srcdir"
-	tar xzf "$_archive"
-	patch -Np0 -i octave_map.patch
-	tar czf "$_archive_patched" "$_pack-$pkgver"
+  cd "$srcdir"
+  tar xzf "$_archive"
+  patch -Np0 -i octave_map.patch
+  # https://savannah.gnu.org/bugs/?59606
+  sed -i 's/^  octave_idx_type lx = X.length();/  octave_idx_type lx = X.numel();/' ${_pack}-${pkgver}/src/Ubern.cc
+  tar czf "$_archive_patched" "$_pack-$pkgver"
 }
 
 build() {
-	_prefix="$srcdir"/install_prefix
-	_archprefix="$srcdir"/install_archprefix
-	mkdir -p "$_prefix" "$_archprefix"
-	cd "$srcdir"
-	_octave_run "$(
-		cat <<-EOF
+  _prefix="$srcdir"/install_prefix
+  _archprefix="$srcdir"/install_archprefix
+  mkdir -p "$_prefix" "$_archprefix"
+  cd "$srcdir"
+  _octave_run "$(
+    cat <<-EOF
 			pkg local_list octave_packages;
 			pkg prefix $_prefix $_archprefix;
 			pkg install -verbose -nodeps $_archive_patched;
 		EOF
-	)"
+  )"
 }
 
 package() {
-	prefix=$pkgdir/usr/share/octave/packages
-	archprefix=$pkgdir/usr/lib/octave/packages
-	_install_dir "$srcdir"/install_prefix "$prefix"
-	_install_dir "$srcdir"/install_archprefix "$archprefix"
+  prefix=$pkgdir/usr/share/octave/packages
+  archprefix=$pkgdir/usr/lib/octave/packages
+  _install_dir "$srcdir"/install_prefix "$prefix"
+  _install_dir "$srcdir"/install_archprefix "$archprefix"
 }