Mercurial > mxe-octave
changeset 5075:6fa56c3893ce
merge away extra head
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 30 May 2019 05:14:20 -0400 |
| parents | 0f111c0ba0b2 (current diff) 9ac443dd92ad (diff) |
| children | d18546e3db74 |
| files | dist-files.mk src/dcmtk-2-ming64.patch src/icu4c-1-fixes.patch src/of-control-1-deprecated.patch src/of-dicom-1-fixes.patch src/of-optim-1-fixes.patch src/of-optim-2-deprecated.patch src/of-signal-1-fixes.patch src/of-signal-2-fixes.patch src/of-signal-3-fixes.patch src/of-struct-1-fixes.patch src/of-struct-2-devfixes.patch src/of-windows-1-fixes.patch |
| diffstat | 102 files changed, 970 insertions(+), 2506 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Wed May 15 00:31:44 2019 -0400 +++ b/Makefile.in Thu May 30 05:14:20 2019 -0400 @@ -993,7 +993,7 @@ $(if $(2), $(if $(filter $(2),$($(1)_IGNORE)), $(info IGNORED $(1) $(2)), - $(if $(filter $(2),$($(1)_VERSION)x), + $(if $(filter $(2),$($(1)_VERSION)), $(info . $(1) $(2)), $(info NEW $(1) $($(1)_VERSION) --> $(2)) $(SED) -i 's/^\([^ ]*_VERSION *:=\).*/\1 $(2)/' '$(TOP_DIR)/src/$(1).mk'
--- a/binary-dist-rules.mk Wed May 15 00:31:44 2019 -0400 +++ b/binary-dist-rules.mk Thu May 30 05:14:20 2019 -0400 @@ -50,6 +50,9 @@ npp endif + # other packages we want to include + WINDOWS_BINARY_DIST_DEPS += \ + libbiosig endif BINARY_DIST_DEPS := \
--- a/dist-files.mk Wed May 15 00:31:44 2019 -0400 +++ b/dist-files.mk Thu May 30 05:14:20 2019 -0400 @@ -69,6 +69,8 @@ dbus.mk \ dcmtk-1-fixes.patch \ dcmtk-2-ming64.patch \ + dcmtk-3-pointer-fixes.patch \ + dcmtk-4-c++11-related-fixes.patch \ dcmtk.mk \ default-octave-1-gnulib.patch \ default-octave.mk \ @@ -182,7 +184,6 @@ hunspell-test.cpp \ hunspell.mk \ ice.mk \ - icu4c-1-fixes.patch \ icu4c.mk \ id3lib-1-win32.patch \ id3lib.mk \ @@ -216,6 +217,8 @@ libarchive.mk \ libass-test.c \ libass.mk \ + libbiosig-1-fixes.patch \ + libbiosig.mk \ libcdio.mk \ libcroco.mk \ libdnet-1-fixes.patch \ @@ -278,6 +281,7 @@ libodbc++.mk \ liboil.mk \ libpano13.mk \ + libpaper-1-noundefined.patch \ libpaper.mk \ libpng-test.c \ libpng.mk \ @@ -456,13 +460,11 @@ of-communications-5-fixes.patch \ of-communications-6-deprecated.patch \ of-communications.mk \ - of-control-1-deprecated.patch \ of-control.mk \ of-data-smoothing.mk \ of-database-1-fixes.patch \ of-database.mk \ of-dataframe.mk \ - of-dicom-1-fixes.patch \ of-dicom.mk \ of-financial.mk \ of-fits-1-cross-fixes.patch \ @@ -511,8 +513,6 @@ of-odepkg-2-fixes.patch \ of-odepkg-3-deprecated.patch \ of-odepkg.mk \ - of-optim-1-fixes.patch \ - of-optim-2-deprecated.patch \ of-optim.mk \ of-optiminterp-1-dev-fixes.patch \ of-optiminterp.mk \ @@ -520,9 +520,6 @@ of-quaternion-2-dev-fixes.patch \ of-quaternion.mk \ of-queueing.mk \ - of-signal-1-fixes.patch \ - of-signal-2-fixes.patch \ - of-signal-3-fixes.patch \ of-signal.mk \ of-sockets-1-cross-fixes.patch \ of-sockets.mk \ @@ -536,15 +533,12 @@ of-stk.mk \ of-strings-1-fixes.patch \ of-strings.mk \ - of-struct-1-fixes.patch \ - of-struct-2-devfixes.patch \ of-struct.mk \ of-tisean-1-fixes.patch \ of-tisean.mk \ of-tsa.mk \ of-video-1-fixes.patch \ of-video.mk \ - of-windows-1-fixes.patch \ of-windows.mk \ of-zenity.mk \ of-zeromq.mk \ @@ -633,7 +627,12 @@ qwt.mk \ qwtplot3d-1-fixes.patch \ qwtplot3d.mk \ + readline-1-display.patch \ readline-1-fixes.patch \ + readline-1-input.patch \ + readline-1-sigwinch.patch \ + readline-2-event-hook.patch \ + readline-2-history.patch \ readline.mk \ release-octave-1-gnulib.patch \ release-octave.mk \
--- a/index.html Wed May 15 00:31:44 2019 -0400 +++ b/index.html Thu May 30 05:14:20 2019 -0400 @@ -1486,6 +1486,10 @@ <td class="website"><a href="http://code.google.com/p/libass/">libass</a></td> </tr> <tr> + <td class="package">libbiosig</td> + <td class="website"><a href="https://biosig.sourceforge.io/">libbiosig</a></td> + </tr> + <tr> <td class="package">libcdio</td> <td class="website"><a href="http://ftp.gnu.org/gnu/libcdio">Libcdio</a></td> </tr>
--- a/src/agg.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/agg.mk Thu May 30 05:14:20 2019 -0400 @@ -7,12 +7,12 @@ $(PKG)_CHECKSUM := 08f23da64da40b90184a0414369f450115cdb328 $(PKG)_SUBDIR := agg-$($(PKG)_VERSION) $(PKG)_FILE := agg-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.antigrain.com/$($(PKG)_FILE) +$(PKG)_URL := https://web.archive.org/20150812005010/http://www.antigrain.com/$($(PKG)_FILE) $(PKG)_DEPS := freetype sdl define $(PKG)_UPDATE - $(WGET) -q -O- 'http://www.antigrain.com/download/index.html' | \ - $(SED) -n 's,.*<A href="http://www.antigrain.com/agg-\([0-9.]*\).tar.gz".*,\1,p' | \ + $(WGET) -q -O- 'https://web.archive.org/20150812005010/http://www.antigrain.com/download/index.html' | \ + $(SED) -n 's,.*www.antigrain.com/agg-\([0-9.]*\).tar.gz".*,\1,p' | \ head -1 endef
--- a/src/build-cmake.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/build-cmake.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := build-cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.13.4 -$(PKG)_CHECKSUM := 242ac4986ab38ddb06c7bfb7eb950e4c1b1ca770 +$(PKG)_VERSION := 3.14.4 +$(PKG)_CHECKSUM := c4a25807bf80ccd4219aeb75de9a822c4d07f5b8 $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
--- a/src/build-gettext.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/build-gettext.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := build-gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.19.8.1 -$(PKG)_CHECKSUM := b5d24ba2958c91fc5cc0058165837c99a0f58784 +$(PKG)_VERSION := 0.20.1 +$(PKG)_CHECKSUM := 2aa01db95b064d7f5d1a46de34a2cc6a57eadf36 $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE)
--- a/src/build-yasm.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/build-yasm.mk Thu May 30 05:14:20 2019 -0400 @@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := b7574e9f0826bedef975d64d3825f75fbaeef55e $(PKG)_SUBDIR := yasm-$($(PKG)_VERSION) $(PKG)_FILE := yasm-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.tortall.net/projects/$(PKG)/releases/$($(PKG)_FILE) +$(PKG)_URL := http://www.tortall.net/projects/yasm/releases/$($(PKG)_FILE) $(PKG)_DEPS := define $(PKG)_UPDATE
--- a/src/cmake.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/cmake.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.13.4 -$(PKG)_CHECKSUM := 242ac4986ab38ddb06c7bfb7eb950e4c1b1ca770 +$(PKG)_VERSION := 3.14.4 +$(PKG)_CHECKSUM := c4a25807bf80ccd4219aeb75de9a822c4d07f5b8 $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
--- a/src/curl.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/curl.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.64.0 -$(PKG)_CHECKSUM := 7539acc0742c2fb1472bc2904f0bd58eeebc011a +$(PKG)_VERSION := 7.64.1 +$(PKG)_CHECKSUM := a7242098aebf31107bd4765f3d54456953dba141 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE)
--- a/src/dbus.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/dbus.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.13.8 -$(PKG)_CHECKSUM := 6e9a99e0140f71800c1ed6283af80c26f7e3f39b +$(PKG)_VERSION := 1.13.10 +$(PKG)_CHECKSUM := 0b28f1e611ac043fba3318102f65fbade91457af $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE)
--- a/src/dcmtk-1-fixes.patch Wed May 15 00:31:44 2019 -0400 +++ b/src/dcmtk-1-fixes.patch Thu May 30 05:14:20 2019 -0400 @@ -1,12 +1,11 @@ -This file is part of MXE. -See index.html for further information. +This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. -From ac29986df03482c61dbd7271554e6bc453228bd6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Joerg Riesmeier <dicom@offis.de> Date: Thu, 17 Nov 2011 16:13:14 +0000 -Subject: [PATCH] Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang +Subject: [PATCH 1/1] Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. (cherry picked from commit dbadc0d8f3760f65504406c8b2cb8633f868a258) @@ -15,31 +14,9 @@ CHANGES.361 ofstd/libsrc/ofchrenc.cc ---- - dcmimage/include/dcmtk/dcmimage/diargpxt.h | 25 ++++++++++++++----------- - dcmimage/include/dcmtk/dcmimage/dicmypxt.h | 11 +++++++---- - dcmimage/include/dcmtk/dcmimage/dicocpt.h | 11 +++++++---- - dcmimage/include/dcmtk/dcmimage/dicoflt.h | 17 ++++++++++------- - dcmimage/include/dcmtk/dcmimage/dicorot.h | 17 ++++++++++------- - dcmimage/include/dcmtk/dcmimage/dicosct.h | 13 ++++++++----- - dcmimage/include/dcmtk/dcmimage/dihsvpxt.h | 11 +++++++---- - dcmimage/include/dcmtk/dcmimage/dipalpxt.h | 11 +++++++---- - dcmimage/include/dcmtk/dcmimage/dirgbpxt.h | 15 +++++++++------ - dcmimage/include/dcmtk/dcmimage/diybrpxt.h | 15 +++++++++------ - dcmimage/include/dcmtk/dcmimage/diyf2pxt.h | 11 +++++++---- - dcmimage/include/dcmtk/dcmimage/diyp2pxt.h | 11 +++++++---- - dcmimgle/include/dcmtk/dcmimgle/diflipt.h | 11 +++++++---- - dcmimgle/include/dcmtk/dcmimgle/dimoflt.h | 15 +++++++++------ - dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h | 13 ++++++++----- - dcmimgle/include/dcmtk/dcmimgle/dimorot.h | 15 +++++++++------ - dcmimgle/include/dcmtk/dcmimgle/dimosct.h | 11 +++++++---- - dcmimgle/include/dcmtk/dcmimgle/dirotat.h | 11 +++++++---- - dcmimgle/include/dcmtk/dcmimgle/discalet.h | 19 +++++++++++-------- - ofstd/include/dcmtk/ofstd/ofoset.h | 13 ++++++++----- - 20 files changed, 168 insertions(+), 108 deletions(-) diff --git a/dcmimage/include/dcmtk/dcmimage/diargpxt.h b/dcmimage/include/dcmtk/dcmimage/diargpxt.h -index 7e3894d..1ed9291 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/diargpxt.h +++ b/dcmimage/include/dcmtk/dcmimage/diargpxt.h @@ -1,6 +1,6 @@ @@ -122,7 +99,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h -index 5357780..bf1161e 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h +++ b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h @@ -1,6 +1,6 @@ @@ -164,7 +141,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimage/include/dcmtk/dcmimage/dicocpt.h b/dcmimage/include/dcmtk/dcmimage/dicocpt.h -index 0c06de7..3f03b6b 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/dicocpt.h +++ b/dcmimage/include/dcmtk/dcmimage/dicocpt.h @@ -1,6 +1,6 @@ @@ -206,7 +183,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimage/include/dcmtk/dcmimage/dicoflt.h b/dcmimage/include/dcmtk/dcmimage/dicoflt.h -index a5bed81..bc809ab 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/dicoflt.h +++ b/dcmimage/include/dcmtk/dcmimage/dicoflt.h @@ -1,6 +1,6 @@ @@ -258,7 +235,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimage/include/dcmtk/dcmimage/dicorot.h b/dcmimage/include/dcmtk/dcmimage/dicorot.h -index 2bcd71e..c8afd70 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/dicorot.h +++ b/dcmimage/include/dcmtk/dcmimage/dicorot.h @@ -1,6 +1,6 @@ @@ -310,7 +287,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimage/include/dcmtk/dcmimage/dicosct.h b/dcmimage/include/dcmtk/dcmimage/dicosct.h -index 006a829..3bccc45 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/dicosct.h +++ b/dcmimage/include/dcmtk/dcmimage/dicosct.h @@ -1,6 +1,6 @@ @@ -354,7 +331,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h -index 10d8b70..52580ec 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h +++ b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h @@ -1,6 +1,6 @@ @@ -396,7 +373,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h -index 2e5eef7..1ae2352 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h +++ b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h @@ -1,6 +1,6 @@ @@ -438,7 +415,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h -index 85f973d..d9cc7ed 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h +++ b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h @@ -1,6 +1,6 @@ @@ -492,7 +469,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h -index 6b523fb..ecd2038 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h +++ b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h @@ -1,6 +1,6 @@ @@ -546,7 +523,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h -index ed27796..93d28cc 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h +++ b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h @@ -1,6 +1,6 @@ @@ -588,7 +565,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h -index 518fed7..0dd9d5b 100644 +index 1111111..2222222 100644 --- a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h +++ b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h @@ -1,6 +1,6 @@ @@ -630,7 +607,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h -index 4933fe1..05c198c 100644 +index 1111111..2222222 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h +++ b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h @@ -1,6 +1,6 @@ @@ -672,7 +649,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h -index a88ab9d..52d71a3 100644 +index 1111111..2222222 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h @@ -1,6 +1,6 @@ @@ -720,7 +697,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h -index e815e90..c190dd6 100644 +index 1111111..2222222 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h @@ -1,6 +1,6 @@ @@ -766,7 +743,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h -index 4ef277d..e729424 100644 +index 1111111..2222222 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h +++ b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h @@ -1,6 +1,6 @@ @@ -814,7 +791,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h -index 60c9abb..8f89855 100644 +index 1111111..2222222 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h +++ b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h @@ -1,6 +1,6 @@ @@ -856,7 +833,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h -index edb452e..2e7e3a0 100644 +index 1111111..2222222 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h +++ b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h @@ -1,6 +1,6 @@ @@ -898,7 +875,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/dcmimgle/include/dcmtk/dcmimgle/discalet.h b/dcmimgle/include/dcmtk/dcmimgle/discalet.h -index 758dde2..0bcbc70 100644 +index 1111111..2222222 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/discalet.h +++ b/dcmimgle/include/dcmtk/dcmimgle/discalet.h @@ -1,6 +1,6 @@ @@ -973,7 +950,7 @@ * Updated copyright header. Added reference to COPYRIGHT file. * diff --git a/ofstd/include/dcmtk/ofstd/ofoset.h b/ofstd/include/dcmtk/ofstd/ofoset.h -index 1a7f208..a534ebf 100644 +index 1111111..2222222 100644 --- a/ofstd/include/dcmtk/ofstd/ofoset.h +++ b/ofstd/include/dcmtk/ofstd/ofoset.h @@ -1,6 +1,6 @@ @@ -1023,6 +1000,3 @@ ** Revision 1.11 2010-10-14 13:15:50 joergr ** Updated copyright header. Added reference to COPYRIGHT file. ** --- -1.7.9.2 -
--- a/src/dcmtk-2-ming64.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -Patch for the fact we are using the mingw-w64 with mingw32 compiler - -diff -ur dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h ---- dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h 2014-06-30 12:23:34.314366353 -0400 -+++ dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h 2014-06-30 12:29:57.079959273 -0400 -@@ -81,7 +81,7 @@ - typedef __int64 offile_off_t; - typedef fpos_t offile_fpos_t; - #else -- #ifdef EXPLICIT_LFS_64 -+ #if defined(EXPLICIT_LFS_64) && !defined(__MINGW64__) && !defined(__MINGW32__) - // Explicit LFS (LFS64) - typedef fpos64_t offile_fpos_t; - typedef off64_t offile_off_t; -@@ -196,7 +196,7 @@ - OFBool popen(const char *command, const char *modes) - { - if (file_) fclose(); --#ifdef _WIN32 -+#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__) - file_ = _popen(command, modes); - #else - file_ = :: popen(command, modes); -@@ -258,7 +258,7 @@ - { - if (popened_) - { --#ifdef _WIN32 -+#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__) - result = _pclose(file_); - #else - result = :: pclose(file_);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/dcmtk-2-mingw-w64.patch Thu May 30 05:14:20 2019 -0400 @@ -0,0 +1,161 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +From 2d08af9a15089c354b436282e4d23f462a81ce8f Mon Sep 17 00:00:00 2001 +From: MXE <mxe@mxe.cc> +Date: Tue, 7 Oct 2014 21:50:59 -0700 +Subject: [PATCH] Fix i686-w64-mingw32 + +Cherry-picked from +http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=b8a53c5f7fd12e9479f830680ef84f93805fd004 + +diff --git a/config/configure.in b/config/configure.in +index e343ce1..a305114 100644 +--- a/config/configure.in ++++ b/config/configure.in +@@ -199,6 +199,10 @@ AC_CHECK_TYPES(longlong) + AC_CHECK_TYPES(ulonglong) + CHECK_VLA + ++dnl File access stuff ++AC_CHECK_TYPES(fpos64_t) ++AC_CHECK_TYPES(off64_t) ++ + dnl stdbool.h and stdint.h are only defined in ANSI C, not in C++ + AC_CHECK_HEADERS(stdbool.h) + AC_CHECK_HEADERS(stdint.h) +@@ -232,6 +236,7 @@ AC_CHECK_FUNCS(sleep fork) + AC_CHECK_FUNCS(_findfirst) + AC_CHECK_FUNCS(strlcpy strlcat) + AC_CHECK_FUNCS(vsnprintf) ++AC_CHECK_FUNCS(popen pclose) + AC_FUNC_FSEEKO + + +diff --git a/config/include/dcmtk/config/cfunix.h.in b/config/include/dcmtk/config/cfunix.h.in +index 3a6cd69..ed211ca 100644 +--- a/config/include/dcmtk/config/cfunix.h.in ++++ b/config/include/dcmtk/config/cfunix.h.in +@@ -157,6 +157,9 @@ + /* Define to 1 if you have the `fork' function. */ + #undef HAVE_FORK + ++/* Define to 1 if the system has the type `fpos64_t'. */ ++#undef HAVE_FPOS64_T ++ + /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ + #undef HAVE_FSEEKO + +@@ -424,14 +427,23 @@ typedef unsigned short ushort; + /* Define to 1 if you have the `ntohs' function. */ + #undef HAVE_NTOHS + ++/* Define to 1 if the system has the type `off64_t'. */ ++#undef HAVE_OFF64_T ++ + /* Define if your system supports readdir_r with the obsolete Posix 1.c draft + 6 declaration (2 arguments) instead of the Posix 1.c declaration with 3 + arguments. */ + #undef HAVE_OLD_READDIR_R + ++/* Define to 1 if you have the `pclose' function. */ ++#undef HAVE_PCLOSE ++ + /* Define if pthread_t is a pointer type on your system */ + #undef HAVE_POINTER_TYPE_PTHREAD_T + ++/* Define to 1 if you have the `popen' function. */ ++#undef HAVE_POPEN ++ + /* Define if your system has a prototype for accept in sys/types.h + sys/socket.h */ + #undef HAVE_PROTOTYPE_ACCEPT +diff --git a/ofstd/include/dcmtk/ofstd/offile.h b/ofstd/include/dcmtk/ofstd/offile.h +index 0f5d454..3f5a677 100644 +--- a/ofstd/include/dcmtk/ofstd/offile.h ++++ b/ofstd/include/dcmtk/ofstd/offile.h +@@ -75,26 +75,36 @@ END_EXTERN_C + #endif + #endif + +-#if defined(_WIN32) && !defined(__MINGW32__) +- // On Win32 systems except MinGW (where Posix definitions are available) +- // we use Win32 specific definitions +- typedef __int64 offile_off_t; +- typedef fpos_t offile_fpos_t; ++// Explicit LFS (LFS64) and Windows need 64 bit types ++#if defined(EXPLICIT_LFS_64) || defined(_WIN32) ++ ++// Use POSIX 64 bit file position type when available ++#ifdef HAVE_FPOS64_T ++typedef fpos64_t offile_fpos_t; ++#else // Otherwise this should be sufficient ++typedef fpos_t offile_fpos_t; ++#endif ++ ++// Use POSIX 64 bit file offset type when available ++#ifdef HAVE_OFF64_T ++typedef off64_t offile_off_t; ++#elif !defined(OF_NO_SINT64) // Otherwise use a 64 bit integer ++typedef Sint64 offile_off_t; ++#else // Cry when 64 LFS is required but no 64 bit integer exists ++#error \ ++ Could not find a suitable offset-type for LFS64 support. ++#endif ++ ++#else // Implicit LFS or no LFS ++ ++#ifdef HAVE_FSEEKO ++typedef off_t offile_off_t; + #else +- #ifdef EXPLICIT_LFS_64 +- // Explicit LFS (LFS64) +- typedef fpos64_t offile_fpos_t; +- typedef off64_t offile_off_t; +- #else +- // Implicit LFS or no LFS +- #ifdef HAVE_FSEEKO +- typedef off_t offile_off_t; +- #else +- typedef long offile_off_t; +- #endif +- typedef fpos_t offile_fpos_t; +- #endif ++typedef long offile_off_t; + #endif ++typedef fpos_t offile_fpos_t; ++ ++#endif // basic type definitions + + // the type we use to store the last error. + typedef int offile_errno_t; +@@ -196,10 +206,10 @@ public: + OFBool popen(const char *command, const char *modes) + { + if (file_) fclose(); +-#ifdef _WIN32 +- file_ = _popen(command, modes); +-#else ++#ifdef HAVE_POPEN + file_ = :: popen(command, modes); ++#else ++ file_ = _popen(command, modes); + #endif + if (file_) popened_ = OFTrue; else storeLastError(); + return (file_ != NULL); +@@ -258,10 +268,10 @@ public: + { + if (popened_) + { +-#ifdef _WIN32 +- result = _pclose(file_); +-#else ++#ifdef HAVE_PCLOSE + result = :: pclose(file_); ++#else ++ result = _pclose(file_); + #endif + } + else +-- +1.8.3.2 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/dcmtk-3-pointer-fixes.patch Thu May 30 05:14:20 2019 -0400 @@ -0,0 +1,36 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 808089f334f44ea125ec5263fb85c0f2c95fd190 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Sat, 6 Jun 2015 06:16:19 -0700 +Subject: [PATCH] Do not cast pointer to integer types. Instead, pass them in + as-is. + + +diff --git a/dcmnet/libsrc/dul.cc b/dcmnet/libsrc/dul.cc +index 48a267b..3a5eb18 100644 +--- a/dcmnet/libsrc/dul.cc ++++ b/dcmnet/libsrc/dul.cc +@@ -1770,7 +1770,7 @@ receiveTransportConnectionTCP(PRIVATE_NETWORKKEY ** network, + // send number of socket handle in child process over anonymous pipe + DWORD bytesWritten; + char buf[20]; +- sprintf(buf, "%i", OFreinterpret_cast(int, childSocketHandle)); ++ sprintf(buf, "%p", childSocketHandle); + if (!WriteFile(hChildStdInWriteDup, buf, strlen(buf) + 1, &bytesWritten, NULL)) + { + CloseHandle(hChildStdInWriteDup); +@@ -1780,7 +1780,7 @@ receiveTransportConnectionTCP(PRIVATE_NETWORKKEY ** network, + // return OF_ok status code DULC_FORKEDCHILD with descriptive text + OFOStringStream stream; + stream << "New child process started with pid " << OFstatic_cast(int, pi.dwProcessId) +- << ", socketHandle " << OFreinterpret_cast(int, childSocketHandle) << OFStringStream_ends; ++ << ", socketHandle " << childSocketHandle << OFStringStream_ends; + OFSTRINGSTREAM_GETOFSTRING(stream, msg) + return makeDcmnetCondition(DULC_FORKEDCHILD, OF_ok, msg.c_str()); + } +-- +2.1.4 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/dcmtk-4-c++11-related-fixes.patch Thu May 30 05:14:20 2019 -0400 @@ -0,0 +1,16 @@ +From: Boris Pek +Date: Thu, 05 May 2016 15:38:47 +0300 +Subject: [PATCH] fix build with GCC >= 6.x + +diff --git a/ofstd/libsrc/ofstd.cc b/ofstd/libsrc/ofstd.cc +--- a/ofstd/libsrc/ofstd.cc ++++ b/ofstd/libsrc/ofstd.cc +@@ -175,7 +175,7 @@ + + + // some systems don't properly define isnan() +-#ifdef HAVE_ISNAN ++#if defined(HAVE_ISNAN) && (__cplusplus < 201103L) + #ifndef HAVE_PROTOTYPE_ISNAN + extern "C" + {
--- a/src/dcmtk.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/dcmtk.mk Thu May 30 05:14:20 2019 -0400 @@ -9,7 +9,8 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://dicom.offis.de/pub/dicom/offis/software/$(PKG)/$(PKG)$(subst .,,$($(PKG)_VERSION))/$($(PKG)_FILE) $(PKG)_URL_2 := http://ftp.debian.org/debian/pool/main/d/$(PKG)/$(PKG)_$($(PKG)_VERSION).orig.tar.gz -$(PKG)_DEPS := openssl tiff libpng libxml2 zlib +#$(PKG)_DEPS := openssl tiff libpng libxml2 zlib +$(PKG)_DEPS := tiff libpng libxml2 zlib define $(PKG)_UPDATE $(WGET) -q -O- 'http://dicom.offis.de/dcmtk.php.en' | \ @@ -18,6 +19,7 @@ endef define $(PKG)_BUILD + cd '$(1)'/config && autoconf -f cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ @@ -28,6 +30,7 @@ --with-libxmlinc='$(HOST_PREFIX)' \ --with-zlib \ --without-libwrap \ + --without-openssl \ CXX='$(MXE_CXX)' \ RANLIB='$(MXE_RANLIB)' \ AR='$(MXE_AR)' \
--- a/src/double-conversion.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/double-conversion.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := double-conversion $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1.3 -$(PKG)_CHECKSUM := 3cfcc486790447a4709474888d15aed1139d2b17 +$(PKG)_VERSION := 3.1.4 +$(PKG)_CHECKSUM := 26a0ddaf0abb7e53c67f2abfac95b1e009c2a002 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
--- a/src/freetds.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/freetds.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 1.00.111 -$(PKG)_CHECKSUM := e681bd2842a84094f1d563338bdc616478901bda +$(PKG)_VERSION := 1.1.6 +$(PKG)_CHECKSUM := 61c299fe54eadec551adff7dbdd47d84048a4330 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE)
--- a/src/freetype.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/freetype.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := freetype $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9.1 -$(PKG)_CHECKSUM := 220c82062171c513e4017c523d196933c9de4a7d +$(PKG)_VERSION := 2.10.0 +$(PKG)_CHECKSUM := f6abf03e0e3189a0de883981c57d3861b5d314f5 $(PKG)_SUBDIR := freetype-$($(PKG)_VERSION) $(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/gdal.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/gdal.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := gdal $(PKG)_IGNORE : -$(PKG)_VERSION := 2.4.0 -$(PKG)_CHECKSUM := 3420ae8a9644ce652339ecbad18f9024279cd2ba +$(PKG)_VERSION := 2.4.1 +$(PKG)_CHECKSUM := cb5dec7fe1a6b6cae44f520724ef3e8ac290d8bd $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/gdb.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/gdb.mk Thu May 30 05:14:20 2019 -0400 @@ -2,12 +2,12 @@ # See index.html for further information. PKG := gdb -$(PKG)_VERSION := 8.2.1 -$(PKG)_CHECKSUM := 023556a6d6effa1ffaadf0007cc4458cbe8dde3d +$(PKG)_VERSION := 8.3 +$(PKG)_CHECKSUM := f45de6af561f0fa0241f0d5085198556fcfd1e5e $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) $(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) -$(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/$(PKG)/$($(PKG)_FILE) +$(PKG)_URL_2 := https://ftpmirror.gnu.org/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := expat libiconv readline zlib define $(PKG)_UPDATE
--- a/src/gettext.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/gettext.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.19.8.1 -$(PKG)_CHECKSUM := b5d24ba2958c91fc5cc0058165837c99a0f58784 +$(PKG)_VERSION := 0.20.1 +$(PKG)_CHECKSUM := 2aa01db95b064d7f5d1a46de34a2cc6a57eadf36 $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE)
--- a/src/ghostscript.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/ghostscript.mk Thu May 30 05:14:20 2019 -0400 @@ -3,9 +3,9 @@ PKG := ghostscript $(PKG)_IGNORE := -$(PKG)_VERSION := 9.26 +$(PKG)_VERSION := 9.27 $(PKG)_NODOTVER := $(subst .,,$($(PKG)_VERSION)) -$(PKG)_CHECKSUM := 2727000ebee0d08311705859a31a504e259f0d98 +$(PKG)_CHECKSUM := f926d2cfb418a7c5d92dce0a9843fa01ee62fe2c $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$($(PKG)_NODOTVER)/$($(PKG)_FILE)
--- a/src/icu4c-1-fixes.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -diff -ur icu.orig/source/common/umutex.h icu/source/common/umutex.h ---- icu.orig/source/common/umutex.h 2018-11-28 07:44:08.599310972 -0500 -+++ icu/source/common/umutex.h 2018-11-28 07:48:11.600429267 -0500 -@@ -54,15 +54,15 @@ - - #include <atomic> - --U_NAMESPACE_BEGIN -- - // Export an explicit template instantiation of std::atomic<int32_t>. - // When building DLLs for Windows this is required as it is used as a data member of the exported SharedObject class. - // See digitlst.h, pluralaffix.h, datefmt.h, and others for similar examples. --#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN -+#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN && !defined(U_IN_DOXYGEN) - template struct U_COMMON_API std::atomic<int32_t>; - #endif - -+U_NAMESPACE_BEGIN -+ - typedef std::atomic<int32_t> u_atomic_int32_t; - #define ATOMIC_INT32_T_INITIALIZER(val) ATOMIC_VAR_INIT(val) - -diff -ur icu.orig/source/i18n/unicode/numberrangeformatter.h icu/source/i18n/unicode/numberrangeformatter.h ---- icu.orig/source/i18n/unicode/numberrangeformatter.h 2018-11-28 07:44:08.647312767 -0500 -+++ icu/source/i18n/unicode/numberrangeformatter.h 2018-11-28 07:50:46.246265906 -0500 -@@ -185,8 +185,15 @@ - * Export an explicit template instantiation. See datefmt.h - * (When building DLLs for Windows this is required.) - */ --#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN && !defined(U_IN_DOXYGEN) --template struct U_I18N_API std::atomic<impl::NumberRangeFormatterImpl*>; -+#if U_PLATFORM == U_PF_WINDOWS && !defined(U_IN_DOXYGEN) -+} // namespace icu::number -+U_NAMESPACE_END -+ -+template struct U_I18N_API std::atomic< U_NAMESPACE_QUALIFIER number::impl::NumberRangeFormatterImpl*>; -+ -+U_NAMESPACE_BEGIN -+namespace number { // icu::number -+ - #endif - /** \endcond */ - -diff -ur icu.orig/source/test/intltest/numbertest.h icu/source/test/intltest/numbertest.h ---- icu.orig/source/test/intltest/numbertest.h 2018-11-28 07:44:08.547309026 -0500 -+++ icu/source/test/intltest/numbertest.h 2018-11-28 07:51:46.752552939 -0500 -@@ -10,6 +10,7 @@ - #include "intltest.h" - #include "number_affixutils.h" - #include "numparse_stringsegment.h" -+#include "numrange_impl.h" - #include "unicode/locid.h" - #include "unicode/numberformatter.h" - #include "unicode/numberrangeformatter.h"
--- a/src/icu4c.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/icu4c.mk Thu May 30 05:14:20 2019 -0400 @@ -1,7 +1,7 @@ PKG := icu4c $(PKG)_IGNORE := -$(PKG)_VERSION := 63.1 -$(PKG)_CHECKSUM := ad523232f19af1c698c6489f8e15f7e9824f1662 +$(PKG)_VERSION := 64.2 +$(PKG)_CHECKSUM := 3127155ecf2b75ab4835f501b7478e39c07bb852 $(PKG)_SUBDIR := icu $(PKG)_FILE := $(PKG)-$(subst .,_,$($(PKG)_VERSION))-src.tgz $(PKG)_URL := http://download.icu-project.org/files/icu4c/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libbiosig-1-fixes.patch Thu May 30 05:14:20 2019 -0400 @@ -0,0 +1,12 @@ +diff -ur biosig4c++-1.9.4.orig/Makefile.in biosig4c++-1.9.4/Makefile.in +--- biosig4c++-1.9.4.orig/Makefile.in 2019-05-06 15:20:47.958318279 -0400 ++++ biosig4c++-1.9.4/Makefile.in 2019-05-06 15:21:45.810270194 -0400 +@@ -241,7 +241,7 @@ + LDLIBS += -lsuitesparseconfig + endif + endif +-ifeq (1,@HAVE_DCMTK@) ++ifeq (0,@HAVE_DCMTK@) + DEFINES += -D=WITH_DCMTK + LDLIBS += -ldcmdata -loflog -lofstd + SOURCES += t210/sopen_dcmtk_read.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libbiosig.mk Thu May 30 05:14:20 2019 -0400 @@ -0,0 +1,84 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libbiosig +$(PKG)_WEBSITE := http://biosig.sf.net/ +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.9.4 +$(PKG)_CHECKSUM := 03471cbc9b1a15bd646e7b0b98499964f6246149 +$(PKG)_SUBDIR := biosig4c++-$($(PKG)_VERSION) +$(PKG)_FILE := biosig4c++-$($(PKG)_VERSION).src.tar.gz +$(PKG)_URL := https://sourceforge.net/projects/biosig/files/BioSig%20for%20C_C%2B%2B/src/$($(PKG)_FILE)/download +$(PKG)_DEPS := suitesparse zlib libiberty libiconv lapack + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://biosig.sourceforge.net/download.html' | \ + $(GREP) biosig4c | \ + $(SED) -n 's_.*>v\([0-9]\.[0-9]\.[0-9]\)<.*_\1_p' | \ + $(SORT) -V | \ + tail -1 +endef + +define $(PKG)_BUILD_PRE + + cd '$(1)' && ./configure \ + ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes \ + --prefix=$(HOST_PREFIX) \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) + + # make sure NDEBUG is defined + $(SED) -i '/NDEBUG/ s|#||g' '$(1)'/Makefile + + ### disables declaration of sopen from io.h (imported through unistd.h) + if [ "$(MXE_SYSTEM)" == "mingw" ]; then \ + $(SED) -i '/ sopen/ s#^/*#//#g' $(HOST_INCDIR)/io.h; \ + fi + + #$(SED) -i 's| -fstack-protector | |g' '$(1)'/Makefile + #$(SED) -i 's| -D_FORTIFY_SOURCE=2 | |g' '$(1)'/Makefile + #$(SED) -i 's| -lssp | |g' '$(1)'/Makefile + + TARGET='$(TARGET)' $(MAKE) -C '$(1)' clean + TARGET='$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' \ + libbiosig.a libgdf.a libphysicalunits.a +endef + +define $(PKG)_BUILD_POST + + $(INSTALL) -m644 '$(1)/biosig.h' '$(HOST_INCDIR)/' + $(INSTALL) -m644 '$(1)/biosig2.h' '$(HOST_INCDIR)/' + $(INSTALL) -m644 '$(1)/gdftime.h' '$(HOST_INCDIR)/' + $(INSTALL) -m644 '$(1)/biosig-dev.h' '$(HOST_INCDIR)/' + + $(INSTALL) -m644 '$(1)/libbiosig.a' '$(HOST_LIBDIR)/' + #$(INSTALL) -m644 '$(1)/libbiosig.def' '$(HOST_LIBDIR)/' + #$(INSTALL) -m644 '$(1)/libbiosig.dll.a' '$(HOST_LIBDIR)/' + #$(INSTALL) -m644 '$(1)/libbiosig.dll' '$(PREFIX)/$(TARGET)/bin/' + + $(INSTALL) -m644 '$(1)/libgdf.a' '$(HOST_LIBDIR)/' + #$(INSTALL) -m644 '$(1)/libgdf.def' '$(HOST_LIBDIR)/' + #$(INSTALL) -m644 '$(1)/libgdf.dll.a' '$(HOST_LIBDIR)/' + #$(INSTALL) -m644 '$(1)/libgdf.dll' '$(HOST_BINDIR)/' + + + $(INSTALL) -m644 '$(1)/physicalunits.h' '$(HOST_INCDIR)/' + $(INSTALL) -m644 '$(1)/libphysicalunits.a' '$(HOST_LIBDIR)/' + #$(INSTALL) -m644 '$(1)/libphysicalunits.def' '$(HOST_LIBDIR)/' + #$(INSTALL) -m644 '$(1)/libphysicalunits.dll.a' '$(HOST_LIBDIR)/' + #$(INSTALL) -m644 '$(1)/libphysicalunits.dll' '$(HOST_BINDIR)/' + + if [ "$(MXE_WINDOWS_BUILD)" == "yes" ]; then \ + $(SED) -i '/^Libs:/ s/$$/ -liconv -lws2_32/' $(1)/libbiosig.pc; \ + fi + $(INSTALL) -m644 '$(1)/libbiosig.pc' '$(HOST_LIBDIR)/pkgconfig/' + +endef + + +define $(PKG)_BUILD + $($(PKG)_BUILD_PRE) + TARGET=$(TARGET) CROSS=$(TARGET) $(MAKE) -C '$(1)' libbiosig + $($(PKG)_BUILD_POST) +endef +
--- a/src/libgd.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/libgd.mk Thu May 30 05:14:20 2019 -0400 @@ -19,7 +19,7 @@ define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package libgd.' >&2; - echo $(gd_VERSION) + echo $(libgd_VERSION) endef define $(PKG)_BUILD
--- a/src/libgpg_error.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/libgpg_error.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := libgpg_error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.35 -$(PKG)_CHECKSUM := 1ffc6aaac4a4eecf16132c1b4eb500c1765d7190 +$(PKG)_VERSION := 1.36 +$(PKG)_CHECKSUM := 5245ce38b198cecd57775fb3c7b7328ec1a2a615 $(PKG)_SUBDIR := libgpg-error-$($(PKG)_VERSION) $(PKG)_FILE := libgpg-error-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE)
--- a/src/libiconv.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/libiconv.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := libiconv $(PKG)_IGNORE := -$(PKG)_VERSION := 1.15 -$(PKG)_CHECKSUM := 7af3149fa7c4bd1d3a36a30f02e95a0ebfd6b18f +$(PKG)_VERSION := 1.16 +$(PKG)_CHECKSUM := 2d9d1d8fa9f7859b181de984d60eacd2499a5701 $(PKG)_SUBDIR := libiconv-$($(PKG)_VERSION) $(PKG)_FILE := libiconv-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/libiconv/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libpaper-1-noundefined.patch Thu May 30 05:14:20 2019 -0400 @@ -0,0 +1,23 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji <djcj@gmx.de> +Date: Fri, 25 May 2018 01:21:03 +0200 +Subject: [PATCH 1/1] enable DLL builds + + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 1111111..2222222 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -1,7 +1,7 @@ + + lib_LTLIBRARIES = libpaper.la + libpaper_la_SOURCES = dimen.c paper.c dimen.h paperspecs.h +-libpaper_la_LDFLAGS = -version-info 2:2:1 ++libpaper_la_LDFLAGS = -no-undefined -version-info 2:2:1 + libpaper_la_CPPFLAGS = -D_REENTRANT + + BUILT_SOURCES = paperspecs.h
--- a/src/libpaper.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/libpaper.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := libpaper $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.24+nmu2 -$(PKG)_CHECKSUM := 40f16453d7752bf5e3c9e74515650eb37edbb3fe +$(PKG)_VERSION := 1.1.26 +$(PKG)_CHECKSUM := eb8b0b0c5f6c526911f56158a6a8cd98bc6a6089 $(PKG)_SUBDIR := libpaper-$($(PKG)_VERSION) $(PKG)_FILE := libpaper_$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.debian.org/debian/pool/main/libp/$(PKG)/$($(PKG)_FILE) @@ -18,7 +18,7 @@ endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(1)' && autoreconf -fi && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)'
--- a/src/libpng.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/libpng.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.36 -$(PKG)_CHECKSUM := aec9548c8319104226cc4c31d1f5e524f1b55295 +$(PKG)_VERSION := 1.6.37 +$(PKG)_CHECKSUM := 3ab93fabbf4c27e1c4724371df408d9a1bd3f656 $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(subst .,,$(call SHORT_PKG_VERSION,$(PKG)))/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/libssh2.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/libssh2.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := libssh2 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.0 -$(PKG)_CHECKSUM := baf2d1fb338eee531ba9b6b121c64235e089e0f5 +$(PKG)_VERSION := 1.8.2 +$(PKG)_CHECKSUM := 9250682b0df0ab61e47cc4192f99731949f605bc $(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION) $(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libssh2.org/download/$($(PKG)_FILE)
--- a/src/msys2-coreutils.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-coreutils.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-coreutils $(PKG)_NAME := coreutils $(PKG)_IGNORE := -$(PKG)_VERSION := 8.30-1 -$(PKG)_x86_64_CS := 5063037f44c5cb59f231b6437a843b8d88110ca0 -$(PKG)_i686_CS := 5e7c2dfd76e5b82237a0053b6e4c03fdfaa5bebd +$(PKG)_VERSION := 8.31-1 +$(PKG)_x86_64_CS := 5db58c684c78aebde571e4dd51c4c034edc9fcbb +$(PKG)_i686_CS := e8fe22b71b6920a0efb6ad56a0b4a6b27dc3b5df $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-gawk.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-gawk.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-gawk $(PKG)_NAME := gawk $(PKG)_IGNORE := -$(PKG)_VERSION := 4.2.1-2 -$(PKG)_x86_64_CS := 415d71df83a88d8ffff6a677b43a8849324bd7d2 -$(PKG)_i686_CS := 8a26d03e998a2016581cb74afaae3b04619c15a2 +$(PKG)_VERSION := 5.0.0-1 +$(PKG)_x86_64_CS := 023728759a84a74bb709b1f90ce0670c5be59307 +$(PKG)_i686_CS := 5f51d7c7539b476c8231c3bedc60973738873800 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-gnupg.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-gnupg.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-gnupg $(PKG)_NAME := gnupg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.13-1 -$(PKG)_x86_64_CS := 100a9acc1e381ac712f0f3a01421e5617856c4e2 -$(PKG)_i686_CS := 3af591f72fa6eb61de5accd2ef4d748362e0f74a +$(PKG)_VERSION := 2.2.15-2 +$(PKG)_x86_64_CS := 524c181d0e897d475976e1bd5fb01775336948ff +$(PKG)_i686_CS := ccbf6a61c16f232591f77652c9eaf054c1733d8c $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-icu.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-icu.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-icu $(PKG)_NAME := icu $(PKG)_IGNORE := -$(PKG)_VERSION := 62.1-1 -$(PKG)_x86_64_CS := a6a31d886ce03757e195aa4634d8ae235d68ec19 -$(PKG)_i686_CS := 5ac2d3d0f9f1a358cd4f0e01681d267095d0c244 +$(PKG)_VERSION := 64.2-1 +$(PKG)_x86_64_CS := f168ad6444210bbee9bad17b5b707d13e15a22de +$(PKG)_i686_CS := 81b890c84a6c9d5318dcc0873d5332564bd23a86 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-info.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-info.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-info $(PKG)_NAME := info $(PKG)_IGNORE := -$(PKG)_VERSION := 6.5-2 -$(PKG)_x86_64_CS := f1f2c55e12c5a89a43eb22094c3b8aca8a04930c -$(PKG)_i686_CS := b53ec634836a83338826ade33b543523b7306a34 +$(PKG)_VERSION := 6.6-1 +$(PKG)_x86_64_CS := 17ade94f70cc6be42ab9278bee36a10af94a9ce0 +$(PKG)_i686_CS := 0f02514a25379729286b887079fc70a59ea26770 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libgnutls.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-libgnutls.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-libgnutls $(PKG)_NAME := libgnutls $(PKG)_IGNORE := -$(PKG)_VERSION := 3.6.6-2 -$(PKG)_x86_64_CS := a0da342db1b81e035ea56b0f024062f7c16c632c -$(PKG)_i686_CS := ea19644f8b0e21e6db2c95dfd58622a699da5949 +$(PKG)_VERSION := 3.6.7.1-1 +$(PKG)_x86_64_CS := c34fd9d0eca5b5af39ddeb87349b6f5c2e649e4a +$(PKG)_i686_CS := ad3808ee7e47b5c8da231a52cd9207b714855d91 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libgpg-error.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-libgpg-error.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-libgpg-error $(PKG)_NAME := libgpg-error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.35-1 -$(PKG)_x86_64_CS := e270f4948638e580082b0d3897e1a1ef87efc44b -$(PKG)_i686_CS := c746bb46c056c29d882306f678282668835511b7 +$(PKG)_VERSION := 1.36-1 +$(PKG)_x86_64_CS := 8837aeb987bf41a95eedd4b138ba80711035b9d6 +$(PKG)_i686_CS := e00f646af631698d3def91323851537efc9533e3 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libgpgme.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-libgpgme.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-libgpgme $(PKG)_NAME := libgpgme $(PKG)_IGNORE := -$(PKG)_VERSION := 1.12.0-1 -$(PKG)_x86_64_CS := af3ca18374cfb2addc3e69036a2168d410b934aa -$(PKG)_i686_CS := 10f97bef6ffa684efe8d9c9c433743cddc29756b +$(PKG)_VERSION := 1.13.0-1 +$(PKG)_x86_64_CS := 90899a4f20802b2461555d4b722d4ba6d5a730cc +$(PKG)_i686_CS := fb850eeb3691abba71aca0a3a1bb66633982a8e6 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libpcre.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-libpcre.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-libpcre $(PKG)_NAME := libpcre $(PKG)_IGNORE := -$(PKG)_VERSION := 8.43-1 -$(PKG)_x86_64_CS := c64ab1c4b69290aa95d7da0b04539e0b7ff47917 -$(PKG)_i686_CS := a3b55e1c2b64829e7ed39c4d048377dadb43f0d8 +$(PKG)_VERSION := 8.43-2 +$(PKG)_x86_64_CS := c027408862b0d12fa2d91395626c9cca14524889 +$(PKG)_i686_CS := 214e48b4027d9ae9a72748fb06093f1d5c7823ac $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libpcre2.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-libpcre2.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-libpcre2 $(PKG)_NAME := libpcre2_8 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.32-1 -$(PKG)_x86_64_CS := 37ad08587df7816ce06a8f87ea603876c6e57c7a -$(PKG)_i686_CS := f638c43e758093f8385472d63008d78456b1da12 +$(PKG)_VERSION := 10.33-2 +$(PKG)_x86_64_CS := 135f3119ee024d5987755097c4c382c07bc9a504 +$(PKG)_i686_CS := 79b9cb39dbbc15cbf5c650de14f99417c6578907 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libreadline.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-libreadline.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-libreadline $(PKG)_NAME := libreadline $(PKG)_IGNORE := -$(PKG)_VERSION := 7.0.005-1 -$(PKG)_x86_64_CS := 1c0a38fc087a71894475e18a204d893f169d5565 -$(PKG)_i686_CS := 04f47a00672b7208e3e60a8171ebcbdac73b747f +$(PKG)_VERSION := 8.0.000-1 +$(PKG)_x86_64_CS := 398cd22583c8669ac67c493b7d8c558500bb115e +$(PKG)_i686_CS := 3a0ecbf06498d6e7a9eb35339b8ee730b77756b2 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libsqlite.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-libsqlite.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-libsqlite $(PKG)_NAME := libsqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3.21.0-4 -$(PKG)_x86_64_CS := f3b13910f3ecf590d9ba0415afe96bef70816986 -$(PKG)_i686_CS := cfbcd80b3ffcdc88acf4da36c4541e849debc2ee +$(PKG)_VERSION := 3.27.2-2 +$(PKG)_x86_64_CS := ae7c572465a6dc429d3489a23c8c1cbf7f7427f1 +$(PKG)_i686_CS := 84f8e8e04f824d429f7d935826e02290c7919ae2 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libutil-linux.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-libutil-linux.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-libutil-linux $(PKG)_NAME := libutil-linux $(PKG)_IGNORE := -$(PKG)_VERSION := 2.32.1-1 -$(PKG)_x86_64_CS := 5e768cff80fbd19fa942122ac097d1f9c905d70f -$(PKG)_i686_CS := bcd4925506a18dcfd98358426527e2840ca79a04 +$(PKG)_VERSION := 2.33.1-1 +$(PKG)_x86_64_CS := 24629fffe643c71d089ff5ecbeb3983a51212b82 +$(PKG)_i686_CS := b7a387aa81352673a3a703eef82cab35f75382f5 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libxml2.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-libxml2.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-libxml2 $(PKG)_NAME := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9.9-2 -$(PKG)_x86_64_CS := a16675ca81679b03d27f4074c5f78efb4979dfd0 -$(PKG)_i686_CS := 4f67b8a87e69b207bb89d6e219d902217e511fc3 +$(PKG)_VERSION := 2.9.9-4 +$(PKG)_x86_64_CS := 2128fc0d9435cff7ebcfd17ada726473609f7f4f +$(PKG)_i686_CS := 68395a44bf25c009c2a86918727d26a2b2ec112e $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-mintty.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-mintty.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-mintty $(PKG)_NAME := mintty $(PKG)_IGNORE := -$(PKG)_VERSION := 1~2.9.5-1 -$(PKG)_x86_64_CS := 7a114bf19a8069d33aaeefa664709472d8b56495 -$(PKG)_i686_CS := 914c7ebcbab1f295bb23ba9927b4e507e63f1343 +$(PKG)_VERSION := 1~3.0.0-1 +$(PKG)_x86_64_CS := 2148825f6afd1ae3891d1be1ff52fc134367a86d +$(PKG)_i686_CS := f79e2f65b051c0092733694b832a4ee836dd2566 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-runtime.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-runtime.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-runtime $(PKG)_NAME := msys2-runtime $(PKG)_IGNORE := -$(PKG)_VERSION := 2.11.2-1 -$(PKG)_x86_64_CS := 2852fcd410054a962fb0dc5768f4508d486e4f8d -$(PKG)_i686_CS := 69b2a13db00b2f3088718eb83f87a5d7135b9fe9 +$(PKG)_VERSION := 3.0.6-1 +$(PKG)_x86_64_CS := d72a1613b424c8055d974eac30650712e44a3938 +$(PKG)_i686_CS := ec37026ac5f3e33ad3723ffc177aa3a1b8b9975b $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-wget.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/msys2-wget.mk Thu May 30 05:14:20 2019 -0400 @@ -4,9 +4,9 @@ PKG := msys2-wget $(PKG)_NAME := wget $(PKG)_IGNORE := -$(PKG)_VERSION := 1.20.1-2 -$(PKG)_x86_64_CS := 9201a33d4301cd6f590ca0baa37b1ba4efe1a695 -$(PKG)_i686_CS := 7b789dbd5ddd2abc53a3f8c74769c95f74c3ac98 +$(PKG)_VERSION := 1.20.3-1 +$(PKG)_x86_64_CS := 1ab446bb4804de21f82781325c402a8751d0554e +$(PKG)_i686_CS := 7acffc43c7ebec2741173d229361bc39b24efb05 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/of-control-1-deprecated.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1100 +0,0 @@ -# HG changeset patch -# User Doug Stewart -# Date 1546452658 18000 -# Wed Jan 02 13:10:58 2019 -0500 -# Node ID 1daba0a585562de91c4078183460f325bf879683 -# Parent fa91b35bee7151b8d81cfcb92d6d0ce6454f98d8 -bug #55361 getting ready for Octave 5 - -diff -r fa91b35bee71 -r 1daba0a58556 src/__control_helper_functions__.cc ---- a/src/__control_helper_functions__.cc Fri May 04 04:10:35 2018 +0200 -+++ b/src/__control_helper_functions__.cc Wed Jan 02 13:10:58 2019 -0500 -@@ -6,7 +6,7 @@ - #include "is_zp_vector.cc" - #include "lti_input_idx.cc" - --#include "nfields2.cc" // delete this if support for Octave 3.8 gets dropped -+// #include "nfields2.cc" // delete this if support for Octave 3.8 gets dropped - - - -# HG changeset patch -# User Doug Stewart -# Date 1546468344 18000 -# Wed Jan 02 17:32:24 2019 -0500 -# Node ID e8c2f63907da0ec4729ba4f33c2d54d674838d45 -# Parent 1daba0a585562de91c4078183460f325bf879683 -is_matrix.cc bug #55361 getting ready for Octave 5 - -diff -r 1daba0a58556 -r e8c2f63907da src/is_matrix.cc ---- a/src/is_matrix.cc Wed Jan 02 13:10:58 2019 -0500 -+++ b/src/is_matrix.cc Wed Jan 02 17:32:24 2019 -0500 -@@ -48,8 +48,8 @@ - { - for (octave_idx_type i = 0; i < nargin; i++) - { -- if (args(i).ndims () != 2 || ! args(i).is_numeric_type () -- || ! (args(i).is_complex_type () || args(i).is_real_type ()) -+ if (args(i).ndims () != 2 || ! args(i).isnumeric () -+ || ! (args(i).iscomplex () || args(i).isreal ()) - || (args(i).array_value().isfinite().all().all()(0) != true)) - { - retval = false; -# HG changeset patch -# User Doug Stewart -# Date 1546468851 18000 -# Wed Jan 02 17:40:51 2019 -0500 -# Node ID a72e758cab961c2a25ab9b8319a9f101c9d8d037 -# Parent e8c2f63907da0ec4729ba4f33c2d54d674838d45 -bug #55361 getting ready for Octave 5 - -diff -r e8c2f63907da -r a72e758cab96 src/is_real_matrix.cc ---- a/src/is_real_matrix.cc Wed Jan 02 17:32:24 2019 -0500 -+++ b/src/is_real_matrix.cc Wed Jan 02 17:40:51 2019 -0500 -@@ -48,8 +48,8 @@ - { - for (octave_idx_type i = 0; i < nargin; i++) - { -- if (args(i).ndims () != 2 || ! args(i).is_numeric_type () -- || ! args(i).is_real_type () -+ if (args(i).ndims () != 2 || ! args(i).isnumeric () -+ || ! args(i).isreal () - || (args(i).array_value().isfinite().all().all()(0) != true)) - { - retval = false; -diff -r e8c2f63907da -r a72e758cab96 src/is_real_scalar.cc ---- a/src/is_real_scalar.cc Wed Jan 02 17:32:24 2019 -0500 -+++ b/src/is_real_scalar.cc Wed Jan 02 17:40:51 2019 -0500 -@@ -48,8 +48,8 @@ - { - for (octave_idx_type i = 0; i < nargin; i++) - { - if (args(i).ndims () != 2 || ! args(i).is_scalar_type () -- || ! args(i).is_numeric_type () || ! args(i).is_real_type () -+ || ! args(i).isnumeric () || ! args(i).isreal () - || (args(i).array_value().isfinite().all().all()(0) != true)) - { - retval = false; -# HG changeset patch -# User Doug Stewart -# Date 1546469478 18000 -# Wed Jan 02 17:51:18 2019 -0500 -# Node ID 0462251d1ef7923540e49c73a8376e87688c0590 -# Parent a72e758cab961c2a25ab9b8319a9f101c9d8d037 -bug #55361 getting ready for Octave 5 - -diff -r a72e758cab96 -r 0462251d1ef7 src/is_real_square_matrix.cc ---- a/src/is_real_square_matrix.cc Wed Jan 02 17:40:51 2019 -0500 -+++ b/src/is_real_square_matrix.cc Wed Jan 02 17:51:18 2019 -0500 -@@ -49,7 +49,7 @@ - for (octave_idx_type i = 0; i < nargin; i++) - { - if (args(i).ndims () != 2 || args(i).rows () != args(i).columns () -- || ! args(i).is_numeric_type () || ! args(i).is_real_type () -+ || ! args(i).isnumeric () || ! args(i).isreal () - || (args(i).array_value().isfinite().all().all()(0) != true)) - { - retval = false; -diff -r a72e758cab96 -r 0462251d1ef7 src/is_real_vector.cc ---- a/src/is_real_vector.cc Wed Jan 02 17:40:51 2019 -0500 -+++ b/src/is_real_vector.cc Wed Jan 02 17:51:18 2019 -0500 -@@ -49,7 +49,7 @@ - for (octave_idx_type i = 0; i < nargin; i++) - { - if (args(i).ndims () != 2 || ! (args(i).rows () == 1 || args(i).columns () == 1) -- || ! args(i).is_numeric_type () || ! args(i).is_real_type () -+ || ! args(i).isnumeric () || ! args(i).isreal () - || (args(i).array_value().isfinite().all().all()(0) != true)) - { - retval = false; -diff -r a72e758cab96 -r 0462251d1ef7 src/is_zp_vector.cc ---- a/src/is_zp_vector.cc Wed Jan 02 17:40:51 2019 -0500 -+++ b/src/is_zp_vector.cc Wed Jan 02 17:51:18 2019 -0500 -@@ -50,8 +50,8 @@ - { - if (args(i).ndims () != 2 - || (args(i).rows () > 1 && args(i).columns () > 1) -- || ! args(i).is_numeric_type () -- || ! (args(i).is_complex_type () || args(i).is_real_type ()) -+ || ! args(i).isnumeric () -+ || ! (args(i).iscomplex () || args(i).isreal ()) - || (args(i).array_value().isfinite().all().all()(0) != true)) - { - retval = false; -diff -r a72e758cab96 -r 0462251d1ef7 src/lti_input_idx.cc ---- a/src/lti_input_idx.cc Wed Jan 02 17:40:51 2019 -0500 -+++ b/src/lti_input_idx.cc Wed Jan 02 17:51:18 2019 -0500 -@@ -60,7 +60,7 @@ - octave_idx_type nargin = args.length (); - - // first, check whether a cell is passed -- if (nargin == 1 && args(0).is_defined () && args(0).is_cell ()) -+ if (nargin == 1 && args(0).is_defined () && args(0).iscell ()) - { - octave_idx_type len = args(0).cell_value().numel(); - octave_idx_type idx = len; -@@ -87,7 +87,7 @@ - // and after strings) are not recognized as objects. - // ss (a, b, ltisys, c, d, 'key', val, 'lti', ltisys) - if (len > 0 && idx > 0 -- && args(0).cell_value().elem(idx-1).is_object ()) -+ && args(0).cell_value().elem(idx-1).isobject ()) - { - offset = 1; - } -# HG changeset patch -# User Doug Stewart -# Date 1546532608 18000 -# Thu Jan 03 11:23:28 2019 -0500 -# Node ID 6f05c32bbbafa758c1d76995e8aab914a67db499 -# Parent 23110e3e6cc745e01e00586ac3cc13d596d8e216 -removed F77_exception_encounterd obsolete - -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ab01od.cc ---- a/src/sl_ab01od.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ab01od.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -72,7 +72,7 @@ - Matrix a = args(0).matrix_value (); - Matrix b = args(1).matrix_value (); - double tol = args(2).double_value (); -- -+f77_exception_encountered - F77_INT n = TO_F77_INT (a.rows ()); // n: number of states - F77_INT m = TO_F77_INT (b.columns ()); // m: number of inputs - -@@ -116,8 +116,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("__sl_ab01od__: exception in SLICOT subroutine AB01OD"); -+// if (f77_exception_encountered) -+// error ("__sl_ab01od__: exception in SLICOT subroutine AB01OD"); - - if (info != 0) - error ("__sl_ab01od__: AB01OD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ab04md.cc ---- a/src/sl_ab04md.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ab04md.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -111,8 +111,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("__sl_ab04md__: exception in SLICOT subroutine AB04MD"); -+// if (f77_exception_encountered) -+// error ("__sl_ab04md__: exception in SLICOT subroutine AB04MD"); - - if (info != 0) - error ("__sl_ab04md__: AB04MD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ab08nd.cc ---- a/src/sl_ab08nd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ab08nd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -149,8 +149,8 @@ - iwork, dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("ss: zero: __sl_ab08nd__: exception in SLICOT subroutine AB08ND"); -+// if (f77_exception_encountered) -+// error ("ss: zero: __sl_ab08nd__: exception in SLICOT subroutine AB08ND"); - - if (info != 0) - error ("ss: zero: __sl_ab08nd__: AB08ND returned info = %d", info); -@@ -186,8 +186,8 @@ - work, lwork, - info2)); - -- if (f77_exception_encountered) -- error ("ss: zero: __sl_ab08nd__: exception in LAPACK subroutine DGGEV"); -+// if (f77_exception_encountered) -+// error ("ss: zero: __sl_ab08nd__: exception in LAPACK subroutine DGGEV"); - - if (info2 != 0) - error ("ss: zero: __sl_ab08nd__: DGGEV returned info = %d", info2); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ab09hd.cc ---- a/src/sl_ab09hd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ab09hd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -174,8 +174,8 @@ - bwork, - iwarn, info)); - -- if (f77_exception_encountered) -- error ("bstmodred: exception in SLICOT subroutine AB09HD"); -+// if (f77_exception_encountered) -+// error ("bstmodred: exception in SLICOT subroutine AB09HD"); - - - static const char* err_msg[] = { -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ab09id.cc ---- a/src/sl_ab09id.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ab09id.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -315,8 +315,8 @@ - dwork, ldwork, - iwarn, info)); - -- if (f77_exception_encountered) -- error ("modred: exception in SLICOT subroutine AB09ID"); -+// if (f77_exception_encountered) -+// error ("modred: exception in SLICOT subroutine AB09ID"); - - - static const char* err_msg[] = { -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ab09jd.cc ---- a/src/sl_ab09jd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ab09jd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -290,8 +290,8 @@ - dwork, ldwork, - iwarn, info)); - -- if (f77_exception_encountered) -- error ("hnamodred: exception in SLICOT subroutine AB09JD"); -+// if (f77_exception_encountered) -+// error ("hnamodred: exception in SLICOT subroutine AB09JD"); - - - static const char* err_msg[] = { -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ab13ad.cc ---- a/src/sl_ab13ad.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ab13ad.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -98,7 +98,7 @@ - - // workspace - F77_INT ldwork = max (1, n*(max (n, m, p) + 5) + n*(n+1)/2); -- -+ f77_exception_encountered - OCTAVE_LOCAL_BUFFER (double, dwork, ldwork); - - // error indicators -@@ -118,8 +118,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("hsvd: __sl_ab13ad__: exception in SLICOT subroutine AB13AD"); -+// if (f77_exception_encountered) -+// error ("hsvd: __sl_ab13ad__: exception in SLICOT subroutine AB13AD"); - - if (info != 0) - error ("hsvd: __sl_ab13ad__: AB13AD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ab13bd.cc ---- a/src/sl_ab13bd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ab13bd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -22,7 +22,7 @@ - <http://www.slicot.org> - - Author: Lukas Reichlin <lukas.reichlin@gmail.com> --Created: November 2009 -+Created: November 2009f77_exception_encountered - Version: 0.5 - - */ -@@ -118,8 +118,8 @@ - iwarn, - info); - -- if (f77_exception_encountered) -- error ("lti: norm: __sl_ab13bd__: exception in SLICOT subroutine AB13BD"); -+// if (f77_exception_encountered) -+// error ("lti: norm: __sl_ab13bd__: exception in SLICOT subroutine AB13BD"); - - if (info != 0) - error ("lti: norm: __sl_ab13bd__: AB13BD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ab13dd.cc ---- a/src/sl_ab13dd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ab13dd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -143,8 +143,8 @@ - cwork, lcwork, - info)); - -- if (f77_exception_encountered) -- error ("lti: norm: __sl_ab13dd__: exception in SLICOT subroutine AB13DD"); -+// if (f77_exception_encountered) -+// error ("lti: norm: __sl_ab13dd__: exception in SLICOT subroutine AB13DD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ag08bd.cc ---- a/src/sl_ag08bd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ag08bd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -152,8 +152,8 @@ - iwork, dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("dss: zero: __sl_ag08bd__: exception in SLICOT subroutine AG08BD"); -+// if (f77_exception_encountered) -+// error ("dss: zero: __sl_ag08bd__: exception in SLICOT subroutine AG08BD"); - - if (info != 0) - error ("dss: zero: __sl_ag08bd__: AG08BD returned info = %d", info); -@@ -182,7 +182,7 @@ - OCTAVE_LOCAL_BUFFER (double, work, lwork); - - F77_INT info2; -- -+ f77_exception_encountered - F77_XFCN (dggev, DGGEV, - (jobvl, jobvr, - nfz, -@@ -195,8 +195,8 @@ - work, lwork, - info2)); - -- if (f77_exception_encountered) -- error ("dss: zero: __sl_ag08bd__: exception in LAPACK subroutine DGGEV"); -+// if (f77_exception_encountered) -+// error ("dss: zero: __sl_ag08bd__: exception in LAPACK subroutine DGGEV"); - - if (info2 != 0) - error ("dss: zero: __sl_ag08bd__: DGGEV returned info = %d", info2); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ib01ad.cc ---- a/src/sl_ib01ad.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ib01ad.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -330,8 +330,8 @@ - iwarn_a, info_a)); - - -- if (f77_exception_encountered) -- error ("ident: exception in SLICOT subroutine IB01AD"); -+// if (f77_exception_encountered) -+// error ("ident: exception in SLICOT subroutine IB01AD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ib01cd.cc ---- a/src/sl_ib01cd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ib01cd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -159,8 +159,8 @@ - iwarn_c, info_c)); - - -- if (f77_exception_encountered) -- error ("__sl_ib01cd__: exception in SLICOT subroutine IB01CD"); -+// if (f77_exception_encountered) -+// error ("__sl_ib01cd__: exception in SLICOT subroutine IB01CD"); - - static const char* err_msg_c[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_ident.cc ---- a/src/sl_ident.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_ident.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -366,8 +366,8 @@ - iwarn_a, info_a)); - - -- if (f77_exception_encountered) -- error ("ident: exception in SLICOT subroutine IB01AD"); -+// if (f77_exception_encountered) -+// error ("ident: exception in SLICOT subroutine IB01AD"); - - static const char* err_msg[] = { - "0: OK", -@@ -545,8 +545,8 @@ - iwarn_b, info_b)); - - -- if (f77_exception_encountered) -- error ("ident: exception in SLICOT subroutine IB01BD"); -+// if (f77_exception_encountered) -+// error ("ident: exception in SLICOT subroutine IB01BD"); - - static const char* err_msg_b[] = { - "0: OK", -@@ -667,8 +667,8 @@ - iwarn_c, info_c)); - - -- if (f77_exception_encountered) -- error ("ident: exception in SLICOT subroutine IB01CD"); -+// if (f77_exception_encountered) -+// error ("ident: exception in SLICOT subroutine IB01CD"); - - static const char* err_msg_c[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_mb05nd.cc ---- a/src/sl_mb05nd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_mb05nd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -93,8 +93,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("__sl_mb05nd__: exception in SLICOT subroutine MB05ND"); -+// if (f77_exception_encountered) -+// error ("__sl_mb05nd__: exception in SLICOT subroutine MB05ND"); - - if (info > 0) - { -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb01bd.cc ---- a/src/sl_sb01bd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb01bd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -23,7 +23,7 @@ - - Author: Lukas Reichlin <lukas.reichlin@gmail.com> - Created: November 2009 --Version: 0.6 -+Version: 0.6f77_exception_encountered - - */ - -@@ -121,8 +121,8 @@ - dwork, ldwork, - iwarn, info)); - -- if (f77_exception_encountered) -- error ("place: __sl_sb01bd__: exception in SLICOT subroutine SB01BD"); -+// if (f77_exception_encountered) -+// error ("place: __sl_sb01bd__: exception in SLICOT subroutine SB01BD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb02od.cc ---- a/src/sl_sb02od.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb02od.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -170,8 +170,8 @@ - bwork, - info)); - -- if (f77_exception_encountered) -- error ("are: __sl_sb02od__: exception in SLICOT subroutine SB02OD"); -+// if (f77_exception_encountered) -+// error ("are: __sl_sb02od__: exception in SLICOT subroutine SB02OD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb03md.cc ---- a/src/sl_sb03md.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb03md.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -118,8 +118,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("lyap: __sl_sb03md__: exception in SLICOT subroutine SB03MD"); -+// if (f77_exception_encountered) -+// error ("lyap: __sl_sb03md__: exception in SLICOT subroutine SB03MD"); - - if (info != 0) - error ("lyap: __sl_sb03md__: SB03MD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb03od.cc ---- a/src/sl_sb03od.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb03od.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -115,8 +115,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("lyapchol: __sl_sb03od__: exception in SLICOT subroutine SB03OD"); -+// if (f77_exception_encountered) -+// error ("lyapchol: __sl_sb03od__: exception in SLICOT subroutine SB03OD"); - - if (info != 0) - error ("lyapchol: __sl_sb03od__: SB03OD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb04md.cc ---- a/src/sl_sb04md.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb04md.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -96,8 +96,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("lyap: __sl_sb04md__: exception in SLICOT subroutine SB04MD"); -+// if (f77_exception_encountered) -+// error ("lyap: __sl_sb04md__: exception in SLICOT subroutine SB04MD"); - - if (info != 0) - error ("lyap: __sl_sb04md__: SB04MD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb04qd.cc ---- a/src/sl_sb04qd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb04qd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -96,8 +96,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("dlyap: __sl_sb04qd__: exception in SLICOT subroutine SB04QD"); -+// if (f77_exception_encountered) -+// error ("dlyap: __sl_sb04qd__: exception in SLICOT subroutine SB04QD"); - - if (info != 0) - error ("dlyap: __sl_sb04qd__: SB04QD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb10ad.cc ---- a/src/sl_sb10ad.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb10ad.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -189,8 +189,8 @@ - bwork, lbwork, - info)); - -- if (f77_exception_encountered) -- error ("hinfsyn: __sl_sb10ad__: exception in SLICOT subroutine SB10AD"); -+// if (f77_exception_encountered) -+// error ("hinfsyn: __sl_sb10ad__: exception in SLICOT subroutine SB10AD"); - - static const char* err_msg[] = { - "0: successful exit", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb10dd.cc ---- a/src/sl_sb10dd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb10dd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -150,8 +150,8 @@ - bwork, - info)); - -- if (f77_exception_encountered) -- error ("hinfsyn: __sl_sb10dd__: exception in SLICOT subroutine SB10DD"); -+// if (f77_exception_encountered) -+// error ("hinfsyn: __sl_sb10dd__: exception in SLICOT subroutine SB10DD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb10ed.cc ---- a/src/sl_sb10ed.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb10ed.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -138,8 +138,8 @@ - bwork, - info)); - -- if (f77_exception_encountered) -- error ("h2syn: __sl_sb10ed__: exception in SLICOT subroutine SB10ED"); -+ // if (f77_exception_encountered) -+ // error ("h2syn: __sl_sb10ed__: exception in SLICOT subroutine SB10ED"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb10fd.cc ---- a/src/sl_sb10fd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb10fd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -143,8 +143,8 @@ - bwork, - info)); - -- if (f77_exception_encountered) -- error ("hinfsyn: __sl_sb10fd__: exception in SLICOT subroutine SB10FD"); -+// if (f77_exception_encountered) -+// error ("hinfsyn: __sl_sb10fd__: exception in SLICOT subroutine SB10FD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb10hd.cc ---- a/src/sl_sb10hd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb10hd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -135,8 +135,8 @@ - bwork, - info)); - -- if (f77_exception_encountered) -- error ("h2syn: __sl_sb10hd__: exception in SLICOT subroutine SB10HD"); -+// if (f77_exception_encountered) -+// error ("h2syn: __sl_sb10hd__: exception in SLICOT subroutine SB10HD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb10id.cc ---- a/src/sl_sb10id.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb10id.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -127,8 +127,8 @@ - bwork, - info)); - -- if (f77_exception_encountered) -- error ("ncfsyn: __sl_sb10id__: exception in SLICOT subroutine SB10ID"); -+// if (f77_exception_encountered) -+// error ("ncfsyn: __sl_sb10id__: exception in SLICOT subroutine SB10ID"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb10jd.cc ---- a/src/sl_sb10jd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb10jd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -100,8 +100,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("__sl_sb10jd__: exception in SLICOT subroutine SB10JD"); -+// if (f77_exception_encountered) -+// error ("__sl_sb10jd__: exception in SLICOT subroutine SB10JD"); - - if (info != 0) - error ("__sl_sb10jd__: SB10JD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb10kd.cc ---- a/src/sl_sb10kd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb10kd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -123,8 +123,8 @@ - bwork, - info)); - -- if (f77_exception_encountered) -- error ("ncfsyn: slsb10kd: exception in SLICOT subroutine SB10KD"); -+// if (f77_exception_encountered) -+// error ("ncfsyn: slsb10kd: exception in SLICOT subroutine SB10KD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb10yd.cc ---- a/src/sl_sb10yd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb10yd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -141,8 +141,8 @@ - zwork, lzwork, - info)); - -- if (f77_exception_encountered) -- error ("fitfrd: __sl_sb10yd__: exception in SLICOT subroutine SB10YD"); -+// if (f77_exception_encountered) -+// error ("fitfrd: __sl_sb10yd__: exception in SLICOT subroutine SB10YD"); - - if (info != 0) - error ("fitfrd: __sl_sb10yd__: SB10YD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb10zd.cc ---- a/src/sl_sb10zd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb10zd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -130,8 +130,8 @@ - bwork, - info)); - -- if (f77_exception_encountered) -- error ("ncfsyn: __sl_sb10zd__: exception in SLICOT subroutine SB10ZD"); -+// if (f77_exception_encountered) -+// error ("ncfsyn: __sl_sb10zd__: exception in SLICOT subroutine SB10ZD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb16ad.cc ---- a/src/sl_sb16ad.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb16ad.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -261,8 +261,8 @@ - iwarn, info)); - - -- if (f77_exception_encountered) -- error ("conred: exception in SLICOT subroutine SB16AD"); -+// if (f77_exception_encountered) -+// error ("conred: exception in SLICOT subroutine SB16AD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb16bd.cc ---- a/src/sl_sb16bd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb16bd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -225,8 +225,8 @@ - iwarn, info)); - - -- if (f77_exception_encountered) -- error ("cfconred: exception in SLICOT subroutine SB16BD"); -+// if (f77_exception_encountered) -+// error ("cfconred: exception in SLICOT subroutine SB16BD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sb16cd.cc ---- a/src/sl_sb16cd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sb16cd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -190,8 +190,8 @@ - iwarn, info)); - - -- if (f77_exception_encountered) -- error ("fwcfconred: exception in SLICOT subroutine SB16CD"); -+// if (f77_exception_encountered) -+// error ("fwcfconred: exception in SLICOT subroutine SB16CD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sg02ad.cc ---- a/src/sl_sg02ad.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sg02ad.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -179,8 +179,8 @@ - bwork, - iwarn, info)); - -- if (f77_exception_encountered) -- error ("are: __sl_sg02ad__: exception in SLICOT subroutine SG02AD"); -+// if (f77_exception_encountered) -+// error ("are: __sl_sg02ad__: exception in SLICOT subroutine SG02AD"); - - static const char* err_msg[] = { - "0: OK", -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sg03ad.cc ---- a/src/sl_sg03ad.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sg03ad.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -132,8 +132,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("lyap: __sl_sg03ad__: exception in SLICOT subroutine SG03AD"); -+// if (f77_exception_encountered) -+// error ("lyap: __sl_sg03ad__: exception in SLICOT subroutine SG03AD"); - - if (info != 0) - error ("lyap: __sl_sg03ad__: SG03AD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_sg03bd.cc ---- a/src/sl_sg03bd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_sg03bd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -123,8 +123,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("lyap: __sl_sg03bd__: exception in SLICOT subroutine SG03BD"); -+// if (f77_exception_encountered) -+// error ("lyap: __sl_sg03bd__: exception in SLICOT subroutine SG03BD"); - - if (info != 0) - error ("lyap: __sl_sg03bd__: SG03BD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_tb01id.cc ---- a/src/sl_tb01id.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_tb01id.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -95,8 +95,8 @@ - scale.fortran_vec (), - info)); - -- if (f77_exception_encountered) -- error ("ss: prescale: __sl_tb01id__: exception in SLICOT subroutine TB01ID"); -+// if (f77_exception_encountered) -+// error ("ss: prescale: __sl_tb01id__: exception in SLICOT subroutine TB01ID"); - - if (info != 0) - error ("ss: prescale: __sl_tb01id__: TB01ID returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_tb01pd.cc ---- a/src/sl_tb01pd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_tb01pd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -119,8 +119,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("ss: minreal: __sl_tb01pd__: exception in SLICOT subroutine TB01PD"); -+// if (f77_exception_encountered) -+// error ("ss: minreal: __sl_tb01pd__: exception in SLICOT subroutine TB01PD"); - - if (info != 0) - error ("ss: minreal: __sl_tb01pd__: TB01PD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_tb01ud.cc ---- a/src/sl_tb01ud.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_tb01ud.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -116,8 +116,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("__sl_tb01ud__: exception in SLICOT subroutine TB01UD"); -+// if (f77_exception_encountered) -+// error ("__sl_tb01ud__: exception in SLICOT subroutine TB01UD"); - - if (info != 0) - error ("__sl_tb01ud__: TB01UD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_tb04bd.cc ---- a/src/sl_tb04bd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_tb04bd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -131,8 +131,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("ss2tf: __sl_tb04bd__: exception in SLICOT subroutine TB04BD"); -+// if (f77_exception_encountered) -+// error ("ss2tf: __sl_tb04bd__: exception in SLICOT subroutine TB04BD"); - - if (info != 0) - error ("ss2tf: __sl_tb04bd__: TB04BD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_td04ad.cc ---- a/src/sl_td04ad.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_td04ad.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -130,8 +130,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("tf2ss: __sl_td04ad__: exception in SLICOT subroutine TD04AD"); -+// if (f77_exception_encountered) -+// error ("tf2ss: __sl_td04ad__: exception in SLICOT subroutine TD04AD"); - - if (info != 0) - error ("tf2ss: __sl_td04ad__: TD04AD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_tg01ad.cc ---- a/src/sl_tg01ad.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_tg01ad.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -105,8 +105,8 @@ - dwork, - info)); - -- if (f77_exception_encountered) -- error ("ss: prescale: __sl_tg01ad__: exception in SLICOT subroutine TG01AD"); -+// if (f77_exception_encountered) -+// error ("ss: prescale: __sl_tg01ad__: exception in SLICOT subroutine TG01AD"); - - if (info != 0) - error ("ss: prescale: __sl_tg01ad__: TG01AD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_tg01fd.cc ---- a/src/sl_tg01fd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_tg01fd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -130,8 +130,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("__sl_tg01fd__: exception in SLICOT subroutine TG01FD"); -+// if (f77_exception_encountered) -+// error ("__sl_tg01fd__: exception in SLICOT subroutine TG01FD"); - - if (info != 0) - error ("__sl_tg01fd__: TG01FD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_tg01hd.cc ---- a/src/sl_tg01hd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_tg01hd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -122,8 +122,8 @@ - iwork, dwork, - info)); - -- if (f77_exception_encountered) -- error ("__sl_tg01hd__: exception in SLICOT subroutine TG01HD"); -+// if (f77_exception_encountered) -+// error ("__sl_tg01hd__: exception in SLICOT subroutine TG01HD"); - - if (info != 0) - error ("__sl_tg01hd__: TG01HD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_tg01id.cc ---- a/src/sl_tg01id.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_tg01id.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -124,8 +124,8 @@ - iwork, dwork, - info)); - -- if (f77_exception_encountered) -- error ("__sl_tg01id__: exception in SLICOT subroutine TG01ID"); -+// if (f77_exception_encountered) -+// error ("__sl_tg01id__: exception in SLICOT subroutine TG01ID"); - - if (info != 0) - error ("__sl_tg01id__: TG01ID returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_tg01jd.cc ---- a/src/sl_tg01jd.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_tg01jd.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -189,8 +189,8 @@ - dwork, ldwork, - info)); - -- if (f77_exception_encountered) -- error ("dss: minreal: __sl_tg01jd__: exception in SLICOT subroutine TG01JD"); -+// if (f77_exception_encountered) -+// error ("dss: minreal: __sl_tg01jd__: exception in SLICOT subroutine TG01JD"); - - if (info != 0) - error ("dss: minreal: __sl_tg01jd__: TG01JD returned info = %d", info); -diff -r 23110e3e6cc7 -r 6f05c32bbbaf src/sl_tg04bx.cc ---- a/src/sl_tg04bx.cc Thu Jan 03 09:19:49 2019 -0500 -+++ b/src/sl_tg04bx.cc Thu Jan 03 11:23:28 2019 -0500 -@@ -106,8 +106,8 @@ - gain, - iwork)); - -- if (f77_exception_encountered) -- error ("dss: zero: __sl_tg04bx__: exception in TG04BX"); -+// if (f77_exception_encountered) -+// error ("dss: zero: __sl_tg04bx__: exception in TG04BX"); - - // return values - retval(0) = octave_value (gain); -# HG changeset patch -# User Doug Stewart -# Date 1546533621 18000 -# Thu Jan 03 11:40:21 2019 -0500 -# Node ID 3243832f441cd1cc8417b02bf37f3253204be681 -# Parent 6f05c32bbbafa758c1d76995e8aab914a67db499 -removed F77_exception_encounterd obsolete - -diff -r 6f05c32bbbaf -r 3243832f441c src/sl_ab01od.cc ---- a/src/sl_ab01od.cc Thu Jan 03 11:23:28 2019 -0500 -+++ b/src/sl_ab01od.cc Thu Jan 03 11:40:21 2019 -0500 -@@ -72,7 +72,7 @@ - Matrix a = args(0).matrix_value (); - Matrix b = args(1).matrix_value (); - double tol = args(2).double_value (); --f77_exception_encountered -+// f77_exception_encountered - F77_INT n = TO_F77_INT (a.rows ()); // n: number of states - F77_INT m = TO_F77_INT (b.columns ()); // m: number of inputs - -diff -r 6f05c32bbbaf -r 3243832f441c src/sl_ab13ad.cc ---- a/src/sl_ab13ad.cc Thu Jan 03 11:23:28 2019 -0500 -+++ b/src/sl_ab13ad.cc Thu Jan 03 11:40:21 2019 -0500 -@@ -98,7 +98,7 @@ - - // workspace - F77_INT ldwork = max (1, n*(max (n, m, p) + 5) + n*(n+1)/2); -- f77_exception_encountered -+// f77_exception_encountered - OCTAVE_LOCAL_BUFFER (double, dwork, ldwork); - - // error indicators -diff -r 6f05c32bbbaf -r 3243832f441c src/sl_ag08bd.cc ---- a/src/sl_ag08bd.cc Thu Jan 03 11:23:28 2019 -0500 -+++ b/src/sl_ag08bd.cc Thu Jan 03 11:40:21 2019 -0500 -@@ -182,7 +182,7 @@ - OCTAVE_LOCAL_BUFFER (double, work, lwork); - - F77_INT info2; -- f77_exception_encountered -+// f77_exception_encountered - F77_XFCN (dggev, DGGEV, - (jobvl, jobvr, - nfz, -# HG changeset patch -# User Mike Miller <mtmiller@octave.org> -# Date 1549586531 28800 -# Thu Feb 07 16:42:11 2019 -0800 -# Node ID 549466e74db52bae75e2da528c88f4a1c9339065 -# Parent 37e80b55b0f9339106a56c3b19118c1b1cdf05f4 -use numfields, drop all references to deleted nfields2 (bug #55671) - -* @lti/__lti_group__.m: Use numfields as a replacement for nfields2. Remove -workaround for ancient bug in orderfields. -* @lti/__lti_prune__.m: Use numfields as a replacement for nfields2. -* @lti/display.m: Likewise. -* __control_helper_functions__.cc: Delete commented inclusion of nfields2.cc. -* nfields2.cc: Delete. - -diff -r 37e80b55b0f9 -r 549466e74db5 inst/@lti/__lti_group__.m ---- a/inst/@lti/__lti_group__.m Thu Jan 10 11:52:56 2019 -0500 -+++ b/inst/@lti/__lti_group__.m Thu Feb 07 16:42:11 2019 -0800 -@@ -31,7 +31,7 @@ - if (any (strcmpi (dim, {"blkdiag", "horzcat"}))) # blkdiag, horzcat - retlti.inname = [lti1.inname; lti2.inname]; - -- if (nfields2 (lti1.ingroup) || nfields2 (lti2.ingroup)) -+ if (numfields (lti1.ingroup) || numfields (lti2.ingroup)) - m1 = numel (lti1.inname); - lti2_ingroup = structfun (@(x) x + m1, lti2.ingroup, "uniformoutput", false); - retlti.ingroup = __merge_struct__ (lti1.ingroup, lti2_ingroup); -@@ -44,7 +44,7 @@ - if (any (strcmpi (dim, {"blkdiag", "vertcat"}))) # blkdiag, vertcat - retlti.outname = [lti1.outname; lti2.outname]; - -- if (nfields2 (lti1.outgroup) || nfields2 (lti2.outgroup)) -+ if (numfields (lti1.outgroup) || numfields (lti2.outgroup)) - p1 = numel (lti1.outname); - lti2_outgroup = structfun (@(x) x + p1, lti2.outgroup, "uniformoutput", false); - retlti.outgroup = __merge_struct__ (lti1.outgroup, lti2_outgroup); -@@ -76,14 +76,8 @@ - ## FIXME: this is too complicated; - ## isn't there a simple function for this task? - -- ## bug #40224: orderfields (struct ()) errors out in Octave 3.6.4 -- ## therefore use nfields2 to check for empty structs -- if (nfields2 (a)) -- a = orderfields (a); -- endif -- if (nfields2 (b)) -- b = orderfields (b); -- endif -+ a = orderfields (a); -+ b = orderfields (b); - - fa = fieldnames (a); - fb = fieldnames (b); -diff -r 37e80b55b0f9 -r 549466e74db5 inst/@lti/__lti_prune__.m ---- a/inst/@lti/__lti_prune__.m Thu Jan 10 11:52:56 2019 -0500 -+++ b/inst/@lti/__lti_prune__.m Thu Feb 07 16:42:11 2019 -0800 -@@ -42,14 +42,14 @@ - in_idx = vertcat (tmp{:}); - endif - -- if (nfields2 (lti.outgroup)) -+ if (numfields (lti.outgroup)) - p = numel (lti.outname); # get size before pruning outnames! - [lti.outgroup, empty] = structfun (@(x) __group_prune__ (x, out_idx, p), lti.outgroup, "uniformoutput", false); - empty = cell2mat (struct2cell (empty)); - fields = fieldnames (lti.outgroup); - lti.outgroup = rmfield (lti.outgroup, fields(empty)); - endif -- if (nfields2 (lti.ingroup)) -+ if (numfields (lti.ingroup)) - m = numel (lti.inname); - [lti.ingroup, empty] = structfun (@(x) __group_prune__ (x, in_idx, m), lti.ingroup, "uniformoutput", false); - empty = cell2mat (struct2cell (empty)); -diff -r 37e80b55b0f9 -r 549466e74db5 inst/@lti/display.m ---- a/inst/@lti/display.m Thu Jan 10 11:52:56 2019 -0500 -+++ b/inst/@lti/display.m Thu Feb 07 16:42:11 2019 -0800 -@@ -24,11 +24,11 @@ - - function display (sys) - -- if (nfields2 (sys.ingroup) > 0) -+ if (numfields (sys.ingroup) > 0) - __disp_group__ (sys.ingroup, "Input"); - endif - -- if (nfields2 (sys.outgroup) > 0) -+ if (numfields (sys.outgroup) > 0) - __disp_group__ (sys.outgroup, "Output"); - endif - -diff -r 37e80b55b0f9 -r 549466e74db5 src/__control_helper_functions__.cc ---- a/src/__control_helper_functions__.cc Thu Jan 10 11:52:56 2019 -0500 -+++ b/src/__control_helper_functions__.cc Thu Feb 07 16:42:11 2019 -0800 -@@ -6,9 +6,6 @@ - #include "is_zp_vector.cc" - #include "lti_input_idx.cc" - --// #include "nfields2.cc" // delete this if support for Octave 3.8 gets dropped -- -- - - // stub function to avoid gen_doc_cache warning upon package installation - DEFUN_DLD (__control_helper_functions__, args, nargout, -diff -r 37e80b55b0f9 -r 549466e74db5 src/nfields2.cc ---- a/src/nfields2.cc Thu Jan 10 11:52:56 2019 -0500 -+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 -@@ -1,23 +0,0 @@ --#include <octave/oct.h> --#include <octave/ov-struct.h> -- --// PKG_ADD: autoload ("nfields2", "__control_helper_functions__.oct"); --DEFUN_DLD (nfields2, args, , -- "-*- texinfo -*-\n\ --@deftypefn {Built-in Function} {} nfields (@var{s})\n\ --Return the number of fields of the structure @var{s}.\n\ --@end deftypefn") --{ -- octave_value retval; -- -- octave_idx_type nargin = args.length (); -- -- if (nargin == 1 && args(0).is_map ()) -- { -- retval = static_cast<double> (args(0).nfields ()); -- } -- else -- print_usage (); -- -- return retval; --} -# HG changeset patch -# User Mike Miller <mtmiller@octave.org> -# Date 1549918550 28800 -# Mon Feb 11 12:55:50 2019 -0800 -# Node ID 6c0a3108c82c8d2731e4615bef0c1c3e67cf0922 -# Parent 3b79c72063765b79f5b4e9dfa5acf36ea67d097d -fix build failure with Octave 6 while remaining compatible (bug #55361) - -* common.h (f77_exception_encountered): Define as a constant to retain -functionality that depends on this value in older versions of Octave. - -diff -r 3b79c7206376 -r 6c0a3108c82c src/common.h ---- a/src/common.h Thu Feb 07 17:38:25 2019 -0800 -+++ b/src/common.h Mon Feb 11 12:55:50 2019 -0800 -@@ -47,4 +47,12 @@ - void warning_msg (const char name[], octave_idx_type index, octave_idx_type max, const char* msg[]); - void warning_msg (const char name[], octave_idx_type index, octave_idx_type max, const char* msg[], octave_idx_type offset); - -+// FIXME: Keep until Octave 4.2 and older are no longer supported. -+// This conditional defines f77_exception_encountered as a dummy constant -+// to preserve code that needed to check its value to work correctly in older -+// versions of Octave. -+#if defined (OCTAVE_MAJOR_VERSION) && OCTAVE_MAJOR_VERSION >= 6 -+static const int f77_exception_encountered = 0; - #endif -+ -+#endif
--- a/src/of-control.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/of-control.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := of-control $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1.0 -$(PKG)_CHECKSUM := 573d9256c6c49b9b2940347ef0c8772fc7cbdfce +$(PKG)_VERSION := 3.2.0 +$(PKG)_CHECKSUM := 46e8e04ea456f871d74049fed2db0840e6d7dc8a $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := control-$($(PKG)_VERSION) $(PKG)_FILE := control-$($(PKG)_VERSION).tar.gz
--- a/src/of-dicom-1-fixes.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -uNr a/src/isdicom.cpp b/src/isdicom.cpp ---- a/src/isdicom.cpp 2018-04-08 19:19:05.638729302 -0400 -+++ b/src/isdicom.cpp 2018-04-25 10:44:45.240179042 -0400 -@@ -32,7 +32,7 @@ - reader.SetFileName (filename.c_str ()); - // gdcm::Reader.Read() will return false if the file does not exists but - // also prints to stderr so we check it first. -- return file_stat (filename).exists () && reader.Read (); -+ return octave::sys::file_stat (filename).exists () && reader.Read (); - } - - DEFUN_DLD (isdicom, args, ,
--- a/src/of-dicom.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/of-dicom.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := of-dicom $(PKG)_IGNORE := -$(PKG)_VERSION := 0.2.1 -$(PKG)_CHECKSUM := 122636971340ddc826c8aa35b244d07e66f9e4ac +$(PKG)_VERSION := 0.2.2 +$(PKG)_CHECKSUM := fb86c93098b6d163c499d3cf8bbd3ee381180904 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := dicom-$($(PKG)_VERSION) $(PKG)_FILE := dicom-$($(PKG)_VERSION).tar.gz
--- a/src/of-instrument-control.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/of-instrument-control.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := of-instrument-control $(PKG)_IGNORE := -$(PKG)_VERSION := 0.3.1 -$(PKG)_CHECKSUM := 1ccc5073d26abbff1efb0ef1752e296d063c1aad +$(PKG)_VERSION := 0.4.0 +$(PKG)_CHECKSUM := c3ae1d3b1674f9b78b180c4ac1e7c38a4a998eeb $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := instrument-control-$($(PKG)_VERSION) $(PKG)_FILE := instrument-control-$($(PKG)_VERSION).tar.gz
--- a/src/of-optim-1-fixes.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -uNr a/src/error-helpers.cc b/src/error-helpers.cc ---- a/src/error-helpers.cc 2018-08-01 16:52:02.743298100 -0400 -+++ b/src/error-helpers.cc 2018-08-13 13:34:37.085947522 -0400 -@@ -19,6 +19,8 @@ - - #include <octave/oct.h> - -+#include <iostream> -+ - #include "error-helpers.h" - - // call verror
--- a/src/of-optim-2-deprecated.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,573 +0,0 @@ -# HG changeset patch -# User Olaf Till <i7tiol@t-online.de> -# Date 1547218871 -3600 -# Fri Jan 11 16:01:11 2019 +0100 -# Node ID 5fcbf411d5c2a4b076e3ababeb6126125243e49d -# Parent 158b61118c7557f549656bf76ddc144c70bd3aa5 -remove deprecated samin.cc, still available as backend to nonlin_min - -diff -r 158b61118c75 -r 5fcbf411d5c2 src/Makefile.in ---- a/src/Makefile.in Fri Jan 11 15:29:45 2019 +0100 -+++ b/src/Makefile.in Fri Jan 11 16:01:11 2019 +0100 -@@ -46,7 +46,7 @@ - TEXIFILE := $(addsuffix .texi,$(basename $(INFOFILE))) - TXIFILE := $(addsuffix .txi,$(basename $(INFOFILE))) - HTMLDIR := ../doc/html/ --OCTFILES := __bfgsmin.oct numgradient.oct numhessian.oct samin.oct __disna_optim__.oct -+OCTFILES := __bfgsmin.oct numgradient.oct numhessian.oct __disna_optim__.oct - - OCTSOURCEFILES := $(addsuffix .cc,$(basename $(OCTFILES))) - DSFILES := $(addsuffix .docstrings,$(OCTSOURCEFILES)) -diff -r 158b61118c75 -r 5fcbf411d5c2 src/samin.cc ---- a/src/samin.cc Fri Jan 11 15:29:45 2019 +0100 -+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 -@@ -1,549 +0,0 @@ --// Copyright (C) 2004, 2006 Michael Creel <michael.creel@uab.es> --// --// This program is free software; you can redistribute it and/or modify it under --// the terms of the GNU General Public License as published by the Free Software --// Foundation; either version 3 of the License, or (at your option) any later --// version. --// --// This program is distributed in the hope that it will be useful, but WITHOUT --// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more --// details. --// --// You should have received a copy of the GNU General Public License along with --// this program; if not, see <http://www.gnu.org/licenses/>. -- --// References: --// --// The code follows the article --// Goffe, William L. (1996) "SIMANN: A Global Optimization Algorithm --// using Simulated Annealing " Studies in Nonlinear Dynamics & Econometrics --// Oct96, Vol. 1 Issue 3. --// --// The code uses the same names for control variables, --// for the most part. A notable difference is that the initial --// temperature is found automatically to ensure that the active --// bounds when the temperature begins to reduce cover the entire --// parameter space (defined as a n-dimensional --// rectangle that is the Cartesian product of the --// (lb_i, ub_i), i = 1,2,..n --// --// Also of note: --// Corana et. al., (1987) "Minimizing Multimodal Functions of Continuous --// Variables with the "Simulated Annealing" Algorithm", --// ACM Transactions on Mathematical Software, V. 13, N. 3. --// --// Goffe, et. al. (1994) "Global Optimization of Statistical Functions --// with Simulated Annealing", Journal of Econometrics, --// V. 60, N. 1/2. -- --#include <oct.h> --#include <octave/parse.h> --#include <octave/Cell.h> --#include <octave/lo-mappers.h> --#include <octave/oct-rand.h> --#include <float.h> -- --#include "error-helpers.h" -- --// define argument checks --static bool any_bad_argument(const octave_value_list& args) --{ -- -- // objective function name is a string? -- if (!args(0).is_string()) -- { -- _p_error("samin: first argument must be string holding objective function name"); -- return true; -- } -- -- // are function arguments contained in a cell? -- if (!args(1).OV_ISCELL ()) -- { -- _p_error("samin: second argument must cell array of function arguments"); -- return true; -- } -- -- // is control a cell? -- Cell control; -- bool err; -- SET_ERR (control =args(2).cell_value(), err); -- if (err) -- { -- _p_error("samin: third argument must cell array of algorithm controls"); -- return true; -- } -- -- // does control have proper number of elements? -- if (!(control.numel () == 11)) -- { -- _p_error("samin: third argument must be a cell array with 11 elements"); -- return true; -- } -- -- // now check type of each element of control -- if (!(control(0).is_real_matrix()) && !(control(0).is_real_scalar())) -- { -- _p_error("samin: 1st element of controls must be LB: a vector of lower bounds"); -- return true; -- } -- -- if ((control(0).is_real_matrix()) && (control(0).columns() != 1)) -- { -- _p_error("samin: 1st element of controls must be LB: a vector of lower bounds"); -- return true; -- } -- -- if (!(control(1).is_real_matrix()) && !(control(1).is_real_scalar())) -- { -- _p_error("samin: 1st element of controls must be UB: a vector of lower bounds"); -- return true; -- } -- -- if ((control(1).is_real_matrix()) && (control(1).columns() != 1)) -- { -- _p_error("samin: 2nd element of controls must be UB: a vector of lower bounds"); -- return true; -- } -- -- int tmp; -- SET_ERR (tmp = control(2).int_value(), err); -- if (err || tmp < 1) -- { -- _p_error("samin: 3rd element of controls must be NT: positive integer\n\ --loops per temperature reduction"); -- return true; -- } -- -- SET_ERR (tmp = control(3).int_value(), err); -- if (err || tmp < 1) -- { -- _p_error("samin: 4th element of controls must be NS: positive integer\n\ --loops per stepsize adjustment"); -- return true; -- } -- -- double tmp2; -- SET_ERR (tmp2 = control(4).double_value(), err); -- if (err || tmp < 0) -- { -- _p_error("samin: 5th element of controls must be RT:\n\ --temperature reduction factor, RT > 0"); -- return true; -- } -- -- SET_ERR (tmp2 = control(5).double_value(), err); -- if (err || tmp < 0) -- { -- _p_error("samin: 6th element of controls must be integer MAXEVALS > 0 "); -- return true; -- } -- -- SET_ERR (tmp = control(6).int_value(), err); -- if (err || tmp < 0) -- { -- _p_error("samin: 7th element of controls must be NEPS: positive integer\n\ --number of final obj. values that must be within EPS of eachother "); -- return true; -- } -- -- SET_ERR (tmp2 = control(7).double_value(), err); -- if (err || tmp2 < 0) -- { -- _p_error("samin: 8th element of controls must must be FUNCTOL (> 0)\n\ --used to compare the last NEPS obj values for convergence test"); -- return true; -- } -- -- SET_ERR (tmp2 = control(8).double_value(), err); -- if (err || tmp2 < 0) -- { -- _p_error("samin: 9th element of controls must must be PARAMTOL (> 0)\n\ --used to compare the last NEPS obj values for convergence test"); -- return true; -- } -- -- SET_ERR (tmp = control(9).int_value(), err); -- if (err || tmp < 0 || tmp > 2) -- { -- _p_error("samin: 9th element of controls must be VERBOSITY (0, 1, or 2)"); -- return true; -- } -- -- SET_ERR (tmp = control(10).int_value(), err); -- if (err || tmp < 0) -- { -- _p_error("samin: 10th element of controls must be MINARG (integer)\n\ -- position of argument to minimize wrt"); -- return true; -- } -- -- // make sure that minarg points to an existing element -- if ((tmp > args(1).length ()) || (tmp < 1)) -- { -- _p_error("bfgsmin: 4th argument must be a positive integer that indicates \n\ --which of the elements of the second argument is the one minimization is over"); -- return true; -- } -- -- return false; --} -- --//-------------- The annealing algorithm -------------- --DEFUN_DLD(samin, args, , "samin: simulated annealing minimization of a function. See samin_example.m\n\ --\n\ --samin will be removed from a future version of the optim package.\n\ --Equivalent functionality is now in the samin backend of nonlin_min.\n\ --\n\ --usage: [x, obj, convergence, details] = samin(\"f\", {args}, {control})\n\ --\n\ --Arguments:\n\ --* \"f\": function name (string)\n\ --* {args}: a cell array that holds all arguments of the function,\n\ --* {control}: a cell array with 11 elements\n\ -- * LB - vector of lower bounds\n\ -- * UB - vector of upper bounds\n\ -- * nt - integer: # of iterations between temperature reductions\n\ -- * ns - integer: # of iterations between bounds adjustments\n\ -- * rt - (0 < rt <1): temperature reduction factor\n\ -- * maxevals - integer: limit on function evaluations\n\ -- * neps - integer: number of values final result is compared to\n\ -- * functol - (> 0): the required tolerance level for function value\n\ -- comparisons\n\ -- * paramtol - (> 0): the required tolerance level for parameters\n\ -- * verbosity - scalar: 0, 1, or 2.\n\ -- * 0 = no screen output\n\ -- * 1 = only final results to screen\n\ -- * 2 = summary every temperature change\n\ -- * minarg - integer: which of function args is minimization over?\n\ --\n\ --Returns:\n\ --* x: the minimizer\n\ --* obj: the value of f() at x\n\ --* convergence:\n\ -- 0 if no convergence within maxevals function evaluations\n\ -- 1 if normal convergence to a point interior to the parameter space\n\ -- 2 if convergence to point very near bounds of parameter space\n\ -- (suggest re-running with looser bounds)\n\ --* details: a px3 matrix. p is the number of times improvements were found.\n\ -- The columns record information at the time an improvement was found\n\ -- * first: cumulative number of function evaluations\n\ -- * second: temperature\n\ -- * third: function value\n\ --\n\ --Example: see samin_example\n\ --") --{ -- static bool warned = false; -- if (! warned) -- { -- warned = true; -- warning_with_id ("Octave:deprecated-function", -- "samin will be removed from a future version of the optim package, equivalent functionality is now in the samin backend of nonlin_min"); -- } -- -- int nargin = args.length(); -- if (!(nargin == 3)) -- { -- error("samin: you must supply 3 arguments"); -- return octave_value_list(); -- } -- -- // check the arguments -- if (any_bad_argument (args)) -- { -- error ("error in samin"); -- return octave_value_list(); -- } -- -- std::string obj_fn (args(0).string_value()); -- Cell f_args_cell = args(1).cell_value (); // args to obj fn come in as a cell to allow arbitrary number -- Cell control (args(2).cell_value()); -- -- octave_value_list f_args; -- octave_value_list f_return; // holder for feval returns -- -- int m, i, j, k, h, n, nacc, func_evals; -- int nup, nrej, nnew, ndown, lnobds; -- int converge, test, coverage_ok; -- -- // user provided controls -- const ColumnVector lb (control(0).column_vector_value()); -- const ColumnVector ub (control(1).column_vector_value()); -- const int nt (control(2).int_value()); -- const int ns (control(3).int_value()); -- const double rt (control(4).double_value()); -- const int maxevals (control(5).int_value()); -- const int neps (control(6).int_value()); -- const double functol (control(7).double_value()); -- const double paramtol (control(8).double_value()); -- const int verbosity (control(9).int_value()); -- const int minarg (control(10).int_value()); -- -- // type checking for minimization parameter done here, since we don't know minarg -- // until now -- if (!(f_args_cell(minarg - 1).is_real_matrix() || (f_args_cell(minarg - 1).is_real_scalar()))) -- { -- error("samin: minimization must be with respect to a column vector"); -- return octave_value_list(); -- } -- if ((f_args_cell(minarg - 1).is_real_matrix()) && (f_args_cell(minarg - 1).columns() != 1)) -- { -- error("samin: minimization must be with respect to a column vector"); -- return octave_value_list(); -- } -- -- double f, fp, p, fopt, rand_draw, ratio, t; -- -- Matrix details(1,3); // record function evaluations, temperatures and function values -- RowVector info(3); -- -- // copy cell contents over to octave_value_list to use feval() -- k = f_args_cell.numel (); -- f_args(k); // resize only once -- for (i = 0; i<k; i++) f_args(i) = f_args_cell(i); -- -- ColumnVector x = f_args(minarg - 1).column_vector_value(); -- ColumnVector bounds = ub - lb; -- n = x.rows(); -- ColumnVector xopt = x; -- ColumnVector xp(n); -- ColumnVector nacp(n); -- -- // Set initial values -- nacc = 0; // total accepted trials -- t = 1000.0; // temperature - will initially rise or fall to cover parameter space. Then it will fall -- converge = 0; // convergence indicator 0 (failure), 1 (normal success), or 2 (convergence but near bounds) -- coverage_ok = 0; // has parameter space been covered? When turns to 1, temperature starts to fall -- // most recent values, to compare to when checking convergend -- ColumnVector fstar(neps,1); -- fstar.fill(DBL_MAX); -- octave_rand::distribution("uniform"); // we'll be using draws from U(0,1) -- -- // check for out-of-bounds starting values -- for(i = 0; i < n; i++) -- { -- if(( x(i) > ub(i)) || (x(i) < lb(i))) -- { -- error("samin: initial parameter %d out of bounds", i+1); -- return octave_value_list(); -- } -- } -- -- // Initial obj_value -- f_return = OCTAVE__FEVAL (obj_fn, f_args); -- f = f_return(0).double_value(); -- fopt = f; // give it something to compare to -- func_evals = 0; // total function evaluations (limited by maxeval) -- details(0,0) = func_evals; -- details(0,1) = t; -- details(0,2) = fopt; -- -- // main loop, first increase temperature until parameter space covered, then reduce until convergence -- while(converge==0) -- { -- // statistics to report at each temp change, set back to zero -- nup = 0; -- nrej = 0; -- nnew = 0; -- ndown = 0; -- lnobds = 0; -- -- // repeat nt times then adjust temperature -- for(m = 0;m < nt;m++) -- { -- // repeat ns times, then adjust bounds -- for(j = 0;j < ns;j++) -- { -- // generate new point by taking last and adding a random value -- // to each of elements, in turn -- for(h = 0;h < n;h++) -- { -- // new Sept 2011, if bounds are same, skip the search for that vbl. Allows restrictions without complicated programming -- if (lb(h) != ub(h)) -- { -- xp = x; -- rand_draw = octave_rand::scalar(); -- xp(h) = x(h) + (2.0 * rand_draw - 1.0) * bounds(h); -- if ((xp(h) < lb(h)) || (xp(h) > ub(h))) -- { -- rand_draw = octave_rand::scalar(); // change 07-Nov-2007: avoid correlation with hitting bounds -- xp(h) = lb(h) + (ub(h) - lb(h)) * rand_draw; -- lnobds = lnobds + 1; -- } -- // Evaluate function at new point -- f_args(minarg - 1) = xp; -- f_return = OCTAVE__FEVAL (obj_fn, f_args); -- fp = f_return(0).double_value(); -- func_evals = func_evals + 1; -- // Accept the new point if the function value decreases -- if(fp <= f) -- { -- x = xp; -- f = fp; -- nacc = nacc + 1; // total number of acceptances -- nacp(h) = nacp(h) + 1; // acceptances for this parameter -- nup = nup + 1; -- // If lower than any other point, record as new optimum -- if(fp < fopt) -- { -- xopt = xp; -- fopt = fp; -- nnew = nnew + 1; -- info(0) = func_evals; -- info(1) = t; -- info(2) = fp; -- details = details.stack(info); -- } -- } -- // If the point is higher, use the Metropolis criteria to decide on -- // acceptance or rejection. -- else -- { -- p = exp(-(fp - f) / t); -- rand_draw = octave_rand::scalar(); -- if(rand_draw < p) -- { -- x = xp; -- f = fp; -- nacc = nacc + 1; -- nacp(h) = nacp(h) + 1; -- ndown = ndown + 1; -- } -- else nrej = nrej + 1; -- } -- } -- // If maxevals exceeded, terminate the algorithm -- if (func_evals >= maxevals) -- { -- if (verbosity >= 1) -- { -- printf("\n================================================\n"); -- printf("SAMIN results\n"); -- printf("NO CONVERGENCE: MAXEVALS exceeded\n"); -- printf("================================================\n"); -- printf("Convergence tolerances: Func. tol. %e Param. tol. %e\n", functol, paramtol); -- printf("Obj. fn. value %f\n\n", fopt); -- printf(" parameter search width\n"); -- for(i = 0; i < n; i++) printf("%20f%20f\n", xopt(i), bounds(i)); -- } -- f_return(3) = details; -- f_return(2) = 0; -- f_return(1) = fopt; -- f_return(0) = xopt; -- return octave_value_list(f_return); -- } -- } -- } -- // Adjust bounds so that approximately half of all evaluations are accepted -- test = 0; -- for(i = 0;i < n;i++) -- { -- if (lb(i) != ub(i)) -- { -- ratio = nacp(i) / ns; -- if(ratio > 0.6) bounds(i) = bounds(i) * (1.0 + 2.0 * (ratio - 0.6) / 0.4); -- else if (ratio < .4) -- bounds(i) = bounds(i) / (1.0 + 2.0 * ((0.4 - ratio) / 0.4)); -- // keep within initial bounds -- if(bounds(i) >= (ub(i) - lb(i))) -- { -- bounds(i) = ub(i) - lb(i); -- test = test + 1; -- } -- } -- else -- test = test + 1; // make sure coverage check passes for the fixed parameters -- } -- nacp.fill(0.0); -- // check if we cover parameter space. if we have yet to do so -- if (!coverage_ok) coverage_ok = (test == n); -- } -- // intermediate output, if desired -- if(verbosity == 2) -- { -- printf("\nsamin: intermediate results before next temperature change\n"); -- printf("\ntemperature %e", t); -- printf("\ncurrent best function value %f", fopt); -- printf("\ntotal evaluations so far %d", func_evals); -- printf("\ntotal moves since last temperature reduction %d", nup + ndown + nrej); -- printf("\ndownhill %d", nup); -- printf("\naccepted uphill %d", ndown); -- printf("\nrejected uphill %d", nrej); -- printf("\nout of bounds trials %d", lnobds); -- printf("\nnew minima this temperature %d", nnew); -- printf("\n\n parameter search width\n"); -- for(i = 0; i < n; i++) printf("%20f%20f\n", xopt(i), bounds(i)); -- printf("\n"); -- } -- // Check for convergence, if we have covered the parameter space -- if (coverage_ok) -- { -- // last value close enough to last neps values? -- fstar(0) = f; -- test = 0; -- for (i = 1; i < neps; i++) test = test + fabs(f - fstar(i)) > functol; -- test = (test > 0); // if different from zero, function conv. has failed -- // last value close enough to overall best? -- if (((fopt - f) <= functol) && (!test)) -- { -- // check for bound narrow enough for parameter convergence -- for (i = 0;i < n;i++) -- { -- if (bounds(i) > paramtol) -- { -- converge = 0; // no conv. if bounds too wide -- break; -- } -- else -- converge = 1; -- } -- } -- // check if optimal point is near boundary of parameter space, and change convergence message if so -- if (converge && lnobds > 0) converge = 2; -- // Like to see the final results? -- if (converge > 0) -- { -- if (verbosity >= 1) -- { -- printf("\n================================================\n"); -- printf("SAMIN results\n\n"); -- if (converge == 1) printf("==> Normal convergence <==\n\n"); -- if (converge == 2) -- { -- printf("==> WARNING <==: Last point satisfies convergence criteria,\n"); -- printf("but is near boundary of parameter space.\n"); -- printf("%d out of %d evaluations were out-of-bounds in the last round.\n", lnobds, (nup+ndown+nrej)); -- printf("Expand bounds and re-run, unless this is a constrained minimization.\n\n"); -- } -- printf("Convergence tolerances:\nFunction: %e\nParameters: %e\n", functol, paramtol); -- printf("\nObjective function value at minimum: %f\n\n", fopt); -- printf(" parameter search width\n"); -- for(i = 0; i < n; i++) printf("%20f%20f\n", xopt(i), bounds(i)); -- printf("================================================\n"); -- } -- f_return(3) = details; -- f_return(2) = converge; -- f_return(1) = fopt; -- f_return(0) = xopt; -- return f_return; // this breaks out, if we get here -- } -- // Reduce temperature, record current function value in the -- // list of last "neps" values, and loop again -- t = rt * t; -- for(i = neps-1; i > 0; i--) fstar(i) = fstar(i-1); -- f = fopt; -- x = xopt; -- } -- else -- { -- // coverage not ok - increase temperature quickly to expand search area, to cover parameter space -- t = t*t; -- for(i = neps-1; i > 0; i--) fstar(i) = fstar(i-1); -- f = fopt; -- x = xopt; -- } -- } -- // silence compiler warning -- return octave_value_list (); --}
--- a/src/of-optim.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/of-optim.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := of-optim $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.3 -$(PKG)_CHECKSUM := 3633a5257fbf882e1d654303f9e3ce090456165a +$(PKG)_VERSION := 1.6.0 +$(PKG)_CHECKSUM := b7b55449a2861f0d318db1ccf1c37294fcdca604 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := optim-$($(PKG)_VERSION) $(PKG)_FILE := optim-$($(PKG)_VERSION).tar.gz
--- a/src/of-signal-1-fixes.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,118 +0,0 @@ -# HG changeset patch -# User Mike Miller <mtmiller@octave.org> -# Date 1525815613 25200 -# Node ID 3cbff3de1ebcb28a87ca0e0f8342ea393db19908 -# Parent 36e6b83ee1a1b178c58c14c5077038d7a6614118 -medfilt1: rewrite memory management, fix build error on MinGW (bug #53849) - -* medfilt1.cc (sorted_window::sorted_window): Make buf a unique_ptr. Use -member initialiation list. (sorted_window::~sorted_window): Delete. -(sorted_window::init): Use fill_n instead of bzero. (sorted_window::replace, -sorted_window::add, sorted_window::remove): Update syntax to dereference -offsets into buf. - -diff -r 36e6b83ee1a1 -r 3cbff3de1ebc src/medfilt1.cc ---- a/src/medfilt1.cc Sun May 06 10:17:15 2018 +0200 -+++ b/src/medfilt1.cc Tue May 08 14:40:13 2018 -0700 -@@ -27,9 +27,8 @@ - One dimensional median filter, for real double variables. - */ - --//#ifdef HAVE_CONFIG_H --//# include "config.h" --//#endif -+#include <algorithm> -+#include <memory> - - #include "oct.h" - #include "defun-dld.h" -@@ -44,7 +43,7 @@ - // Keeps NaNs at the "top" (after Inf) - class sorted_window - { -- double *buf; -+ std::unique_ptr<double[]> buf; - octave_idx_type numel; - octave_idx_type numNaN; - bool nan_if_any_is; -@@ -70,16 +69,8 @@ - // If skip_nan then the median will consider only valid numbers within - // the window. - sorted_window (octave_idx_type width, bool skip_nan = true) -- { -- numel = 0; -- nan_if_any_is = ! skip_nan; -- buf = new double [width]; -- } -- -- ~sorted_window () -- { -- delete [] buf; -- } -+ : buf (new double [width]), numel (0), numNaN (0), -+ nan_if_any_is (! skip_nan) { } - - // Initialize to contain seed, and zeros additional zeros. - void init (const double *seed, octave_idx_type num, octave_idx_type stride, -@@ -88,7 +79,7 @@ - numel = zeros; - numNaN = 0; - -- bzero (buf, zeros * sizeof (double)); -+ std::fill_n (&buf[0], zeros, 0.0); - - // Insert from seed. Could sort if it is large - num *= stride; -@@ -106,7 +97,7 @@ - n_pos = find (next); - p_pos = find (prev, n_pos); - if (n_pos != p_pos) -- std::copy_backward (buf + n_pos, buf + p_pos, buf + p_pos + 1); -+ std::copy_backward (&buf[n_pos], &buf[p_pos], &buf[p_pos + 1]); - } - else if (next > prev) - { -@@ -114,7 +105,7 @@ - n_pos = find (next, p_pos); - if (n_pos != p_pos) - { -- std::copy (buf + p_pos + 1, buf + n_pos, buf + p_pos); -+ std::copy (&buf[p_pos + 1], &buf[n_pos], &buf[p_pos]); - n_pos--; // position shifts due to deletion of p_pos - } - } -@@ -123,13 +114,13 @@ - if (next == next) - { - n_pos = find (next); -- std::copy_backward (buf + n_pos, buf + numel - 1, buf + numel); -+ std::copy_backward (&buf[n_pos], &buf[numel - 1], &buf[numel]); - numNaN--; - } - else if (prev == prev) - { - p_pos = find (prev); -- std::copy (buf + p_pos + 1, buf + numel, buf + p_pos); -+ std::copy (&buf[p_pos + 1], &buf[numel], &buf[p_pos]); - n_pos = numel - 1; - numNaN++; - } -@@ -151,7 +142,7 @@ - { - n_pos = find (next); - if (n_pos < numel) -- std::copy_backward (buf + n_pos, buf + numel, buf + numel + 1); -+ std::copy_backward (&buf[n_pos], &buf[numel], &buf[numel + 1]); - } - else // NaN stored at end, so nothing to move. - { -@@ -170,7 +161,7 @@ - if (prev == prev) - { - p_pos = find (prev); -- std::copy (buf + p_pos + 1, buf + numel, buf + p_pos); -+ std::copy (&buf[p_pos + 1], &buf[numel], &buf[p_pos]); - } - else // NaN stored at end, so nothing to move. - numNaN--; -
--- a/src/of-signal-2-fixes.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,197 +0,0 @@ -diff -uNr a/src/cl2bp.cc b/src/cl2bp.cc ---- a/src/cl2bp.cc 2015-05-25 20:22:36.842410900 -0400 -+++ b/src/cl2bp.cc 2018-04-09 12:48:37.336964071 -0400 -@@ -89,27 +89,27 @@ - - const int m = args(0).int_value(true); - if (error_state) { -- gripe_wrong_type_arg ("cl2bp", args(0)); -+ err_wrong_type_arg ("cl2bp", args(0)); - return retval; - } - const double w1 = args(1).double_value(); - if (error_state) { -- gripe_wrong_type_arg ("cl2bp", args(1)); -+ err_wrong_type_arg ("cl2bp", args(1)); - return retval; - } - const double w2 = args(2).double_value(); - if (error_state) { -- gripe_wrong_type_arg ("cl2bp", args(2)); -+ err_wrong_type_arg ("cl2bp", args(2)); - return retval; - } - const ColumnVector up_vector(args(3).vector_value()); - if (error_state) { -- gripe_wrong_type_arg ("cl2bp", args(3)); -+ err_wrong_type_arg ("cl2bp", args(3)); - return retval; - } - const ColumnVector lo_vector(args(4).vector_value()); - if (error_state) { -- gripe_wrong_type_arg ("cl2bp", args(4)); -+ err_wrong_type_arg ("cl2bp", args(4)); - return retval; - } - if (up_vector.length() != 3 || lo_vector.length() != 3) { -@@ -126,7 +126,7 @@ - - const int L = args(5).int_value(true); - if (error_state) { -- gripe_wrong_type_arg ("cl2bp", args(5)); -+ err_wrong_type_arg ("cl2bp", args(5)); - return retval; - } - if (L > 1000000) { -diff -uNr a/src/medfilt1.cc b/src/medfilt1.cc ---- a/src/medfilt1.cc 2015-05-25 20:22:36.846411059 -0400 -+++ b/src/medfilt1.cc 2018-04-09 12:48:37.336964071 -0400 -@@ -326,7 +326,7 @@ - { - if (args(1).is_numeric_type ()) - { -- if (args(1).numel () != 1 || args(1).is_complex_type ()) -+ if (args(1).numel () != 1 || args(1).iscomplex ()) - error ("medfilt1: N must be a real scalar"); - else - n = args(1).idx_type_value (); -@@ -340,7 +340,7 @@ - { - if (args(3).numel () != 1) - error ("medfilt1: DIM must be a scalar"); -- else if (args(3).is_complex_type ()) -+ else if (args(3).iscomplex ()) - error ("medfilt1: DIM must be real"); - - dim = round (args(3).double_value ()); -diff -uNr a/src/remez.cc b/src/remez.cc ---- a/src/remez.cc 2015-05-25 20:22:36.846411059 -0400 -+++ b/src/remez.cc 2018-04-09 12:48:37.340963884 -0400 -@@ -789,7 +789,7 @@ - return retval; - } - -- int numtaps = NINT (args(0).double_value()) + 1; // #coeff = filter order+1 -+ int numtaps = octave::math::nint (args(0).double_value()) + 1; // #coeff = filter order+1 - if (numtaps < 4) { - error("remez: number of taps must be an integer greater than 3"); - return retval; -@@ -846,7 +846,7 @@ - if (args(4).is_string() && !args(3).is_string()) - stype = args(4).string_value(); - else if (args(4).is_real_scalar()) -- density = NINT (args(4).double_value()); -+ density = octave::math::nint (args(4).double_value ()); - else { - error("remez: incorrect argument list"); - return retval; -@@ -855,7 +855,7 @@ - if (nargin > 5) { - if (args(5).is_real_scalar() - && !args(4).is_real_scalar()) -- density = NINT (args(5).double_value()); -+ density = octave::math::nint (args(5).double_value ()); - else { - error("remez: incorrect argument list"); - return retval; -diff -uNr a/src/sosfilt.cc b/src/sosfilt.cc ---- a/src/sosfilt.cc 2015-05-25 20:22:36.846411059 -0400 -+++ b/src/sosfilt.cc 2018-04-09 12:52:45.933287424 -0400 -@@ -21,7 +21,7 @@ - #include <octave/oct.h> - #include <octave/defun-dld.h> - #include <octave/error.h> --#include <octave/gripes.h> -+#include <octave/errwarn.h> - #include <octave/pager.h> - #include <octave/quit.h> - #include <octave/variables.h> -@@ -56,7 +56,7 @@ - - if (error_state) - { -- gripe_wrong_type_arg ("sosfilt", args(0)); -+ err_wrong_type_arg ("sosfilt", args(0)); - return retval; - } - -@@ -70,7 +70,7 @@ - - if (error_state) - { -- gripe_wrong_type_arg ("sosfilt", args(1)); -+ err_wrong_type_arg ("sosfilt", args(1)); - return retval; - } - -diff -uNr a/src/upfirdn.cc b/src/upfirdn.cc ---- a/src/upfirdn.cc 2015-05-25 20:22:36.846411059 -0400 -+++ b/src/upfirdn.cc 2018-04-09 12:52:37.249695083 -0400 -@@ -21,7 +21,7 @@ - #include <octave/oct.h> - #include <octave/defun-dld.h> - #include <octave/error.h> --#include <octave/gripes.h> -+#include <octave/errwarn.h> - #include <octave/pager.h> - #include <octave/quit.h> - #include <octave/variables.h> -@@ -109,7 +109,7 @@ - - if (error_state) - { -- gripe_wrong_type_arg ("upfirdn", args(1)); -+ err_wrong_type_arg ("upfirdn", args(1)); - return retval; - } - -@@ -117,7 +117,7 @@ - - if (error_state) - { -- gripe_wrong_type_arg ("upfirdn", args(2)); -+ err_wrong_type_arg ("upfirdn", args(2)); - return retval; - } - -@@ -125,7 +125,7 @@ - - if (error_state) - { -- gripe_wrong_type_arg ("upfirdn", args(3)); -+ err_wrong_type_arg ("upfirdn", args(3)); - return retval; - } - -@@ -135,19 +135,19 @@ - Matrix x = args (0).matrix_value (); - if (error_state) - { -- gripe_wrong_type_arg ("upfirdn", args(0)); -+ err_wrong_type_arg ("upfirdn", args(0)); - return retval; - } - - Matrix y = upfirdn (x, h, p, q); - retval (0) = y; - } -- else if (args (0).is_complex_type ()) -+ else if (args (0).iscomplex ()) - { - ComplexMatrix x = args (0).complex_matrix_value (); - if (error_state) - { -- gripe_wrong_type_arg ("upfirdn", args(0)); -+ err_wrong_type_arg ("upfirdn", args(0)); - return retval; - } - -@@ -156,7 +156,7 @@ - } - else - { -- gripe_wrong_type_arg ("upfirdn", args(0)); -+ err_wrong_type_arg ("upfirdn", args(0)); - return retval; - } -
--- a/src/of-signal-3-fixes.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -diff -ur signal-1.4.0.old/src/medfilt1.cc signal-1.4.0/src/medfilt1.cc ---- signal-1.4.0.old/src/medfilt1.cc 2019-01-02 12:00:17.695424340 -0500 -+++ signal-1.4.0/src/medfilt1.cc 2019-01-02 12:01:01.900491183 -0500 -@@ -324,7 +324,7 @@ - - if (nargin >= 2) - { -- if (args(1).is_numeric_type ()) -+ if (args(1).isnumeric ()) - { - if (args(1).numel () != 1 || args(1).iscomplex ()) - error ("medfilt1: N must be a real scalar"); -@@ -336,7 +336,7 @@ - args(1).type_name ().c_str ()); - if (nargin >= 4) - { -- if (args(3).is_numeric_type ()) -+ if (args(3).isnumeric ()) - { - if (args(3).numel () != 1) - error ("medfilt1: DIM must be a scalar"); -diff -ur signal-1.4.0.orig/src/upfirdn.cc signal-1.4.0/src/upfirdn.cc ---- signal-1.4.0.orig/src/upfirdn.cc 2019-01-02 12:09:32.072780390 -0500 -+++ signal-1.4.0/src/upfirdn.cc 2019-01-02 12:09:52.581273776 -0500 -@@ -130,7 +130,7 @@ - } - - // Do the dispatching -- if (args (0).is_real_type ()) -+ if (args (0).isreal ()) - { - Matrix x = args (0).matrix_value (); - if (error_state)
--- a/src/of-signal.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/of-signal.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := of-signal $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.0 -$(PKG)_CHECKSUM := 2a2e8d19e28ff63df89130cc1bb832b477ff4587 +$(PKG)_VERSION := 1.4.1 +$(PKG)_CHECKSUM := 67519c28868659a54363420d5bfc2621c31f8fdb $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := signal-$($(PKG)_VERSION) $(PKG)_FILE := signal-$($(PKG)_VERSION).tar.gz
--- a/src/of-statistics.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/of-statistics.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := of-statistics $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.0 -$(PKG)_CHECKSUM := d93dc9430aba313b9bca23080140b41bcda6a9fe +$(PKG)_VERSION := 1.4.1 +$(PKG)_CHECKSUM := a8a644d31fa6ada9328daec07914aad4826b4aca $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := statistics-$($(PKG)_VERSION) $(PKG)_FILE := statistics-$($(PKG)_VERSION).tar.gz
--- a/src/of-struct-1-fixes.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,129 +0,0 @@ -diff -uNr a/src/error-helpers.cc b/src/error-helpers.cc ---- a/src/error-helpers.cc 2016-09-18 12:09:18.000000000 -0400 -+++ b/src/error-helpers.cc 2018-04-09 13:00:47.302704176 -0400 -@@ -24,7 +24,7 @@ - // call verror - #ifdef HAVE_OCTAVE_VERROR_ARG_EXC - void --c_verror (octave_execution_exception& e, const char *fmt, ...) -+c_verror (octave::execution_exception& e, const char *fmt, ...) - { - va_list args; - va_start (args, fmt); -@@ -33,7 +33,7 @@ - } - #else - void --c_verror (const octave_execution_exception&, const char *fmt, ...) -+c_verror (const octave::execution_exception&, const char *fmt, ...) - { - va_list args; - va_start (args, fmt); -diff -uNr a/src/error-helpers.h b/src/error-helpers.h ---- a/src/error-helpers.h 2016-09-18 12:09:18.000000000 -0400 -+++ b/src/error-helpers.h 2018-04-09 13:01:12.285532698 -0400 -@@ -26,9 +26,9 @@ - - // call verror - #ifdef HAVE_OCTAVE_VERROR_ARG_EXC --void c_verror (octave_execution_exception&, const char *, ...); -+void c_verror (octave::execution_exception&, const char *, ...); - #else --void c_verror (const octave_execution_exception&, const char *, ...); -+void c_verror (const octave::execution_exception&, const char *, ...); - #endif - - // call verror -@@ -37,7 +37,7 @@ - // both if Octave uses exceptions for errors and if it still uses - // error_state. In the latter case return 'retval'. - #ifdef HAVE_OCTAVE_ERROR_STATE -- // can throw octave_execution_exception despite of this -+ // can throw octave::execution_exception despite of this - #define CHECK_ERROR(code, retval, ...) \ - try \ - { \ -@@ -50,7 +50,7 @@ - return retval; \ - } \ - } \ -- catch (octave_execution_exception& e) \ -+ catch (octave::execution_exception& e) \ - { \ - c_verror (e, __VA_ARGS__); \ - \ -@@ -60,7 +60,7 @@ - { \ - code ; \ - } \ -- catch (octave_execution_exception& e) \ -+ catch (octave::execution_exception& e) \ - { \ - c_verror (e, __VA_ARGS__); \ - \ -@@ -70,7 +70,7 @@ - // Octave doesn't throw exceptions for errors but still uses - // error_state. - #ifdef HAVE_OCTAVE_ERROR_STATE -- // can throw octave_execution_exception despite of this -+ // can throw octave::execution_exception despite of this - #define CHECK_ERROR_EXIT1(code, ...) \ - try \ - { \ -@@ -83,7 +83,7 @@ - exit (1); \ - } \ - } \ -- catch (octave_execution_exception&) \ -+ catch (octave::execution_exception&) \ - { \ - c_verror (e, __VA_ARGS__); \ - \ -@@ -95,7 +95,7 @@ - { \ - code ; \ - } \ -- catch (octave_execution_exception&) \ -+ catch (octave::execution_exception&) \ - { \ - c_verror (e, __VA_ARGS__); \ - \ -@@ -107,7 +107,7 @@ - // Octave uses exceptions for errors and if it still uses - // error_state. In the latter case reset error_state to 0. - #ifdef HAVE_OCTAVE_ERROR_STATE -- // can throw octave_execution_exception despite of this -+ // can throw octave::execution_exception despite of this - #define SET_ERR(code, err) \ - err = false; \ - \ -@@ -120,7 +120,7 @@ - err = true; \ - } \ - } \ -- catch (octave_execution_exception&) \ -+ catch (octave::execution_exception&) \ - { \ - err = true; \ - } -@@ -132,7 +132,7 @@ - { \ - code ; \ - } \ -- catch (octave_execution_exception&) \ -+ catch (octave::execution_exception&) \ - { \ - err = true; \ - } -diff -r e0a0e577f1ae src/error-helpers.cc ---- a/src/error-helpers.cc Fri Jun 22 07:52:08 2018 -0400 -+++ b/src/error-helpers.cc Fri Jun 22 07:56:28 2018 -0400 -@@ -18,7 +18,7 @@ - */ - - #include <octave/oct.h> -- -+#include <iostream> - #include "error-helpers.h" - - // call verror
--- a/src/of-struct-2-devfixes.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -ur struct-1.0.15.orig/src/structcat.cc struct-1.0.15/src/structcat.cc ---- struct-1.0.15.orig/src/structcat.cc 2019-01-02 12:23:45.625511373 -0500 -+++ struct-1.0.15/src/structcat.cc 2019-01-02 12:25:21.571914227 -0500 -@@ -132,7 +132,7 @@ - - for (octave_idx_type i = m1_id; i < n_args; i++) - { -- if (! args(i).is_map ()) -+ if (! args(i).isstruct ()) - { - error ("%s: some argument not a structure", fname.c_str ()); -
--- a/src/of-struct.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/of-struct.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := of-struct $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.15 -$(PKG)_CHECKSUM := 2a5d1eef49e2fb7685cbbd3eff0dea45dd5c760a +$(PKG)_VERSION := 1.0.16 +$(PKG)_CHECKSUM := f6d80aba6749a5fa638776fae89be091b63dd0f7 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := struct-$($(PKG)_VERSION) $(PKG)_FILE := struct-$($(PKG)_VERSION).tar.gz
--- a/src/of-windows-1-fixes.patch Wed May 15 00:31:44 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -ur windows-1.3.0.orig/src/__COM__.cc windows-1.3.0/src/__COM__.cc ---- windows-1.3.0.orig/src/__COM__.cc 2019-01-02 10:47:50.386998529 -0500 -+++ windows-1.3.0/src/__COM__.cc 2019-01-02 10:48:25.859871218 -0500 -@@ -69,7 +69,7 @@ - return std::string (&tmp[0], len); - } - --class octave_com_object : public octave_base_value, public octave_auto_shlib -+class octave_com_object : public octave_base_value - { - public: - // Constructors
--- a/src/of-windows.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/of-windows.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := of-windows $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.0 -$(PKG)_CHECKSUM := c6894b4707dd9c3a1afb2f153cabd66400b415dc +$(PKG)_VERSION := 1.3.1 +$(PKG)_CHECKSUM := f4dd112a086f7f74b98b1d44d174a0775d3ae662 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := windows-$($(PKG)_VERSION) $(PKG)_FILE := windows-$($(PKG)_VERSION).tar.gz
--- a/src/of-zeromq.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/of-zeromq.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := of-zeromq $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.0 -$(PKG)_CHECKSUM := 158bd74a02f2a0131d5adb035947d7a94ae7a80d +$(PKG)_VERSION := 1.4.0 +$(PKG)_CHECKSUM := 4f6b11fc6819907cf30f1b1370a6ff1f3c0cf74b $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := zeromq-$($(PKG)_VERSION) $(PKG)_FILE := zeromq-$($(PKG)_VERSION).tar.gz
--- a/src/pcre2.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/pcre2.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := pcre2 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.32 -$(PKG)_CHECKSUM := 31dea762ff549cda09b7df33648f9d4cc3707cf8 +$(PKG)_VERSION := 10.33 +$(PKG)_CHECKSUM := 2cc3ed45936f5684b3189c132a68952c42cf65d0 $(PKG)_SUBDIR := pcre2-$($(PKG)_VERSION) $(PKG)_FILE := pcre2-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/pcre/pcre2/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/postgresql.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/postgresql.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := postgresql $(PKG)_IGNORE := -$(PKG)_VERSION := 9.4.21 -$(PKG)_CHECKSUM := 7fdc9574a0479df5e2c623e27e02342efe63f3d5 +$(PKG)_VERSION := 9.4.22 +$(PKG)_CHECKSUM := 68ee53f1781442e429e37808973bddb7ecf1a0f5 $(PKG)_SUBDIR := postgresql-$($(PKG)_VERSION) $(PKG)_FILE := postgresql-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.postgresql.org/pub/source/v$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/qscintilla.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/qscintilla.mk Thu May 30 05:14:20 2019 -0400 @@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := be05da5b4b548c650d8cc18370680b8f030c9f09 $(PKG)_SUBDIR := QScintilla_gpl-$($(PKG)_VERSION) $(PKG)_FILE := QScintilla_gpl-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://www.riverbankcomputing.com/static/Downloads/QScintilla//$($(PKG)_FILE) +$(PKG)_URL := https://www.riverbankcomputing.com/static/Downloads/QScintilla/$($(PKG)_VERSION)/$($(PKG)_FILE) ifeq ($(ENABLE_QT5),yes)
--- a/src/qtbase.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/qtbase.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.12.1 -$(PKG)_CHECKSUM := e48e91f343a7b02dc7012c787a2e3fcb3589f16d +$(PKG)_VERSION := 5.12.3 +$(PKG)_CHECKSUM := dbe6ed4779998f757473a727b7ff3300c7d31155 $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
--- a/src/qtimageformats.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/qtimageformats.mk Thu May 30 05:14:20 2019 -0400 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := f28b8715c7cd1390f4ea3a45ac68ee1901a242a5 +$(PKG)_CHECKSUM := 099145ff9462bb093fedeeddbdd365a3f6cdf540 $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))
--- a/src/qtsvg.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/qtsvg.mk Thu May 30 05:14:20 2019 -0400 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 2370c5913f95bcf1ec73397f1bfdea0a812fb60d +$(PKG)_CHECKSUM := d7e46f990e21941bbde143a2d658858b23fe48a9 $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))
--- a/src/qttools.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/qttools.mk Thu May 30 05:14:20 2019 -0400 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 134a0de2d0393e80fc13a5937f40144adaa9c312 +$(PKG)_CHECKSUM := f63a707d1de3fea68a4796762728ae12e5c97b93 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/readline-1-display.patch Thu May 30 05:14:20 2019 -0400 @@ -0,0 +1,109 @@ +diff -ur readline-8.0.orig/display.c readline-8.0.disp/display.c +--- readline-8.0.orig/display.c 2019-03-20 07:41:37.573786782 -0400 ++++ readline-8.0.disp/display.c 2019-03-20 17:00:29.866659451 -0400 +@@ -59,6 +59,11 @@ + #include "rlprivate.h" + #include "xmalloc.h" + ++#if defined (_WIN32) ++#include <windows.h> ++#define hStdout GetStdHandle(STD_OUTPUT_HANDLE) ++#endif ++ + #if !defined (strchr) && !defined (__STDC__) + extern char *strchr (), *strrchr (); + #endif /* !strchr && !__STDC__ */ +@@ -2367,6 +2372,20 @@ + int in_invisline; + int mb_cur_max = MB_CUR_MAX; + ++#if defined (_WIN32) ++ CONSOLE_SCREEN_BUFFER_INFO csbi; ++ if (_rl_last_c_pos != new ++ && GetConsoleScreenBufferInfo (hStdout, &csbi)) ++ { ++ csbi.dwCursorPosition.X += new - _rl_last_c_pos; ++ if (SetConsoleCursorPosition(hStdout, csbi.dwCursorPosition)) ++ { ++ _rl_last_c_pos = new; ++ return; ++ } ++ } ++#endif /* !_WIN32 */ ++ + woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset); + cpos = _rl_last_c_pos; + +@@ -2519,6 +2538,20 @@ + { + register int delta, i; + ++#if defined (_WIN32) ++ CONSOLE_SCREEN_BUFFER_INFO csbi; ++ if (_rl_last_v_pos != to && to <= _rl_screenheight ++ && GetConsoleScreenBufferInfo(hStdout, &csbi)) ++ { ++ csbi.dwCursorPosition.Y += to - _rl_last_v_pos; ++ if (SetConsoleCursorPosition(hStdout, csbi.dwCursorPosition)) ++ { ++ _rl_last_v_pos = to; ++ return; ++ } ++ } ++#endif /* !_WIN32 */ ++ + if (_rl_last_v_pos == to || to > _rl_screenheight) + return; + +@@ -2848,6 +2881,17 @@ + void + _rl_clear_to_eol (int count) + { ++#if defined (_WIN32) ++ CONSOLE_SCREEN_BUFFER_INFO csbi; ++ if (GetConsoleScreenBufferInfo (hStdout, &csbi)) ++ { ++ DWORD written; ++ FillConsoleOutputCharacter(hStdout, ' ', count, csbi.dwCursorPosition, ++ &written); ++ return; ++ } ++#endif /* !_WIN32 */ ++ + #ifndef __MSDOS__ + if (_rl_term_clreol) + tputs (_rl_term_clreol, 1, _rl_output_character_function); +@@ -2873,6 +2917,33 @@ + void + _rl_clear_screen (void) + { ++#if defined (_WIN32) ++ COORD coordScreen = { 0, 0 }; ++ DWORD cCharsWritten; ++ CONSOLE_SCREEN_BUFFER_INFO csbi; ++ DWORD dwConSize; ++ ++ if (GetConsoleScreenBufferInfo (hStdout, &csbi)) ++ { ++ dwConSize = csbi.dwSize.X * csbi.dwSize.Y; ++ ++ if (FillConsoleOutputCharacter (hStdout, (TCHAR) ' ', dwConSize, ++ coordScreen, &cCharsWritten)) ++ { ++ if (GetConsoleScreenBufferInfo (hStdout, &csbi)) ++ { ++ if (FillConsoleOutputAttribute (hStdout, csbi.wAttributes, ++ dwConSize, coordScreen, ++ &cCharsWritten)) ++ { ++ SetConsoleCursorPosition (hStdout, coordScreen); ++ return; ++ } ++ } ++ } ++ } ++#endif ++ + #if defined (__DJGPP__) + ScreenClear (); + ScreenSetCursor (0, 0);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/readline-1-input.patch Thu May 30 05:14:20 2019 -0400 @@ -0,0 +1,17 @@ +diff -ur readline-8.0.disp/input.c readline-8.0/input.c +--- readline-8.0.disp/input.c 2019-03-20 07:56:04.897036396 -0400 ++++ readline-8.0/input.c 2019-03-20 08:00:45.403401856 -0400 +@@ -519,7 +519,12 @@ + + #if defined (__MINGW32__) + if (isatty (fileno (stream))) +- return (_getch ()); /* "There is no error return." */ ++ { ++ int c = _getch (); ++ if (c == 0xe0) ++ rl_execute_next (_getch ()); ++ return (c); ++ } + #endif + result = 0; + #if defined (HAVE_PSELECT)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/readline-1-sigwinch.patch Thu May 30 05:14:20 2019 -0400 @@ -0,0 +1,89 @@ +Common subdirectories: readline-8.0.input/doc and readline-8.0/doc +Common subdirectories: readline-8.0.input/examples and readline-8.0/examples +diff -u readline-8.0.input/readline.c readline-8.0/readline.c +--- readline-8.0.input/readline.c 2019-03-20 08:02:03.533512025 -0400 ++++ readline-8.0/readline.c 2019-03-20 08:06:59.117185446 -0400 +@@ -1103,8 +1103,12 @@ + RL_SETSTATE(RL_STATE_INITIALIZED); + } + else +- (void)_rl_init_locale (); /* check current locale */ +- ++ { ++ (void)_rl_init_locale (); /* check current locale */ ++#if defined (__MINGW32__) ++ rl_reset_screen_size (); ++#endif ++ } + /* Initialize the current line information. */ + _rl_init_line_state (); + +Common subdirectories: readline-8.0.input/shlib and readline-8.0/shlib +diff -u readline-8.0.input/signals.c readline-8.0/signals.c +--- readline-8.0.input/signals.c 2019-03-20 08:02:03.529511918 -0400 ++++ readline-8.0/signals.c 2019-03-20 08:13:44.347195350 -0400 +@@ -46,6 +46,11 @@ + + #include "rlprivate.h" + ++#if defined (__MINGW32__) ++# define WIN32_LEAN_AND_MEAN ++# include <windows.h> ++#endif ++ + #if defined (HANDLE_SIGNALS) + + #if !defined (RETSIGTYPE) +@@ -92,7 +97,7 @@ + int rl_catch_signals = 1; + + /* If non-zero, readline will install a signal handler for SIGWINCH. */ +-#ifdef SIGWINCH ++#if defined (SIGWINCH) || defined(__MINGW32__) + int rl_catch_sigwinch = 1; + #else + int rl_catch_sigwinch = 0; /* for the readline state struct in readline.c */ +@@ -495,6 +500,21 @@ + } + #endif /* SIGWINCH */ + ++#if defined (__MINGW32__) ++ if (rl_catch_sigwinch && sigwinch_set_flag == 0) ++ { ++ DWORD mode; ++ HANDLE hStdIn = GetStdHandle (STD_INPUT_HANDLE); ++ ++ if (GetConsoleMode (hStdIn, &mode)) ++ { ++ mode |= ENABLE_WINDOW_INPUT; ++ if (SetConsoleMode (hStdIn, mode)) ++ sigwinch_set_flag = 1; ++ } ++ } ++#endif ++ + return 0; + } + +@@ -545,6 +565,20 @@ + sigwinch_set_flag = 0; + } + #endif ++#if defined (__MINGW32__) ++ if (rl_catch_sigwinch && sigwinch_set_flag == 1) ++ { ++ DWORD mode; ++ HANDLE hStdIn = GetStdHandle (STD_INPUT_HANDLE); ++ ++ if (GetConsoleMode (hStdIn, &mode)) ++ { ++ mode &= ~ENABLE_WINDOW_INPUT; ++ if (SetConsoleMode (hStdIn, mode)) ++ sigwinch_set_flag = 0; ++ } ++ } ++#endif + + return 0; + } +Common subdirectories: readline-8.0.input/support and readline-8.0/support
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/readline-2-event-hook.patch Thu May 30 05:14:20 2019 -0400 @@ -0,0 +1,157 @@ +diff -ur readline-8.0.sigwinch/input.c readline-8.0/input.c +--- readline-8.0.sigwinch/input.c 2019-03-20 08:15:55.450361377 -0400 ++++ readline-8.0/input.c 2019-03-20 08:30:58.059756179 -0400 +@@ -140,6 +140,11 @@ + static unsigned char ibuffer[512]; + static int ibuffer_len = sizeof (ibuffer) - 1; + ++#if defined (__MINGW32__) ++static int _win32_getch (void); ++static int _win32_kbhit (void); ++#endif ++ + #define any_typein (push_index != pop_index) + + int +@@ -266,7 +271,7 @@ + #if defined (__MINGW32__) + /* Use getch/_kbhit to check for available console input, in the same way + that we read it normally. */ +- chars_avail = isatty (tty) ? _kbhit () : 0; ++ chars_avail = isatty (tty) ? _win32_kbhit () : 0; + result = 0; + #endif + +@@ -501,6 +506,120 @@ + return (c); + } + ++#if defined (__MINGW32__) ++#define _WIN32_READ_NOCHAR (-2) ++static char _win32_buf[16] = {'0'}; ++static int _win32_bufidx = 0; ++ ++static int ++_win32_getch_internal (int block) ++{ ++ INPUT_RECORD rec; ++ DWORD evRead, waitResult; ++ HANDLE hInput = (HANDLE) _get_osfhandle (fileno (rl_instream)); ++ ++ if (_win32_bufidx > 0) ++ return _win32_buf[--_win32_bufidx]; ++ ++ hInput = (HANDLE) _get_osfhandle (fileno (rl_instream)); ++ ++ do ++ { ++ if (! block) ++ { ++ if (WaitForSingleObject(hInput, _keyboard_input_timeout/1000) != WAIT_OBJECT_0) ++ return _WIN32_READ_NOCHAR; ++ } ++ ++ if (!ReadConsoleInput(hInput, &rec, 1, &evRead) || evRead != 1) ++ return EOF; ++ ++ switch (rec.EventType) ++ { ++ case KEY_EVENT: ++ if ((rec.Event.KeyEvent.bKeyDown && ++ (rec.Event.KeyEvent.wVirtualKeyCode < VK_SHIFT || ++ rec.Event.KeyEvent.wVirtualKeyCode > VK_MENU)) || ++ (!rec.Event.KeyEvent.bKeyDown && ++ rec.Event.KeyEvent.wVirtualKeyCode == VK_MENU && ++ rec.Event.KeyEvent.uChar.AsciiChar)) ++ { ++ if (rec.Event.KeyEvent.uChar.AsciiChar) ++ { ++ if (rec.Event.KeyEvent.uChar.AsciiChar < 0 || ++ (rec.Event.KeyEvent.uChar.AsciiChar < 32 && ++ !(rec.Event.KeyEvent.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED)))) ++ { ++ char c = rec.Event.KeyEvent.uChar.AsciiChar; ++ if (GetOEMCP () == GetConsoleCP ()) ++ OemToCharBuff (&c, &c, 1); ++ return (int)(unsigned char)c; ++ } ++ else ++ return (int)rec.Event.KeyEvent.uChar.UnicodeChar; ++ } ++ else ++ switch (rec.Event.KeyEvent.wVirtualKeyCode) ++ { ++ case VK_UP: ++ _win32_buf[_win32_bufidx++] = 'H'; ++ return 0340; ++ case VK_DOWN: ++ _win32_buf[_win32_bufidx++] = 'P'; ++ return 0340; ++ case VK_RIGHT: ++ _win32_buf[_win32_bufidx++] = 'M'; ++ return 0340; ++ case VK_LEFT: ++ _win32_buf[_win32_bufidx++] = 'K'; ++ return 0340; ++ case VK_HOME: ++ _win32_buf[_win32_bufidx++] = 'G'; ++ return 0340; ++ case VK_END: ++ _win32_buf[_win32_bufidx++] = 'O'; ++ return 0340; ++ case VK_DELETE: ++ _win32_buf[_win32_bufidx++] = 'S'; ++ return 0340; ++ default: ++ break; ++ } ++ } ++ break; ++ ++ case WINDOW_BUFFER_SIZE_EVENT: ++ rl_resize_terminal (); ++ break; ++ ++ default: ++ break; ++ } ++ } ++ while (1); ++} ++ ++static int ++_win32_kbhit (void) ++{ ++ int result; ++ ++ result = _win32_getch_internal (0); ++ if (result == _WIN32_READ_NOCHAR ++ || result == EOF) ++ return 0; ++ _win32_buf[_win32_bufidx++] = result; ++ ++ return _win32_bufidx; ++} ++ ++static int ++_win32_getch (void) ++{ ++ return _win32_getch_internal (1); ++} ++#endif ++ + int + rl_getc (FILE *stream) + { +@@ -520,9 +639,9 @@ + #if defined (__MINGW32__) + if (isatty (fileno (stream))) + { +- int c = _getch (); ++ int c = _win32_getch (); + if (c == 0xe0) +- rl_execute_next (_getch ()); ++ rl_execute_next (_win32_getch ()); + return (c); + } + #endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/readline-2-history.patch Thu May 30 05:14:20 2019 -0400 @@ -0,0 +1,61 @@ +diff -ur readline-8.0.eventhook/histfile.c readline-8.0/histfile.c +--- readline-8.0.eventhook/histfile.c 2019-04-03 10:21:42.916563353 -0400 ++++ readline-8.0/histfile.c 2019-04-03 16:16:04.605404093 -0400 +@@ -107,6 +107,11 @@ + # define PATH_MAX 1024 /* default */ + #endif + ++#if defined(_WIN32) ++ #define WIN32_LEAN_AND_MEAN ++ #include <windows.h> ++#endif ++ + extern void _hs_append_history_line PARAMS((int, const char *)); + + /* history file version; currently unused */ +@@ -139,6 +144,19 @@ + static int histfile_backup PARAMS((const char *, const char *)); + static int histfile_restore PARAMS((const char *, const char *)); + ++static int ++history_rename(const char *from, const char *to) ++{ ++#if defined(_WIN32) ++ if (!MoveFileEx(from, to, MOVEFILE_REPLACE_EXISTING)) { ++ return -1; ++ } ++ return 0; ++#else ++ return rename(from, to); ++#endif ++} ++ + /* Return the string that should be used in the place of this + filename. This only matters when you don't specify the + filename to read_history (), or write_history (). */ +@@ -448,10 +466,10 @@ + if ((n = readlink (filename, linkbuf, sizeof (linkbuf) - 1)) > 0) + { + linkbuf[n] = '\0'; +- return (rename (linkbuf, back)); ++ return (history_rename (linkbuf, back)); + } + #endif +- return (rename (filename, back)); ++ return (history_rename (filename, back)); + } + + /* Restore ORIG from BACKUP handling case where ORIG is a symlink +@@ -467,10 +485,10 @@ + if ((n = readlink (orig, linkbuf, sizeof (linkbuf) - 1)) > 0) + { + linkbuf[n] = '\0'; +- return (rename (backup, linkbuf)); ++ return (history_rename (backup, linkbuf)); + } + #endif +- return (rename (backup, orig)); ++ return (history_rename (backup, orig)); + } + + /* Truncate the history file FNAME, leaving only LINES trailing lines.
--- a/src/speex.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/speex.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := speex $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2rc1 -$(PKG)_CHECKSUM := 52daa72572e844e5165315e208da539b2a55c5eb +$(PKG)_VERSION := 1.2.0 +$(PKG)_CHECKSUM := 18ebc3fa3236b4369509e9439acc32d0e864fa7f $(PKG)_SUBDIR := speex-$($(PKG)_VERSION) $(PKG)_FILE := speex-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.xiph.org/releases/speex/$($(PKG)_FILE)
--- a/src/sqlite.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/sqlite.mk Thu May 30 05:14:20 2019 -0400 @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3270200 -$(PKG)_CHECKSUM := 5f5750e3f39b7b60394a2fb6ddb2371f848670e6 +$(PKG)_VERSION := 3280000 +$(PKG)_CHECKSUM := 01b9d8fc77085e144dddc87456c9783e53d09a53 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2019/$($(PKG)_FILE)
--- a/src/src-msys2-coreutils.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-coreutils.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-coreutils $(PKG)_NAME := coreutils $(PKG)_IGNORE := -$(PKG)_VERSION := 8.30-1 -$(PKG)_CHECKSUM := 4c84071d9d763750f10f794b6a114f8950f9d10a +$(PKG)_VERSION := 8.31-1 +$(PKG)_CHECKSUM := 5b30ff6815288b67c3c6a0164ba9a0643fbb2da2 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-gawk.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-gawk.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-gawk $(PKG)_NAME := gawk $(PKG)_IGNORE := -$(PKG)_VERSION := 4.2.1-2 -$(PKG)_CHECKSUM := a858b9f3f824bdb0ca8e6297a1842ba47ec3640d +$(PKG)_VERSION := 5.0.0-1 +$(PKG)_CHECKSUM := 30dd901b3ad3c37e029874608c9069d2445e63e5 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-gnupg.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-gnupg.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-gnupg $(PKG)_NAME := gnupg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.13-1 -$(PKG)_CHECKSUM := c88e053e582b918118cd606f1983d62da165cba2 +$(PKG)_VERSION := 2.2.15-2 +$(PKG)_CHECKSUM := 5906b188ca68ba934eec32e89a78f04d823f34ea $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-icu.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-icu.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-icu $(PKG)_NAME := icu $(PKG)_IGNORE := -$(PKG)_VERSION := 62.1-1 -$(PKG)_CHECKSUM := 9978dab3ccb5330e8c64a8982722cfc01af13da5 +$(PKG)_VERSION := 64.2-1 +$(PKG)_CHECKSUM := dba7ad15c667107951ff79b29c002c6f08821f36 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-info.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-info.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-info $(PKG)_NAME := texinfo $(PKG)_IGNORE := -$(PKG)_VERSION := 6.5-2 -$(PKG)_CHECKSUM := 20b8feea299e6680cb370460a3c17f720851c0b0 +$(PKG)_VERSION := 6.6-1 +$(PKG)_CHECKSUM := d9ad472d59379b5e3875e986d27f9a30cfdeba58 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-libgnutls.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-libgnutls.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-libgnutls $(PKG)_NAME := gnutls $(PKG)_IGNORE := -$(PKG)_VERSION := 3.6.6-2 -$(PKG)_CHECKSUM := 71b71c59b896da865d24e2a87b2baff3e6743e4e +$(PKG)_VERSION := 3.6.7.1-1 +$(PKG)_CHECKSUM := 7cd81c078aeaa9459b6f8944e4b65c284db2b0b4 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-libgpg-error.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-libgpg-error.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-libgpg-error $(PKG)_NAME := libgpg-error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.35-1 -$(PKG)_CHECKSUM := 1552eefde11855b538164b5a1955708ed4ad8fb8 +$(PKG)_VERSION := 1.36-1 +$(PKG)_CHECKSUM := d89062dc22d06c35e4dfe1b71a8af19e6a64b86f $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-libgpgme.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-libgpgme.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-libgpgme $(PKG)_NAME := gpgme $(PKG)_IGNORE := -$(PKG)_VERSION := 1.12.0-1 -$(PKG)_CHECKSUM := 555d07e9b9e7d7328bcad6e6c4d97aceadbe8c3f +$(PKG)_VERSION := 1.13.0-1 +$(PKG)_CHECKSUM := 4708356f16d96d80be762fc872dd5c2a66a19d59 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-libpcre.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-libpcre.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-libpcre $(PKG)_NAME := pcre $(PKG)_IGNORE := -$(PKG)_VERSION := 8.43-1 -$(PKG)_CHECKSUM := 8666b39fac391fa9b069e4f47615690ed94b36ed +$(PKG)_VERSION := 8.43-2 +$(PKG)_CHECKSUM := 7c2f8190c233ef3264f3e62092f1d90623ab01e0 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-libpcre2.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-libpcre2.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-libpcre2 $(PKG)_NAME := pcre2 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.32-1 -$(PKG)_CHECKSUM := a6bcbac0dd2eee67d7ce588f0466b2e90a5eec9a +$(PKG)_VERSION := 10.33-2 +$(PKG)_CHECKSUM := 22f71394cdf26551baa3f223750044ae11bd813a $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-libreadline.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-libreadline.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-libreadline $(PKG)_NAME := readline $(PKG)_IGNORE := -$(PKG)_VERSION := 7.0.005-1 -$(PKG)_CHECKSUM := 6c91079fa0fe53d55de666c4f760d1505ccaac48 +$(PKG)_VERSION := 8.0.000-1 +$(PKG)_CHECKSUM := cdfba3b3689f5169658537e22ce7bde995eb2383 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-libsqlite.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-libsqlite.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-libsqlite $(PKG)_NAME := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3.21.0-4 -$(PKG)_CHECKSUM := fe94aaf88865a83a13611f1b5acab20be21c6c77 +$(PKG)_VERSION := 3.27.2-2 +$(PKG)_CHECKSUM := 69fd2348bc48623e6b950451532ea531d520862b $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-libutil-linux.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-libutil-linux.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-libutil-linux $(PKG)_NAME := util-linux $(PKG)_IGNORE := -$(PKG)_VERSION := 2.32.1-1 -$(PKG)_CHECKSUM := d18f5f54d5003b476456a5680af008175a0f0258 +$(PKG)_VERSION := 2.33.1-1 +$(PKG)_CHECKSUM := 975510468331db0d5ec984123a14f0090fe5b234 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-libxml2.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-libxml2.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-libxml2 $(PKG)_NAME := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9.9-2 -$(PKG)_CHECKSUM := 889788ebf3e982ad40770b8881bd01136ae6e929 +$(PKG)_VERSION := 2.9.9-4 +$(PKG)_CHECKSUM := 6ee7fbc31c41031be1ed27bbbef5c84fbaa25caa $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-mintty.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-mintty.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-mintty $(PKG)_NAME := mintty $(PKG)_IGNORE := -$(PKG)_VERSION := 1~2.9.5-1 -$(PKG)_CHECKSUM := 3fa20985e732f50158fba59c613693f4fc018c10 +$(PKG)_VERSION := 1~3.0.0-1 +$(PKG)_CHECKSUM := 7c38b87196daa18338e58444be4d734a1df70e95 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-runtime.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-runtime.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-runtime $(PKG)_NAME := msys2-runtime $(PKG)_IGNORE := -$(PKG)_VERSION := 2.11.2-1 -$(PKG)_CHECKSUM := 91f1dc1f720801300eac6f0c4a93d743812a0a62 +$(PKG)_VERSION := 3.0.6-1 +$(PKG)_CHECKSUM := 3ed269db17189276a5af21b3237078a759638320 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download
--- a/src/src-msys2-wget.mk Wed May 15 00:31:44 2019 -0400 +++ b/src/src-msys2-wget.mk Thu May 30 05:14:20 2019 -0400 @@ -4,8 +4,8 @@ PKG := src-msys2-wget $(PKG)_NAME := wget $(PKG)_IGNORE := -$(PKG)_VERSION := 1.20.1-2 -$(PKG)_CHECKSUM := e741732e6ca8894848ac1131c02cccfb40a0f57d +$(PKG)_VERSION := 1.20.3-1 +$(PKG)_CHECKSUM := d2cf2253936beaf8b0f378c736141ab4561f119d $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)/download