Mercurial > mxe-octave
changeset 6280:1f1717e8de5e
of-strings: update to v1.3.0
* src/of-strings-1-fixes.patch, src/of-strings-2-error_state.patch: deleted
* src/of-strings.mk: update version, checksum
* dist-files.mk: remove ref to deleted files
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Thu, 30 Jun 2022 10:57:54 -0400 |
| parents | d1ded45c3904 |
| children | 42b2fb1a2f70 |
| files | dist-files.mk src/of-strings-1-fixes.patch src/of-strings-2-error_state.patch src/of-strings.mk |
| diffstat | 4 files changed, 2 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Thu Jun 30 10:53:10 2022 -0400 +++ b/dist-files.mk Thu Jun 30 10:57:54 2022 -0400 @@ -539,8 +539,6 @@ of-statistics-1-cross.patch \ of-statistics.mk \ of-stk.mk \ - of-strings-1-fixes.patch \ - of-strings-2-error_state.patch \ of-strings.mk \ of-struct.mk \ of-symbolic.mk \
--- a/src/of-strings-1-fixes.patch Thu Jun 30 10:53:10 2022 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -diff -ur strings-1.2.0.orig/src/Makefile strings-1.2.0/src/Makefile ---- strings-1.2.0.orig/src/Makefile 2015-06-08 13:43:45.551556353 -0400 -+++ strings-1.2.0/src/Makefile 2015-06-08 13:45:22.693478306 -0400 -@@ -1,11 +1,7 @@ - OCTAVE ?= octave - MKOCTFILE ?= mkoctfile -Wall - --PCRE_SWITCHES := $(shell $(OCTAVE) \ -- --no-gui --no-init-file --no-site-file --silent --no-history \ -- --eval 'disp (octave_config_info ("PCRE_LIBS"));' \ -- --eval 'disp (octave_config_info ("PCRE_CPPFLAGS"));' \ -- ) -+PCRE_SWITCHES := $(shell pcre-config --libs) - - pcregexp.oct: %.oct: %.cc - $(MKOCTFILE) $(PCRE_SWITCHES) -o $@ $<
--- a/src/of-strings-2-error_state.patch Thu Jun 30 10:53:10 2022 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -# HG changeset patch -# User Markus Mützel <markus.muetzel@gmx.de> -# Date 1638133340 -3600 -# Sun Nov 28 22:02:20 2021 +0100 -# Node ID 2f2695e1f4b779632465782368c89ef1c7df0d91 -# Parent c3d5e17f6023c14b85d405aba8b1c76a8f54d02a -Fix compilation with Octave 8 (bug #61578). - -* src/pcregexp.cc (Fpcregexp): Remove usage of `error_state`. It was -unconditionally set to 0 since about 6 years ago and will finally be removed in -Octave 8. - -diff -r c3d5e17f6023 -r 2f2695e1f4b7 src/pcregexp.cc ---- a/src/pcregexp.cc Thu Jan 09 16:50:10 2020 -0500 -+++ b/src/pcregexp.cc Sun Nov 28 22:02:20 2021 +0100 -@@ -48,10 +48,6 @@ - - std::string pattern = args(0).string_value(); - std::string input = args(1).string_value(); -- if (error_state) { -- gripe_wrong_type_arg("pcregexp", args(0)); -- return retval; -- } - - // Compile expression - pcre *re;
--- a/src/of-strings.mk Thu Jun 30 10:53:10 2022 -0400 +++ b/src/of-strings.mk Thu Jun 30 10:57:54 2022 -0400 @@ -3,8 +3,8 @@ PKG := of-strings $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.0 -$(PKG)_CHECKSUM := 5db5442b62961a490526eec5d30e6db2a008914a +$(PKG)_VERSION := 1.3.0 +$(PKG)_CHECKSUM := 9ee4cda53ec0b63b9e96c36a0c0f69bfb2a6c472 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := strings-$($(PKG)_VERSION) $(PKG)_FILE := strings-$($(PKG)_VERSION).tar.gz