Mercurial > mxe-octave
changeset 7047:818af4c50401 release
maint: Merge default to release.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Wed, 24 Jan 2024 15:07:41 +0100 |
parents | 7bcc57d71baf (current diff) eb1e4b5f908b (diff) |
children | 6bb25ba1f8cb |
files | |
diffstat | 56 files changed, 373 insertions(+), 190 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Wed Dec 20 18:13:49 2023 +0100 +++ b/Makefile.in Wed Jan 24 15:07:41 2024 +0100 @@ -561,7 +561,7 @@ ## Packages removed from list because build is broken: ## None. OCTAVE_FORGE_PACKAGES := $(addprefix of-,audio communications control database dataframe data-smoothing dicom financial fuzzy-logic-toolkit ga general generate_html geometry gsl image instrument-control interval io linear-algebra lssa ltfat mapping matgeom miscellaneous nan netcdf nurbs ocs octproj optim optiminterp quaternion queueing signal sockets sparsersb splines statistics stk strings struct symbolic tisean tsa video windows zeromq) -OCTAVE_OTHER_PACKAGES := $(addprefix opkg-,biosig cfitsio mqtt) +OCTAVE_OTHER_PACKAGES := $(addprefix opkg-,biosig cfitsio mqtt tablicious) # get ALL deps for all of- packages, regardless of whether building the actual forge package in the installer OCTAVE_FORGE_DEPS:= $(sort $(foreach p,$(addprefix $(TOP_DIR)/src/,$(addsuffix .mk,$(OCTAVE_FORGE_PACKAGES))),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p))) OCTAVE_OTHER_PKG_DEPS:= $(sort $(foreach p,$(addprefix $(TOP_DIR)/src/,$(addsuffix .mk,$(OCTAVE_OTHER_PACKAGES))),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p)))
--- a/dist-files.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/dist-files.mk Wed Jan 24 15:07:41 2024 +0100 @@ -571,6 +571,7 @@ opkg-biosig.mk \ opkg-cfitsio.mk \ opkg-mqtt.mk \ + opkg-tablicious.mk \ opus.mk \ opusfile.mk \ paho-mqtt-c-1-fixes.patch \ @@ -668,6 +669,9 @@ readline-0-005-fix-for-callback-signal-handlin.patch \ readline-0-006-fix-for-callback-signal-handlin.patch \ readline-0-007-display-newline-if-readline-is-.patch \ + readline-0-008-add-missing-function-prototypes.patch \ + readline-0-009-fix-issue-where-directory-name-.patch \ + readline-0-010-fix-issue-where-comparing-quot.patch \ readline-1-display.patch \ readline-1-fixes.patch \ readline-1-sigwinch.patch \
--- a/index.html Wed Dec 20 18:13:49 2023 +0100 +++ b/index.html Wed Jan 24 15:07:41 2024 +0100 @@ -2534,6 +2534,10 @@ <td class="website"><a href="https://sourceforge.net/projects/octave-mqtt/">MQTT Octave Package</a></td> </tr> <tr> + <td class="package">opkg-tablicious</td> + <td class="website"><a href="https://github.com/apjanke/octave-tablicious">Tablicious Octave Package</a></td> + </tr> + <tr> <td class="package">opus</td> <td class="website"><a href="https://opus-codec.org/">opus</a></td> </tr>
--- a/installer-files/README.html Wed Dec 20 18:13:49 2023 +0100 +++ b/installer-files/README.html Wed Jan 24 15:07:41 2024 +0100 @@ -5,12 +5,10 @@ <body> <h1>Welcome</h1> <p>Thank you for installing GNU Octave!</p> -<p>Octave 8.4 is a minor release which mainly fixes bugs and regressions found -since the release of version 8.3. It should be feature and API compatible to -Octave 8.3.</p> -<p>Octave 8 is not feature or API compatible with Octave 7 or earlier. Binaries -(<code>.oct</code> or <code>.mex</code> files) need to be re-built when -upgrading from Octave 7 or earlier to this version.</p> +<p>Octave 9.1 is a major release with many new features and improvements.</p> +<p>Octave 9 is not feature or ABI/API compatible with Octave 8 or earlier. +Binaries (<code>.oct</code> or <code>.mex</code> files) need to be re-built +when upgrading from Octave 8 or earlier to this version.</p> <p>Binaries are no longer distributed for Windows 32-bit (or WoW64) by the Octave project. Please refer to other distributors if you still need them. 32-bit Windows binaries of Octave are still available from @@ -86,8 +84,7 @@ work correctly. See, e.g., <a href="https://devblogs.microsoft.com/commandline/windows-terminal-as-your-default-command-line-experience/"> these instructions by Microsoft</a> for how to change the default terminal and -select "Windows Console Host". -</p> +select "Windows Console Host".</p> <h2>Contributing to Octave</h2> <p>Octave has a community that lives from its users. You are welcome to share
--- a/src/fontconfig.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/fontconfig.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := fontconfig $(PKG)_IGNORE := -$(PKG)_VERSION := 2.14.2 -$(PKG)_CHECKSUM := 3631a6a6ccb870d88149538cf9e6ad3fa27e056b +$(PKG)_VERSION := 2.15.0 +$(PKG)_CHECKSUM := b6137ee5d542c0fe5c96a7724884f2e8e212d275 $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) $(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://fontconfig.org/release/$($(PKG)_FILE)
--- a/src/gdal.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/gdal.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := gdal $(PKG)_IGNORE : -$(PKG)_VERSION := 3.8.1 -$(PKG)_CHECKSUM := d8f04868bf9d76ee23f13e7184c54d63c5d56f2c +$(PKG)_VERSION := 3.8.3 +$(PKG)_CHECKSUM := a1b09525759a0a94b9e28159b8a142ba9702c832 $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/OSGeo/gdal/archive/refs/tags/v$($(PKG)_VERSION).tar.gz
--- a/src/gdcm-4-iconv.patch Wed Dec 20 18:13:49 2023 +0100 +++ b/src/gdcm-4-iconv.patch Wed Jan 24 15:07:41 2024 +0100 @@ -1,64 +1,33 @@ -diff -ur gdcm-3.0.17.orig/Utilities/gdcmext/mec_mr3_io.c gdcm-3.0.17/Utilities/gdcmext/mec_mr3_io.c ---- gdcm-3.0.17.orig/Utilities/gdcmext/mec_mr3_io.c 2022-09-05 10:44:18.058943134 -0400 -+++ gdcm-3.0.17/Utilities/gdcmext/mec_mr3_io.c 2022-09-05 11:28:44.339613356 -0400 -@@ -23,7 +23,7 @@ - #include <stdlib.h> - #include <string.h> - --#ifndef _MSC_VER -+#if !defined(_MSC_VER) && !defined(__MINGW32__) - #include <iconv.h> - #endif - #if defined(_MSC_VER) && (_MSC_VER < 1900) -@@ -54,7 +54,7 @@ - - struct app { - struct stream *in; --#ifndef _MSC_VER -+#if !defined(_MSC_VER) && !defined(__MINGW32__) - iconv_t conv; - #endif - void *shift_jis_buffer; -@@ -62,7 +62,7 @@ - - static struct app *create_app(struct app *self, struct stream *in) { - self->in = in; --#ifndef _MSC_VER -+#if !defined(_MSC_VER) && !defined(__MINGW32__) - self->conv = iconv_open("utf-8", "shift-jis"); - assert(self->conv != (iconv_t)-1); - #endif -@@ -132,7 +132,7 @@ +diff -ur gdcm-3.0.23.orig/Source/MediaStorageAndFileFormat/CMakeLists.txt gdcm-3.0.23/Source/MediaStorageAndFileFormat/CMakeLists.txt +--- gdcm-3.0.23.orig/Source/MediaStorageAndFileFormat/CMakeLists.txt 2024-01-11 07:41:56.800302334 -0500 ++++ gdcm-3.0.23/Source/MediaStorageAndFileFormat/CMakeLists.txt 2024-01-11 07:49:28.533961424 -0500 +@@ -228,7 +228,7 @@ + if(GDCM_USE_SYSTEM_JSON) + target_link_libraries(gdcmMSFF LINK_PRIVATE ${JSON_LIBRARIES}) + endif() +-if(UNIX) ++if(UNIX OR MINGW) + find_package(Iconv) + target_link_libraries(gdcmMSFF LINK_PRIVATE ${Iconv_LIBRARIES}) + endif() +diff -ur gdcm-3.0.23.orig/Utilities/gdcmext/mec_mr3_io.c gdcm-3.0.23/Utilities/gdcmext/mec_mr3_io.c +--- gdcm-3.0.23.orig/Utilities/gdcmext/mec_mr3_io.c 2024-01-11 07:52:37.007305489 -0500 ++++ gdcm-3.0.23/Utilities/gdcmext/mec_mr3_io.c 2024-01-11 07:54:30.411529519 -0500 +@@ -138,7 +138,7 @@ } static void *aligned_alloc_impl(size_t alignment, size_t size) { -#ifdef _MSC_VER -+#if defined(_MSC_VER) || defined(__MINGW32__) ++#ifdef _WIN32 return _aligned_malloc(size, alignment); #else - return aligned_alloc(alignment, size); -@@ -352,7 +352,7 @@ - const size_t guesstimate = len < 128 ? 128 : len * 2; - self->shift_jis_buffer = realloc(self->shift_jis_buffer, guesstimate); - char *dest_str = self->shift_jis_buffer; --#ifndef _MSC_VER -+#if !defined(_MSC_VER) && !defined(__MINGW32__) - char *in_str = str; - char *out_str = dest_str; - size_t inbytes = len; -@@ -831,12 +831,12 @@ + // return aligned_alloc(alignment, size); +@@ -843,7 +843,7 @@ good = good && read_group(self, group, nitems, &info, &data); } // release memory: -#ifdef _MSC_VER -+#if defined(_MSC_VER) || defined(__MINGW32__) ++#ifdef _WIN32 _aligned_free(data.buffer); #else free(data.buffer); - #endif --#ifndef _MSC_VER -+#if !defined(_MSC_VER) && !defined(__MINGW32__) - iconv_close(self->conv); - #endif - free(self->shift_jis_buffer); -Only in gdcm-3.0.17.orig/Utilities/gdcmext: .mec_mr3_io.c.swp
--- a/src/gdcm.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/gdcm.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := gdcm $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.22 -$(PKG)_CHECKSUM := 869d661413ca99c43bbc49318041ab62e734aebd +$(PKG)_VERSION := 3.0.23 +$(PKG)_CHECKSUM := 8d05a89ce1f854c41defc651b283fe56c0ad8738 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG) 3.x/GDCM $($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/glpk-1-fixes.patch Wed Dec 20 18:13:49 2023 +0100 +++ b/src/glpk-1-fixes.patch Wed Jan 24 15:07:41 2024 +0100 @@ -10,8 +10,8 @@ +AC_CHECK_LIB([amd], [amd_1]) +AC_CHECK_LIB([colamd], [colamd]) + -+#CPPFLAGS="$CPPFLAGS -I/usr/include/suitesparse" -+AC_CHECK_HEADER([suitesparse/amd.h]) ++CPPFLAGS="$CPPFLAGS $(pkg-config --cflags AMD)" ++AC_CHECK_HEADER([amd.h]) + AC_CONFIG_FILES( [src/Makefile examples/Makefile Makefile])
--- a/src/jasper.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/jasper.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := jasper $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.1 -$(PKG)_CHECKSUM := 25f0d383c5360f7b7421a43f022e13aa0141c956 +$(PKG)_VERSION := 4.1.2 +$(PKG)_CHECKSUM := 4f616c6153d805e0c2d639f9564dac694e9a03ca $(PKG)_SUBDIR := jasper-version-$($(PKG)_VERSION) $(PKG)_FILE := jasper-version-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/jasper-software/$(PKG)/archive/version-$($(PKG)_VERSION).tar.gz
--- a/src/jpeg.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/jpeg.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := jpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 9e -$(PKG)_CHECKSUM := ed959b5f3551bc965fe6d0aff6ca48a26f8ce346 +$(PKG)_VERSION := 9f +$(PKG)_CHECKSUM := bb1d5ad2b388e0db7dca62868ad01c5cbf774868 $(PKG)_SUBDIR := jpeg-$($(PKG)_VERSION) $(PKG)_FILE := jpegsrc.v$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.ijg.org/files/$($(PKG)_FILE)
--- a/src/libgsasl.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/libgsasl.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,15 +3,15 @@ PKG := libgsasl $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.0 -$(PKG)_CHECKSUM := 903b70ecb4eef304521add85310c2df0a7675bd1 +$(PKG)_VERSION := 2.2.1 +$(PKG)_CHECKSUM := c238b3af05af3804808cbf734f049a06840d787c $(PKG)_SUBDIR := gsasl-$($(PKG)_VERSION) $(PKG)_FILE := gsasl-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://ftp.gnu.org/gnu/gsasl/$($(PKG)_FILE) +$(PKG)_URL := https://ftp.gnu.org/gnu/gsasl/$($(PKG)_FILE) $(PKG)_DEPS := libiconv libidn libntlm libgcrypt nettle define $(PKG)_UPDATE - $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gsasl.git;a=tags' | \ + $(WGET) -q -O- 'https://git.savannah.gnu.org/gitweb/?p=gsasl.git;a=tags' | \ $(SED) -n 's,.*<a[^>]*>v\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \ head -1 endef
--- a/src/libidn.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/libidn.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := libidn $(PKG)_IGNORE := -$(PKG)_VERSION := 1.41 -$(PKG)_CHECKSUM := 527748471e217c2c3857309df85b50a33ca62ab8 +$(PKG)_VERSION := 1.42 +$(PKG)_CHECKSUM := 32234b883584c190e73a8b479903ad5f4f5bd39b $(PKG)_SUBDIR := libidn-$($(PKG)_VERSION) $(PKG)_FILE := libidn-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/gnu/libidn/$($(PKG)_FILE)
--- a/src/libvpx.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/libvpx.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := libvpx $(PKG)_IGNORE := -$(PKG)_VERSION := 1.13.1 -$(PKG)_CHECKSUM := abde9c00ecb478e5740837f96fe8b71e2e029b03 +$(PKG)_VERSION := 1.14.0 +$(PKG)_CHECKSUM := f767052bff9043e61d094598cf9a18f38dde8a3e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/webmproject/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz @@ -34,7 +34,7 @@ --prefix='$(HOST_PREFIX)' \ $($(PKG)_TARGET_OPTS) \ --as=yasm \ - --extra-cflags='-std=gnu89' \ + --extra-cflags='-std=gnu99' \ --disable-examples \ --disable-install-docs $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/libxml2.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/libxml2.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.12.3 -$(PKG)_CHECKSUM := f5504a191b51def119046f8a2b70ae7fa2fe1b98 +$(PKG)_VERSION := 2.12.4 +$(PKG)_CHECKSUM := 9fc1eab3cefc559219b078369ed62edd43e49e19 $(PKG)_SUBDIR := libxml2-v$($(PKG)_VERSION) $(PKG)_FILE := libxml2-v$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://gitlab.gnome.org/GNOME/$(PKG)/-/archive/v$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/mesa.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/mesa.mk Wed Jan 24 15:07:41 2024 +0100 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := mesa -$(PKG)_VERSION := 23.3.1 -$(PKG)_CHECKSUM := 982c4db0c3019386db98c73d5330fee8575eaed0 +$(PKG)_VERSION := 23.3.3 +$(PKG)_CHECKSUM := 13b0767105f93a5b2d3c2b620e2f3cd7ce67c0f5 $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE)
--- a/src/mpg123.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/mpg123.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := mpg123 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.32.3 -$(PKG)_CHECKSUM := 3a94848a620db7917c757cb21e261c711e44618f +$(PKG)_VERSION := 1.32.4 +$(PKG)_CHECKSUM := 330dc20d1c6bd7a92269a43ae8cfa189e4c67781 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/mpg123/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/msys2-gnupg.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/msys2-gnupg.mk Wed Jan 24 15:07:41 2024 +0100 @@ -4,9 +4,9 @@ PKG := msys2-gnupg $(PKG)_NAME := gnupg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.41-1 -$(PKG)_x86_64_CS := 81dc250c9cdffe47a8caea32ef8b018b96b64458 -$(PKG)_i686_CS := 0588ac526b0180ab164f6b033ad84ed86654831d +$(PKG)_VERSION := 2.4.3-2 +$(PKG)_x86_64_CS := 37d3bcd5a8c844974a2f1be37993b3a4c7d01d50 +$(PKG)_i686_CS := 9a532c03de26f3680fc140b24cbacf24b8b0cd58 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libnpth.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/msys2-libnpth.mk Wed Jan 24 15:07:41 2024 +0100 @@ -4,13 +4,13 @@ PKG := msys2-libnpth $(PKG)_NAME := libnpth $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6-1 -$(PKG)_x86_64_CS := c2394449c65ebf2df1709c5def7054690e570b0a -$(PKG)_i686_CS := 3fde6864fe80a41f3fbab805788191acb5d9d5ae +$(PKG)_VERSION := 1.6-2 +$(PKG)_x86_64_CS := 0ee21116b6bdb5b7af098284fdb762cae50d2833 +$(PKG)_i686_CS := 37e187b73f80d87055de3710350ac76aa4c42f63 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) $(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),)
--- a/src/msys2-libxml2.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/msys2-libxml2.mk Wed Jan 24 15:07:41 2024 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libxml2 $(PKG)_NAME := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.12.2-1 -$(PKG)_x86_64_CS := 1e54d9af87491fd48ac5b54a49f1680eff90dbc8 -$(PKG)_i686_CS := 4267b2fc2ff438e1226cf629c5a3be4677d4974a +$(PKG)_VERSION := 2.12.3-1 +$(PKG)_x86_64_CS := 7774ce52ef71002ef62e52cb2345e62169acbdc9 +$(PKG)_i686_CS := e9f1948663662311f5117d02e3f5932fd91e01e0 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-zip.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/msys2-zip.mk Wed Jan 24 15:07:41 2024 +0100 @@ -4,13 +4,13 @@ PKG := msys2-zip $(PKG)_NAME := zip $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0-3 -$(PKG)_x86_64_CS := 4e012405277ad5b3f85d946cff5bebf4bc18c018 -$(PKG)_i686_CS := 31d9ff6d2d4d8e052899fa4dc2aafdfaf9a3c1b8 +$(PKG)_VERSION := 3.0-4 +$(PKG)_x86_64_CS := fb50d265b262ce02785b31236a48d4a7c342fb46 +$(PKG)_i686_CS := b098c97d2b562e0c7c6665699486c51a1c476a0c $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) $(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),)
--- a/src/npp.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/npp.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := npp $(PKG)_IGNORE := -$(PKG)_VERSION := 8.6 -$(PKG)_CHECKSUM := 83aaef4a9da318cef7645c048619facec4607c60 +$(PKG)_VERSION := 8.6.2 +$(PKG)_CHECKSUM := b1c9e2a6add27e90662ac1e38edd4dfbb59b74e7 $(PKG)_SUBDIR := $(PKG)_FILE := $(PKG).$($(PKG)_VERSION).portable.zip $(PKG)_URL := https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/of-control.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/of-control.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := of-control $(PKG)_IGNORE := -$(PKG)_VERSION := 3.6.1 -$(PKG)_CHECKSUM := ae5e5ab6ff451e3708fa309ec4ee03a320f5d860 +$(PKG)_VERSION := 4.0.0 +$(PKG)_CHECKSUM := ff6147e7681cb7c03c2db3cd0a66d29867e0d0df $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := control-$($(PKG)_VERSION) $(PKG)_FILE := control-$($(PKG)_VERSION).tar.gz
--- a/src/of-dicom.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/of-dicom.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := of-dicom $(PKG)_IGNORE := -$(PKG)_VERSION := 0.5.1 -$(PKG)_CHECKSUM := 9b0286d3d0ec45e389c214f02f11153d4404d298 +$(PKG)_VERSION := 0.6.0 +$(PKG)_CHECKSUM := 3bf0f73c49c3ecb5e24407de4e5a2d3ba49adadc $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := dicom-$($(PKG)_VERSION) $(PKG)_FILE := dicom-$($(PKG)_VERSION).tar.gz
--- a/src/of-instrument-control.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/of-instrument-control.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := of-instrument-control $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.1 -$(PKG)_CHECKSUM := 8741f2c14f077f3dc2a3007cda79dbe8de71f479 +$(PKG)_VERSION := 0.9.2 +$(PKG)_CHECKSUM := c9ad0717d79ba882bcb7481c631ddf3335195f2b $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := instrument-control-$($(PKG)_VERSION) $(PKG)_FILE := instrument-control-$($(PKG)_VERSION).tar.gz
--- a/src/of-statistics.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/of-statistics.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := of-statistics $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.0 -$(PKG)_CHECKSUM := 2d1a7f6a0fc0d09d92b5ca45eb7220b178b3d889 +$(PKG)_VERSION := 1.6.1 +$(PKG)_CHECKSUM := caaa1f80f11d7a591af15d55ac741e1b3c6ce40b $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := statistics-release-$($(PKG)_VERSION) $(PKG)_FILE := statistics-$($(PKG)_VERSION).tar.gz
--- a/src/openblas.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/openblas.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := openblas $(PKG)_IGNORE := -$(PKG)_VERSION := 0.3.25 -$(PKG)_CHECKSUM := 79f2828dff06e24ecec7277f3d3da5e7b196ff53 +$(PKG)_VERSION := 0.3.26 +$(PKG)_CHECKSUM := af6dce0e486e684be842053fcbd98eaf97e39749 $(PKG)_SUBDIR := OpenBLAS-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz
--- a/src/opkg-cfitsio.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/opkg-cfitsio.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := opkg-cfitsio $(PKG)_IGNORE := -$(PKG)_VERSION := 0.0.5 -$(PKG)_CHECKSUM := 6e57ac5d1a7094f40a4628cbd1e9d07a4315a504 +$(PKG)_VERSION := 0.0.6 +$(PKG)_CHECKSUM := 00726153ac022ea514579c6ba6029c035f32f627 $(PKG)_SUBDIR := octave-cfitsio-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://downloads.sourceforge.net/project/octave-cfitsio/v$($(PKG)_VERSION)/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opkg-tablicious.mk Wed Jan 24 15:07:41 2024 +0100 @@ -0,0 +1,24 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := opkg-tablicious +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.3.7 +$(PKG)_CHECKSUM := 93c802601bb65f7de4bb10889cbb8494b79ea031 +$(PKG)_SUBDIR := tablicious-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +x$(PKG)_URL := https://github.com/apjanke/octave-tablicious/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/apjanke/octave-tablicious/releases/download/v0.3.7/tablicious-0.3.7.tar.gz +$(PKG)_DEPS := + +ifeq ($(ENABLE_BINARY_PACKAGES),yes) + $(PKG)_DEPS += $(OCTAVE_TARGET) +endif + +define $(PKG)_UPDATE + $(call GITHUB_PKG_UPDATE,apjanke,octave-tablicious,v) +endef + +define $(PKG)_BUILD + $(OCTAVE_FORGE_PKG_BUILD) +endef
--- a/src/pixman.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/pixman.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,13 +3,26 @@ PKG := pixman $(PKG)_IGNORE := -$(PKG)_VERSION := 0.42.2 -$(PKG)_CHECKSUM := 7063429f9952fd8c4fcbc887c3210b35adb6a6c7 +$(PKG)_VERSION := 0.43.0 +$(PKG)_CHECKSUM := 71b5396aaeb15450149e455b1de0382aa5e5504d $(PKG)_SUBDIR := pixman-$($(PKG)_VERSION) $(PKG)_FILE := pixman-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE) $(PKG)_URL_2 := http://www.x.org/archive/individual/lib/$($(PKG)_FILE) -$(PKG)_DEPS := libpng +$(PKG)_DEPS := build-meson build-ninja libpng + +ifeq ($(MXE_NATIVE_BUILD),no) + $(PKG)_MESON_TOOLCHAIN_FILE := --cross-file '$(HOST_PREFIX)/share/meson/cross/mxe-conf.ini' +else + $(PKG)_MESON_TOOLCHAIN_FILE := --native-file '$(HOST_PREFIX)/share/meson/native/mxe-conf.ini' +endif + +ifeq ($(BUILD_SHARED),yes) + $(PKG)_MESON_CONFIG_FLAGS += -Ddefault_library=shared +else + $(PKG)_MESON_CONFIG_FLAGS += -Ddefault_library=static +endif + define $(PKG)_UPDATE $(WGET) -q -O- 'http://cairographics.org/releases/?C=M;O=D' | \ @@ -18,11 +31,13 @@ endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(HOST_PREFIX)' \ - && $(CONFIGURE_POST_HOOK) - $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + cd '$(1)' && \ + meson $(1)/.build \ + $($(PKG)_MESON_TOOLCHAIN_FILE) \ + $($(PKG)_MESON_CONFIG_FLAGS) \ + -Dprefix='$(HOST_PREFIX)' + + cd '$(1)/.build' && DESTDIR=$(3) ninja -j $(JOBS) + cd '$(1)/.build' && DESTDIR=$(3) ninja -j 1 install + endef
--- a/src/qtbase.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/qtbase.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.15.11 -$(PKG)_CHECKSUM := 16ad151614f7e629149a35b199c14d436c1c5fbd +$(PKG)_VERSION := 5.15.12 +$(PKG)_CHECKSUM := 329037740f650f7ea081ea50bc0ad49f3a87a3ef $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
--- a/src/qtimageformats.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/qtimageformats.mk Wed Jan 24 15:07:41 2024 +0100 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5da2e591f99c7c5d5acda946ac7228f63f1c923d +$(PKG)_CHECKSUM := fa860ae1edac54270667b5b7d43fe8b6febb06bd $(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 Dec 20 18:13:49 2023 +0100 +++ b/src/qtsvg.mk Wed Jan 24 15:07:41 2024 +0100 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 0c253e570b630ad45026a77ff8296d56fb7330a1 +$(PKG)_CHECKSUM := 3a2e8253c938a13e9bded51ca967c203fb3e561f $(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 Dec 20 18:13:49 2023 +0100 +++ b/src/qttools.mk Wed Jan 24 15:07:41 2024 +0100 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 16261f5ea7d361f59fbd87c04adae09d837624d9 +$(PKG)_CHECKSUM := 74d5d91cef382c75933f71c438fb320f6f84ec98 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))
--- a/src/qttranslations.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/qttranslations.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 05ceb59e69b2dd97167f764c204e16ee917c7667 +$(PKG)_CHECKSUM := 61c77adef090c76c8f26a77626c48a93e4cee540 $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))
--- a/src/readline-0-001-fix-crash-when-readline-is-star.patch Wed Dec 20 18:13:49 2023 +0100 +++ b/src/readline-0-001-fix-crash-when-readline-is-star.patch Wed Jan 24 15:07:41 2024 +0100 @@ -1,8 +1,8 @@ From 7274faabe97ce53d6b464272d7e6ab6c1392837b Mon Sep 17 00:00:00 2001 From: Chet Ramey <chet.ramey@case.edu> Date: Wed, 5 Oct 2022 10:41:16 -0400 -Subject: [PATCH 1/7] Readline-8.2 patch 1: fix crash when readline is started - with an invalid locale specification +Subject: [PATCH 01/10] Readline-8.2 patch 1: fix crash when readline is + started with an invalid locale specification --- nls.c | 4 ++++
--- a/src/readline-0-002-avoid-possible-crash-when-tryin.patch Wed Dec 20 18:13:49 2023 +0100 +++ b/src/readline-0-002-avoid-possible-crash-when-tryin.patch Wed Jan 24 15:07:41 2024 +0100 @@ -1,8 +1,8 @@ From 83de95eaba5debdf544d0ef43cf88de3bc5cd7dd Mon Sep 17 00:00:00 2001 From: Chet Ramey <chet.ramey@case.edu> Date: Fri, 17 Nov 2023 16:00:59 -0500 -Subject: [PATCH 2/7] Readline-8.2 patch 2: avoid possible crash when trying to - zero out a line buffer that's potentially not null-terminated +Subject: [PATCH 02/10] Readline-8.2 patch 2: avoid possible crash when trying + to zero out a line buffer that's potentially not null-terminated --- display.c | 7 ++-----
--- a/src/readline-0-003-fix-typo-when-specifying-readli.patch Wed Dec 20 18:13:49 2023 +0100 +++ b/src/readline-0-003-fix-typo-when-specifying-readli.patch Wed Jan 24 15:07:41 2024 +0100 @@ -1,8 +1,8 @@ From ba77167d33ba8eca87f1315c39f4181cc1e7aeae Mon Sep 17 00:00:00 2001 From: Chet Ramey <chet.ramey@case.edu> Date: Fri, 17 Nov 2023 16:01:56 -0500 -Subject: [PATCH 3/7] Readline-8.2 patch 3: fix typo when specifying readline's - custom color prefix +Subject: [PATCH 03/10] Readline-8.2 patch 3: fix typo when specifying + readline's custom color prefix --- colors.c | 2 +-
--- a/src/readline-0-004-fix-compilation-on-systems-that.patch Wed Dec 20 18:13:49 2023 +0100 +++ b/src/readline-0-004-fix-compilation-on-systems-that.patch Wed Jan 24 15:07:41 2024 +0100 @@ -1,7 +1,7 @@ From c59116b15d95a94a9a2dd8ce5fe08850e004411a Mon Sep 17 00:00:00 2001 From: Chet Ramey <chet.ramey@case.edu> Date: Fri, 17 Nov 2023 16:02:46 -0500 -Subject: [PATCH 4/7] Readline-8.2 patch 4: fix compilation on systems that +Subject: [PATCH 04/10] Readline-8.2 patch 4: fix compilation on systems that provide select or pselect but not both ---
--- a/src/readline-0-005-fix-for-callback-signal-handlin.patch Wed Dec 20 18:13:49 2023 +0100 +++ b/src/readline-0-005-fix-for-callback-signal-handlin.patch Wed Jan 24 15:07:41 2024 +0100 @@ -1,7 +1,7 @@ From 37ec317397e442ee8616b3b2aa81bfb8dde71a06 Mon Sep 17 00:00:00 2001 From: Chet Ramey <chet.ramey@case.edu> Date: Fri, 17 Nov 2023 16:04:13 -0500 -Subject: [PATCH 5/7] Readline-8.2 patch 5: fix for callback signal handling +Subject: [PATCH 05/10] Readline-8.2 patch 5: fix for callback signal handling when a signal arrives after readline checks but before it restores the application's signal handlers
--- a/src/readline-0-006-fix-for-callback-signal-handlin.patch Wed Dec 20 18:13:49 2023 +0100 +++ b/src/readline-0-006-fix-for-callback-signal-handlin.patch Wed Jan 24 15:07:41 2024 +0100 @@ -1,7 +1,7 @@ From 93a6afa50f953246f7c0f93b219a1e4010ba704b Mon Sep 17 00:00:00 2001 From: Chet Ramey <chet.ramey@case.edu> Date: Fri, 17 Nov 2023 16:05:13 -0500 -Subject: [PATCH 6/7] Readline-8.2 patch 6: fix for callback signal handling +Subject: [PATCH 06/10] Readline-8.2 patch 6: fix for callback signal handling when a signal arrives before readline calls rl_getc and handling it changes callback state
--- a/src/readline-0-007-display-newline-if-readline-is-.patch Wed Dec 20 18:13:49 2023 +0100 +++ b/src/readline-0-007-display-newline-if-readline-is-.patch Wed Jan 24 15:07:41 2024 +0100 @@ -1,7 +1,7 @@ From bfe9c573a9e376323929c80b2b71c59727fab0cc Mon Sep 17 00:00:00 2001 From: Chet Ramey <chet.ramey@case.edu> Date: Fri, 17 Nov 2023 16:06:49 -0500 -Subject: [PATCH 7/7] Readline-8.2 patch 7: display newline if readline is +Subject: [PATCH 07/10] Readline-8.2 patch 7: display newline if readline is called without a prompt string and return is typed on a single empty line ---
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/readline-0-008-add-missing-function-prototypes.patch Wed Jan 24 15:07:41 2024 +0100 @@ -0,0 +1,67 @@ +From cef614441f99b7b6e444ba601d8465a6e88f5a98 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey@case.edu> +Date: Sun, 14 Jan 2024 15:19:37 -0500 +Subject: [PATCH 08/10] Readline-8.2 patch 8: add missing function prototypes + +--- + bind.c | 4 +--- + patchlevel | 2 +- + rltty.c | 3 +-- + text.c | 3 +-- + 4 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/bind.c b/bind.c +index 971116a..2596006 100644 +--- a/bind.c ++++ b/bind.c +@@ -1167,9 +1167,7 @@ _rl_init_file_error (va_alist) + /* **************************************************************** */ + + static int +-parse_comparison_op (s, indp) +- const char *s; +- int *indp; ++parse_comparison_op (const char *s, int *indp) + { + int i, peekc, op; + +diff --git a/patchlevel b/patchlevel +index e340b58..6c10f12 100644 +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-7 ++8 +diff --git a/rltty.c b/rltty.c +index 882a3d4..a4863ac 100644 +--- a/rltty.c ++++ b/rltty.c +@@ -80,8 +80,7 @@ static int ksrflow; + /* Dummy call to force a backgrounded readline to stop before it tries + to get the tty settings. */ + static void +-set_winsize (tty) +- int tty; ++set_winsize (int tty) + { + #if defined (TIOCGWINSZ) + struct winsize w; +diff --git a/text.c b/text.c +index 91c3f33..30fdaa1 100644 +--- a/text.c ++++ b/text.c +@@ -1764,8 +1764,7 @@ _rl_char_search (int count, int fdir, int bdir) + + #if defined (READLINE_CALLBACKS) + static int +-_rl_char_search_callback (data) +- _rl_callback_generic_arg *data; ++_rl_char_search_callback (_rl_callback_generic_arg *data) + { + _rl_callback_func = 0; + _rl_want_redisplay = 1; +-- +2.38.0.windows.1 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/readline-0-009-fix-issue-where-directory-name-.patch Wed Jan 24 15:07:41 2024 +0100 @@ -0,0 +1,57 @@ +From 3853739c28a9777d30ff65e8448e8f1a2898f3f2 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey@case.edu> +Date: Sun, 14 Jan 2024 15:20:44 -0500 +Subject: [PATCH 09/10] Readline-8.2 patch 9: fix issue where directory name + being completed needs both tilde expansion and dequoting + +--- + complete.c | 14 ++++++++++---- + patchlevel | 2 +- + 2 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/complete.c b/complete.c +index e5d224e..c9e0098 100644 +--- a/complete.c ++++ b/complete.c +@@ -2526,7 +2526,8 @@ rl_filename_completion_function (const char *text, int state) + temp = tilde_expand (dirname); + xfree (dirname); + dirname = temp; +- tilde_dirname = 1; ++ if (*dirname != '~') ++ tilde_dirname = 1; /* indicate successful tilde expansion */ + } + + /* We have saved the possibly-dequoted version of the directory name +@@ -2545,11 +2546,16 @@ rl_filename_completion_function (const char *text, int state) + xfree (users_dirname); + users_dirname = savestring (dirname); + } +- else if (tilde_dirname == 0 && rl_completion_found_quote && rl_filename_dequoting_function) ++ else if (rl_completion_found_quote && rl_filename_dequoting_function) + { +- /* delete single and double quotes */ ++ /* We already ran users_dirname through the dequoting function. ++ If tilde_dirname == 1, we successfully performed tilde expansion ++ on dirname. Now we need to reconcile those results. We either ++ just copy the already-dequoted users_dirname or tilde expand it ++ if we tilde-expanded dirname. */ ++ temp = tilde_dirname ? tilde_expand (users_dirname) : savestring (users_dirname); + xfree (dirname); +- dirname = savestring (users_dirname); ++ dirname = temp; + } + directory = opendir (dirname); + +diff --git a/patchlevel b/patchlevel +index 6c10f12..c0ac809 100644 +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-8 ++9 +-- +2.38.0.windows.1 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/readline-0-010-fix-issue-where-comparing-quot.patch Wed Jan 24 15:07:41 2024 +0100 @@ -0,0 +1,55 @@ +From 5d4d92f221d6aac4be445bdd8cd9b48d9ac33f04 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey@case.edu> +Date: Sun, 14 Jan 2024 15:22:07 -0500 +Subject: [PATCH 10/10] Readline-8.2 patch 10: fix issue where comparing quoted + and unquoted words to be completed results in readline not displaying + possible matches + +--- + complete.c | 18 +++++++++++++++++- + patchlevel | 2 +- + 2 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/complete.c b/complete.c +index c9e0098..70a0a60 100644 +--- a/complete.c ++++ b/complete.c +@@ -2031,9 +2031,25 @@ rl_complete_internal (int what_to_do) + + text = rl_copy_text (start, end); + matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char); ++ /* If TEXT contains quote characters, it will be dequoted as part of ++ generating the matches, and the matches will not contain any quote ++ characters. We need to dequote TEXT before performing the comparison. ++ Since compare_match performs the dequoting, and we only want to do it ++ once, we don't call compare_matches after dequoting TEXT; we call ++ strcmp directly. */ + /* nontrivial_lcd is set if the common prefix adds something to the word + being completed. */ +- nontrivial_lcd = matches && compare_match (text, matches[0]) != 0; ++ if (rl_filename_completion_desired && rl_filename_quoting_desired && ++ rl_completion_found_quote && rl_filename_dequoting_function) ++ { ++ char *t; ++ t = (*rl_filename_dequoting_function) (text, rl_completion_quote_character); ++ xfree (text); ++ text = t; ++ nontrivial_lcd = matches && strcmp (text, matches[0]) != 0; ++ } ++ else ++ nontrivial_lcd = matches && strcmp (text, matches[0]) != 0; + if (what_to_do == '!' || what_to_do == '@') + tlen = strlen (text); + xfree (text); +diff --git a/patchlevel b/patchlevel +index c0ac809..810c277 100644 +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-9 ++10 +-- +2.38.0.windows.1 +
--- a/src/sdl2_image.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/sdl2_image.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := sdl2_image $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.1 -$(PKG)_CHECKSUM := 71c5fa82f20e2a1f9599dd1dc5ee6ee3e00f28de +$(PKG)_VERSION := 2.8.2 +$(PKG)_CHECKSUM := 5c8926619d7e3f7edea4eb6410f8b1e7be7978ff $(PKG)_SUBDIR := SDL2_image-$($(PKG)_VERSION) $(PKG)_FILE := SDL2_image-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/libsdl-org/SDL_image/releases/download/release-$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/sdl2_mixer.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/sdl2_mixer.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := sdl2_mixer $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6.3 -$(PKG)_CHECKSUM := a6913b7684a3ab17f640a33ce56552fc8b3a6d0e +$(PKG)_VERSION := 2.8.0 +$(PKG)_CHECKSUM := a58c69f9d00e44833b9e00e1adb58d85759ca499 $(PKG)_SUBDIR := SDL2_mixer-$($(PKG)_VERSION) $(PKG)_FILE := SDL2_mixer-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/libsdl-org/SDL_mixer/releases/download/release-$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/sdl2_ttf.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/sdl2_ttf.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := sdl2_ttf $(PKG)_IGNORE := -$(PKG)_VERSION := 2.20.2 -$(PKG)_CHECKSUM := 2326e02810b20f3221d71a0bc76dc06acdc23f6e +$(PKG)_VERSION := 2.22.0 +$(PKG)_CHECKSUM := da5e86b601ad299a697878fab1af6f3be47b529d $(PKG)_SUBDIR := SDL2_ttf-$($(PKG)_VERSION) $(PKG)_FILE := SDL2_ttf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/libsdl-org/SDL_ttf/releases/download/release-$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/sqlite.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/sqlite.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,11 +3,11 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3440200 -$(PKG)_CHECKSUM := 8398dd159f3a1fd8f1c5edf02c687512eaab69e4 +$(PKG)_VERSION := 3450000 +$(PKG)_CHECKSUM := 09e27a5b1cfed4ca9b64de5fceedc5d8d6eb9932 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.sqlite.org/2023/$($(PKG)_FILE) +$(PKG)_URL := http://www.sqlite.org/2024/$($(PKG)_FILE) $(PKG)_DEPS := readline zlib ifeq ($(MXE_SYSTEM),mingw)
--- a/src/src-msys2-gnupg.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/src-msys2-gnupg.mk Wed Jan 24 15:07:41 2024 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-gnupg $(PKG)_NAME := gnupg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.41-1 -$(PKG)_CHECKSUM := 94a250febe56fe1568c5c5d932c71959ebaccd1e +$(PKG)_VERSION := 2.4.3-2 +$(PKG)_CHECKSUM := 7665e5c12c23753f9f965418a1cd076f083b7105 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libnpth.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/src-msys2-libnpth.mk Wed Jan 24 15:07:41 2024 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libnpth $(PKG)_NAME := npth $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6-1 -$(PKG)_CHECKSUM := a6659dd67153f7cbf8fa726b852c655b764d6540 +$(PKG)_VERSION := 1.6-2 +$(PKG)_CHECKSUM := 4759871d40ad35fe89889fd4ce7a771e52d91ac2 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libxml2.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/src-msys2-libxml2.mk Wed Jan 24 15:07:41 2024 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libxml2 $(PKG)_NAME := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.12.2-1 -$(PKG)_CHECKSUM := 5828d394f7f0493be7fb8d4fef53d90104c5e459 +$(PKG)_VERSION := 2.12.3-1 +$(PKG)_CHECKSUM := 13cde4c335e224ec0244a1b09e6943df6fc23627 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-zip.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/src-msys2-zip.mk Wed Jan 24 15:07:41 2024 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-zip $(PKG)_NAME := zip $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0-3 -$(PKG)_CHECKSUM := fe5d592418617d6f2b8d4d08888f4e9982c3c39e +$(PKG)_VERSION := 3.0-4 +$(PKG)_CHECKSUM := 458bd965cf13d7eb08478c64b61e5eb8b8bad694 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/suitesparse.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/suitesparse.mk Wed Jan 24 15:07:41 2024 +0100 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := suitesparse -$(PKG)_VERSION := 7.3.1 -$(PKG)_CHECKSUM := c06cd64f052d2187f8945348f561105ced494317 +$(PKG)_VERSION := 7.5.1 +$(PKG)_CHECKSUM := 1a2a234213fe3b9e3d494389889009227c85915f $(PKG)_SUBDIR := SuiteSparse-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$($(PKG)_VERSION).tar.gz @@ -12,23 +12,13 @@ $(PKG)_DEPS += libgomp endif -ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) - $(PKG)_DESTDIR := -else - $(PKG)_DESTDIR := $(3) -endif - define $(PKG)_UPDATE $(call GITHUB_PKG_UPDATE,DrTimothyAldenDavis,SuiteSparse,v) endef ifeq ($(ENABLE_FORTRAN_INT64),yes) - $(PKG)_CMAKE_FLAGS += -DALLOW_64BIT_BLAS=ON -endif - -ifneq ($(BUILD_STATIC),yes) - $(PKG)_CMAKE_FLAGS += -DNSTATIC=ON + $(PKG)_CMAKE_FLAGS += -DSUITESPARSE_USE_64BIT_BLAS=ON endif $(PKG)_MAKE_OPTS = \ @@ -36,21 +26,24 @@ CFLAGS='$(MXE_CFLAGS)' \ CXXFLAGS='$(MXE_CXXFLAGS)' \ AR='$(MXE_AR)' \ - RANLIB='$(MXE_RANLIB)' \ - CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" \ - -DCOMPACT=ON -DNOPENMP=ON \ - -DBLA_VENDOR="Generic" -DBLAS_LIBRARIES="-lblas -lgfortran" -DLAPACK_LIBRARIES="-llapack" \ - -DENABLE_CUDA=OFF \ - $($(PKG)_CMAKE_FLAGS) \ - $(CMAKE_CCACHE_FLAGS) $(CMAKE_BUILD_SHARED_OR_STATIC)' + RANLIB='$(MXE_RANLIB)' define $(PKG)_BUILD - # build all - $(MAKE) -C '$(1)' -j '$(JOBS)' \ - $($(PKG)_MAKE_OPTS) + cd '$(1)/build' && $($(PKG)_MAKE_OPTS) cmake \ + $($(PKG)_CMAKE_FLAGS) \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DGRAPHBLAS_CROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE=$(CMAKE_NATIVE_TOOLCHAIN_FILE)" \ + -DGRAPHBLAS_COMPACT=ON \ + -DSUITESPARSE_USE_OPENMP=OFF \ + -DBLA_VENDOR="Generic" -DBLAS_LIBRARIES="-lblas -lgfortran" -DLAPACK_LIBRARIES="-llapack" \ + -DSUITESPARSE_USE_CUDA=OFF \ + -DSUITESPARSE_DEMOS=OFF \ + -DBUILD_TESTING=OFF \ + $(CMAKE_CCACHE_FLAGS) $(CMAKE_BUILD_SHARED_OR_STATIC) \ + $(1) - # install libraries and headers - $(MAKE) -C '$(1)' -j 1 install \ - $($(PKG)_MAKE_OPTS) + cmake --build '$(1)/build' -j $(JOBS) + DESTDIR='$(3)' cmake --install '$(1)/build' endef
--- a/src/sundials-ida.mk Wed Dec 20 18:13:49 2023 +0100 +++ b/src/sundials-ida.mk Wed Jan 24 15:07:41 2024 +0100 @@ -3,8 +3,8 @@ PKG := sundials-ida $(PKG)_IGNORE := -$(PKG)_VERSION := 6.6.2 -$(PKG)_CHECKSUM := 41e08b3ce82fb402373181b6566c42c9d38c6c19 +$(PKG)_VERSION := 6.7.0 +$(PKG)_CHECKSUM := 3d0a5b03d88b9c49f51e784f356dc87114e8496f $(PKG)_SUBDIR := sundials-$($(PKG)_VERSION) $(PKG)_FILE := sundials-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/LLNL/sundials/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/tools/makeinst-script.sh.in Wed Dec 20 18:13:49 2023 +0100 +++ b/tools/makeinst-script.sh.in Wed Jan 24 15:07:41 2024 +0100 @@ -732,8 +732,6 @@ if [ -d $OCTAVE_SOURCE/$OCTAVE_SUBDIR/share/doc/octave ]; then cat >> $OUTFILE << EOF CreateDirectory "\$SMPROGRAMS\\GNU Octave $VERSION\$MultiUser.Local\\Documentation" - CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\$MultiUser.Local\\Documentation\\Octave C++ Classes (PDF).lnk" "\$INSTDIR\\$OCTAVE_SUBDIR\\share\\doc\\octave\\liboctave.pdf" "" "" 0 - CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\$MultiUser.Local\\Documentation\\Octave C++ Classes (HTML).lnk" "\$INSTDIR\\$OCTAVE_SUBDIR\\share\\doc\\octave\\liboctave.html\\index.html" "" "" 0 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\$MultiUser.Local\\Documentation\\Octave (PDF).lnk" "\$INSTDIR\\$OCTAVE_SUBDIR\\share\\doc\\octave\\octave.pdf" "" "" 0 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\$MultiUser.Local\\Documentation\\Octave (HTML).lnk" "\$INSTDIR\\$OCTAVE_SUBDIR\\share\\doc\\octave\\octave.html\\index.html" "" "" 0 EOF