Mercurial > mxe-octave

annotate src/of-strings-1-fixes.patch @ 5534:372ea4c0afb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move of-ocs PKG_XXXX to inst dir and add break patch * src/of-ocs-3-break-fixes.patch, src/of-ocs-4-pkgadd-fixes.patch: new files * dist-files.mk: add ref to files
author John Donoghue <john.donoghue@ieee.org>
date Sun, 13 Sep 2020 08:15:14 -0400
parents 00e61c4a5657
children 5732a63f3182
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3962
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
1 diff -ur strings-1.2.0.orig/src/Makefile strings-1.2.0/src/Makefile
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
2 --- strings-1.2.0.orig/src/Makefile 2015-06-08 13:43:45.551556353 -0400
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
3 +++ strings-1.2.0/src/Makefile 2015-06-08 13:45:22.693478306 -0400
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
4 @@ -1,11 +1,7 @@
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
5 OCTAVE ?= octave
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
6 MKOCTFILE ?= mkoctfile -Wall
3902
cc946e55afb3 of-strings: add to mxe
John Donoghue
parents:
diff changeset
7
3962
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
8 -PCRE_SWITCHES := $(shell $(OCTAVE) \
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
9 - --no-gui --no-init-file --no-site-file --silent --no-history \
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
10 - --eval 'disp (octave_config_info ("PCRE_LIBS"));' \
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
11 - --eval 'disp (octave_config_info ("PCRE_CPPFLAGS"));' \
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
12 - )
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
13 +PCRE_SWITCHES := $(shell pcre-config --libs)
3902
cc946e55afb3 of-strings: add to mxe
John Donoghue
parents:
diff changeset
14
3962
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
15 pcregexp.oct: %.oct: %.cc
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
16 $(MKOCTFILE) $(PCRE_SWITCHES) -o $@ $<
4653
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
17 diff -uNr a/src/pcregexp.cc b/src/pcregexp.cc
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
18 --- a/src/pcregexp.cc 2015-06-06 17:40:45.000000000 -0400
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
19 +++ b/src/pcregexp.cc 2018-04-09 15:01:27.359869527 -0400
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
20 @@ -22,6 +22,7 @@
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
21 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
22
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
23 #include <octave/oct.h>
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
24 +#include <octave/errwarn.h>
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
25 #include <pcre.h>
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
26 #include <iostream>
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
27 #include <vector>
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
28 @@ -49,7 +50,7 @@
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
29 std::string pattern = args(0).string_value();
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
30 std::string input = args(1).string_value();
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
31 if (error_state) {
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
32 - gripe_wrong_type_arg("pcregexp", args(0));
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
33 + err_wrong_type_arg("pcregexp", args(0));
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
34 return retval;
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
35 }
00e61c4a5657 fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents: 3962
diff changeset
36