aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptrcnull <git@ptrcnull.me>2022-08-14 01:37:17 +0200
committeralice <alice@ayaya.dev>2022-08-14 00:46:57 +0000
commit3129151ea31fc766babe971861123cd1145e2ac5 (patch)
tree004ba48800d2f6278aa735453d51e662a616b6da
parent828db7155d773dae65aadce55b647dc593770bce (diff)
downloadaports-3129151ea31fc766babe971861123cd1145e2ac5.tar.gz
aports-3129151ea31fc766babe971861123cd1145e2ac5.tar.bz2
aports-3129151ea31fc766babe971861123cd1145e2ac5.tar.xz
main/slang: upgrade to 2.3.3
-rw-r--r--main/slang/APKBUILD12
-rw-r--r--main/slang/disable-rpath.patch14
-rw-r--r--main/slang/fix-slarray-32bit.patch19
3 files changed, 15 insertions, 30 deletions
diff --git a/main/slang/APKBUILD b/main/slang/APKBUILD
index 31aa07d260..045c47bc9b 100644
--- a/main/slang/APKBUILD
+++ b/main/slang/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=slang
-pkgver=2.3.2
+pkgver=2.3.3
pkgrel=0
pkgdesc="Powerful interpreted language"
url="https://www.jedsoft.org/slang"
@@ -10,7 +10,6 @@ makedepends="ncurses-dev pcre-dev"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
source="https://www.jedsoft.org/releases/slang/slang-$pkgver.tar.bz2
disable-rpath.patch
- fix-slarray-32bit.patch
terminfo-in-etc.patch
skip-slsh-process-test.patch
"
@@ -34,8 +33,9 @@ package() {
make -j1 DESTDIR="$pkgdir" install-all
}
-sha512sums="35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5 slang-2.3.2.tar.bz2
-6cc7ee4493131e2c9ec48db1b5f97c5db9288e96c5073507307454dd02437b9076ffe1a4853097a7912fa7f47e694145ac1e7f7b17a29e642a8866af521cd940 disable-rpath.patch
-3a4d7c27734b6d29ce029000275a536744f6127c9bcb9eee168a63666e9b134bf72d3a27e0b6cfb90b968420a7778284b7cf1f1871031f0240f6394392e0b66c fix-slarray-32bit.patch
+sha512sums="
+f882f09e3fcd53427de0f233c9fc3ab15497f2323007be9a084696c8cf810ffe2726cd003149e757df26198b390b9f8c1ff411dc6473513457bd0f94722f8490 slang-2.3.3.tar.bz2
+0cb78c65faade7cb1ec683ba3ae84d7514df7af92a465a6af262979b43ae86bdd9fd289c9680e9158a0b01e2df4ddaa7c547d9707afc3c3b75d798f2225cbc0f disable-rpath.patch
a9fe12d220ec3458932784f1f7d40816cad9664ad5a3e19fe684e8f32eccc67ffc48acfa9852fccbe6741519f2acadbafc4b72817ae70804f93e2d913831d786 terminfo-in-etc.patch
-4a499a61a0abf119a362c46e761a4cd659a0de03f22acd2004a09fce339cde848f114a3a0beca176e3a42beeb8d0d2cd73ba788ccb01330b741afe9d8528164c skip-slsh-process-test.patch"
+4a499a61a0abf119a362c46e761a4cd659a0de03f22acd2004a09fce339cde848f114a3a0beca176e3a42beeb8d0d2cd73ba788ccb01330b741afe9d8528164c skip-slsh-process-test.patch
+"
diff --git a/main/slang/disable-rpath.patch b/main/slang/disable-rpath.patch
index a60e1178b0..a271586353 100644
--- a/main/slang/disable-rpath.patch
+++ b/main/slang/disable-rpath.patch
@@ -1,9 +1,11 @@
Upstream: no.
Reason: >>> WARNING: slang*: Redundant /usr/lib in rpath found
+diff --git a/modules/Makefile.in b/modules/Makefile.in
+index 34ac674..84e2b84 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ DEST_HELPDIR = $(DESTDIR)$(HELP_DIR)
# ---------------------------------------------------------------------------
RPATH = @RPATH@
@@ -12,14 +14,16 @@ Reason: >>> WARNING: slang*: Redundant /usr/lib in rpath found
INCS = $(SLANG_SRCINC)
COMPILE_CMD = $(CC_SHARED) $(INCS)
# ---------------------------------------------------------------------------
---- b/slsh/Makefile.in
+diff --git a/slsh/Makefile.in b/slsh/Makefile.in
+index addd343..8e4cc7b 100644
+--- a/slsh/Makefile.in
+++ b/slsh/Makefile.in
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ SLSYSWRAP_LIB = @LIB_SLSYSWRAP@
#----------------------------------------------------------------------------
@SET_MAKE@
SHELL = /bin/sh
--INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
-+INST_LIBS = $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
+-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS)
++INST_LIBS = $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS)
DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
-DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
-DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' $(SLSYSWRAP_DEF)
diff --git a/main/slang/fix-slarray-32bit.patch b/main/slang/fix-slarray-32bit.patch
deleted file mode 100644
index b8189c5562..0000000000
--- a/main/slang/fix-slarray-32bit.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Upstream: no idea. Patch from upstream mailing list.
-Reason: src/test/array.sl fails on 32bit archs:
-Testing array functions ...Unable to create a multi-dimensional array of the desired size
-./array.sl:166:<top-level>:Invalid Parameter
-URL: http://lists.jedsoft.org/lists/slang-users/2019/0000002.html
-
---- a/src/slarray.c
-+++ b/src/slarray.c
-@@ -369,7 +369,9 @@
- SLindex_Type new_num_elements;
- at->dims[i] = dims[i];
- new_num_elements = dims[i] * num_elements;
-- if (dims[i] && (new_num_elements/dims[i] != num_elements))
-+ if (dims[i]
-+ && ((new_num_elements/dims[i] != num_elements)
-+ || (new_num_elements < 0)))
- {
- throw_size_error (SL_Index_Error);
- free_array (at);