# HG changeset patch # User Markus Mützel # Date 1672390921 -3600 # Node ID 6498b13b6de56c064097f1c50d3c16d36c83ebd5 # Parent 6090fc4102bbb89006ad26d1635b18af0519d981# Parent add737caf3a35649eb5bc7df9f1b6d7dc6fa8afd maint: Merge default to release. diff -r 6090fc4102bb -r 6498b13b6de5 binary-dist-rules.mk --- a/binary-dist-rules.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/binary-dist-rules.mk Fri Dec 30 10:02:01 2022 +0100 @@ -28,7 +28,8 @@ octave-launch \ octave-launch-firsttime \ win7appid \ - blas_switch + blas_switch \ + opengl_switch ifeq ($(USE_MSYS2),yes) WINDOWS_BINARY_DIST_DEPS += \ diff -r 6090fc4102bb -r 6498b13b6de5 dist-files.mk --- a/dist-files.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/dist-files.mk Fri Dec 30 10:02:01 2022 +0100 @@ -69,7 +69,6 @@ cminpack.mk \ cppunit.mk \ cunit.mk \ - curl-1-fixes.patch \ curl-test.c \ curl.mk \ damageproto.mk \ @@ -294,8 +293,6 @@ libpng-test.c \ libpng.mk \ libproxy.mk \ - librsb-1-setenv.patch \ - librsb-2-config.patch \ librsb.mk \ librsvg-1-fixes.patch \ librsvg-test.c \ @@ -337,7 +334,6 @@ lzo.mk \ matio.mk \ mdbtools.mk \ - mesa-2-ucrt.patch \ mesa-proto.mk \ mesa.mk \ mingw-blas-1-xerbla.patch \ @@ -547,7 +543,6 @@ of-specfun-1-deprecated.patch \ of-specfun.mk \ of-splines.mk \ - of-statistics-fixes.patch \ of-statistics.mk \ of-stk.mk \ of-strings.mk \ @@ -574,6 +569,7 @@ opencv-1-fixes.patch \ opencv.mk \ openexr.mk \ + opengl_switch.mk \ openjpeg.mk \ openlibm.mk \ openscenegraph-1-fixes.patch \ @@ -669,6 +665,7 @@ readline-1-sigwinch.patch \ readline-2-event-hook.patch \ readline-3-fd_set.patch \ + readline-4-locale.patch \ readline.mk \ release-octave-1-gnulib.patch \ release-octave.mk \ diff -r 6090fc4102bb -r 6498b13b6de5 index.html --- a/index.html Wed Nov 30 18:23:50 2022 +0100 +++ b/index.html Fri Dec 30 10:02:01 2022 +0100 @@ -2498,6 +2498,10 @@ OpenEXR + opengl_switch + OpenGL Switch + + openjpeg OpenJPEG diff -r 6090fc4102bb -r 6498b13b6de5 installer-files/README.html --- a/installer-files/README.html Wed Nov 30 18:23:50 2022 +0100 +++ b/installer-files/README.html Fri Dec 30 10:02:01 2022 +0100 @@ -5,11 +5,16 @@

Welcome

Thank you for installing GNU Octave!

Octave 7.3 is a minor release which mainly fixes bugs and regressions found -since the release of version 7.2. It should be feature and API compatible to -Octave 7.2.

Starting with Octave 7, the minimum required version of the Windows API is -now 6.1 (Windows 7 or newer).

Octave 8.1 is a major release with many new features and improvements. Among +other things, it brings updates for Matlab compatibility, better printing, +support for non-ASCII characters at the command prompt on Windows 8.1 or newer, +and many general improvements since version 7.3.

It is not feature or API compatible with Octave 7. Binaries +(.oct or .mex files) need to be re-built.

Octave 8 will probably be the last major version which is distributed for +Windows 32-bit (or WoW64).

Since Octave 7, the minimum required version of the Windows API is 6.1 +(Windows 7 or newer).

A full list of changes can be found in the Release Notes from the News menu or by typing news on the command prompt.

@@ -58,6 +63,13 @@ However, there are some (minor) limitations and idiosyncracies on that platform. Please, read the corresponding article for further information and possible work-arounds.

The Octave GUI is currently not compatible with the new Windows Terminal App. +Please, switch the default to the (legacy) Windows Console Host for Octave to +work correctly. See, e.g., + +these instructions by Microsoft for how to change the default terminal and +select "Windows Console Host". +

Contributing to Octave

Octave has a community that lives from its users. You are welcome to share diff -r 6090fc4102bb -r 6498b13b6de5 src/blas.mk --- a/src/blas.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/blas.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := blas $(PKG)_IGNORE := -$(PKG)_VERSION := 3.10.0 -$(PKG)_CHECKSUM := dbb9d61c51c322b5e19542aaa2bb4b02b95a774b +$(PKG)_VERSION := 3.11.0 +$(PKG)_CHECKSUM := 2d2953000e8cb65879f6bc0d472e0f72bdccd540 $(PKG)_SUBDIR := BLAS-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tgz $(PKG)_URL := http://www.netlib.org/$(PKG)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/build-xz.mk --- a/src/build-xz.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/build-xz.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-xz $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.7 -$(PKG)_CHECKSUM := 9a15569a7a969c03ae621c7ecbb29c187f59355e +$(PKG)_VERSION := 5.4.0 +$(PKG)_CHECKSUM := 4ab7e2e8ec266f8ab3444dda27c3924aff351842 $(PKG)_SUBDIR := xz-$($(PKG)_VERSION) $(PKG)_FILE := xz-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://tukaani.org/xz/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/curl-1-fixes.patch --- a/src/curl-1-fixes.patch Wed Nov 30 18:23:50 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -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: Tony Theodore -Date: Mon, 31 Oct 2022 18:57:29 +1100 -Subject: [PATCH 1/1] fix shared build with windres - -taken from: -https://github.com/curl/curl/commit/b7260c4fda95196b2fa16f32b5913f25323e5098 - -diff --git a/src/Makefile.in b/src/Makefile.in -index 1111111..2222222 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -2000,7 +2000,7 @@ listhelp: - - # Warning is "normal": libtool: error: ignoring unknown tag RC - @OS_WINDOWS_TRUE@.rc.o: --@OS_WINDOWS_TRUE@ $(LIBTOOL) --tag=RC --mode=compile $(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@ -+@OS_WINDOWS_TRUE@ $(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff -r 6090fc4102bb -r 6498b13b6de5 src/curl.mk --- a/src/curl.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/curl.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.86.0 -$(PKG)_CHECKSUM := 289a3aaec47f98a52474cd34243d6b7f51f8e525 +$(PKG)_VERSION := 7.87.0 +$(PKG)_CHECKSUM := cc61d854fc1dbb769052839829f9412d41879674 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/freetds.mk --- a/src/freetds.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/freetds.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.15 -$(PKG)_CHECKSUM := 94866ae2144109ccdfad773a52c83cd2024d25ac +$(PKG)_VERSION := 1.3.16 +$(PKG)_CHECKSUM := c05fc2d63fc1f6dfe9efec73fe5941015182191c $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/gcc-mpfr.mk --- a/src/gcc-mpfr.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/gcc-mpfr.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := gcc-mpfr $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.0 -$(PKG)_CHECKSUM := 159c3a58705662bfde4dc93f2617f3660855ead6 +$(PKG)_VERSION := 4.1.1 +$(PKG)_CHECKSUM := 2355e921d6c97c898cfe7a57dd7e72725f1fded4 $(PKG)_SUBDIR := mpfr-$($(PKG)_VERSION) $(PKG)_FILE := mpfr-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/gnu/mpfr/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/gdal.mk --- a/src/gdal.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/gdal.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := gdal $(PKG)_IGNORE : -$(PKG)_VERSION := 3.6.0.1 -$(PKG)_CHECKSUM := 92252ce2aa8418a2f70b699942c053bcc179edc2 +$(PKG)_VERSION := 3.6.1 +$(PKG)_CHECKSUM := d1d71e11cd4d9dd7a46c451a1cde6d37ece6c4a1 $(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 diff -r 6090fc4102bb -r 6498b13b6de5 src/geos.mk --- a/src/geos.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/geos.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := geos $(PKG)_IGNORE := -$(PKG)_VERSION := 3.11.0 -$(PKG)_CHECKSUM := 314c46fa8b311c54274dfcb6879fa04712204bbf +$(PKG)_VERSION := 3.11.1 +$(PKG)_CHECKSUM := d22faaa5892014d35dcc8ff845c98b7427477dd7 $(PKG)_SUBDIR := geos-$($(PKG)_VERSION) $(PKG)_FILE := geos-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://download.osgeo.org/geos/$($(PKG)_FILE) @@ -13,7 +13,7 @@ define $(PKG)_UPDATE $(WGET) -q -O- 'http://download.osgeo.org/geos/?C=M&O=A' | \ - $(SED) -n 's,.*geos-$[0-9][^>]*$\.tar.*,\1,p' | \ + $(SED) -n 's,.*geos-$[0-9][^>]*$\.tar.*,\1,p' | $(SORT) -V | \ tail -1 endef diff -r 6090fc4102bb -r 6498b13b6de5 src/graphicsmagick.mk --- a/src/graphicsmagick.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/graphicsmagick.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := graphicsmagick $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.38 -$(PKG)_CHECKSUM := 9494a31b057a79db27cc909f9ba332cf7aa578f5 +$(PKG)_VERSION := 1.3.39 +$(PKG)_CHECKSUM := 03f85f866d2a6e1466518bd85f4460f3ab328886 $(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION) $(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/lapack.mk --- a/src/lapack.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/lapack.mk Fri Dec 30 10:02:01 2022 +0100 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := lapack -$(PKG)_VERSION := 3.11 -$(PKG)_CHECKSUM := 883d67542a1e39c6baf6cd52bf174aeee37418b1 +$(PKG)_VERSION := 3.11.0 +$(PKG)_CHECKSUM := 5ce88a2b3df11d132b43442cab6a385f85a9f667 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/Reference-LAPACK/$(PKG)/archive/refs/tags/v$($(PKG)_VERSION).tar.gz diff -r 6090fc4102bb -r 6498b13b6de5 src/libmodbus.mk --- a/src/libmodbus.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/libmodbus.mk Fri Dec 30 10:02:01 2022 +0100 @@ -1,7 +1,7 @@ PKG := libmodbus $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1.8 -$(PKG)_CHECKSUM := 9c18293b78217338cdbf062d3c7c6eeef3bc6822 +$(PKG)_VERSION := 3.1.10 +$(PKG)_CHECKSUM := f6b7a004b840ac57821bd673d655c027ccd0ee24 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/stephane/$(PKG)/archive/refs/tags/v$($(PKG)_VERSION).tar.gz diff -r 6090fc4102bb -r 6498b13b6de5 src/librsb-1-setenv.patch --- a/src/librsb-1-setenv.patch Wed Nov 30 18:23:50 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ ---- librsb-1.3.0.1/rsb_test_matops.c.orig 2022-02-24 11:11:02.000000000 +0100 -+++ librsb-1.3.0.1/rsb_test_matops.c 2022-10-15 13:44:55.920772450 +0200 -@@ -1979,7 +1979,7 @@ - RSB_STDOUT("# Memory benchmark took %.3lfs\n",dt); - } - --#ifdef RSB_HAVE_UNISTD_H -+#ifdef RSB_HAVE_SETENV - { - /* special environmental variables set just for the sake of being saved in .rpr files */ - #ifdef RSB_CC -@@ -6536,7 +6536,7 @@ - RSB_STDOUT("# Memory benchmark took %.3lfs\n",dt); - } - --#ifdef RSB_HAVE_UNISTD_H -+#ifdef RSB_HAVE_SETENV - { - /* special environmental variables set just for the sake of being saved in .rpr files */ - #ifdef RSB_CC -@@ -10962,7 +10962,7 @@ - RSB_STDOUT("# Memory benchmark took %.3lfs\n",dt); - } - --#ifdef RSB_HAVE_UNISTD_H -+#ifdef RSB_HAVE_SETENV - { - /* special environmental variables set just for the sake of being saved in .rpr files */ - #ifdef RSB_CC - - --- librsb-1.3.0.1/rsbench.c.orig 2022-10-15 13:54:32.053382000 +0200 -+++ librsb-1.3.0.1/rsbench.c 2022-10-15 13:54:58.038005553 +0200 -@@ -479,7 +479,15 @@ - { - const rsb_char_t *name=ava, *value=esp+1; - *esp=RSB_NUL; -+ #ifdef RSB_HAVE_SETENV - setenv(name, value, /*overwrite*/1); -+ #else -+ rsb_char_t buf[1000]; -+ strcpy(buf, name); -+ strcat(buf, "="); -+ strcat(buf, value); -+ putenv(buf); -+ #endif - RSBENCH_STDOUT("# Calling setenv() with arguments %s and %s\n",name,value); - } - if( ava ) - diff -r 6090fc4102bb -r 6498b13b6de5 src/librsb-2-config.patch --- a/src/librsb-2-config.patch Wed Nov 30 18:23:50 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- librsb-1.3.0.1/librsb-config.in.orig 2022-04-28 19:17:05.000000000 +0200 -+++ librsb-1.3.0.1/librsb-config.in 2022-10-15 14:10:34.827545946 +0200 -@@ -16,7 +16,7 @@ - includedir="@includedir@/" - ldflags="@LDFLAGS@" - # Note: if using -lrsbpp explicitly and -stdc++ is there, optional -lasan needs to precede -stdc++ (in RSB_RSBPP_LIBS) --libs="-lrsb" -+libs="-lrsb -lz" - extra_libs="@LIBS@ @OPENMP_CFLAGS@ @LIBRSB_MKL_LIBS@ @RSB_RSBPP_LIBS@" - all_libs="-lrsb" - fclibs="@FCLIBS@" diff -r 6090fc4102bb -r 6498b13b6de5 src/librsb.mk --- a/src/librsb.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/librsb.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := librsb $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.0.1 -$(PKG)_CHECKSUM := c5781cfdd137a6d442318f9f5e7b9fd18c46d8c2 +$(PKG)_VERSION := 1.3.0.2 +$(PKG)_CHECKSUM := 61e23ad6258dba602fc3bcb3cdc4d1c1b24e220c $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$($(PKG)_FILE) @@ -25,6 +25,7 @@ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + FC=' ' \ --disable-c-examples \ --disable-fortran-examples \ --disable-sparse-blas-interface \ diff -r 6090fc4102bb -r 6498b13b6de5 src/libsndfile.mk --- a/src/libsndfile.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/libsndfile.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := libsndfile $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.0 -$(PKG)_CHECKSUM := dd98ff27fb66fbf1ab1e291bc8938449e90778a2 +$(PKG)_VERSION := 1.2.0 +$(PKG)_CHECKSUM := 48050964a229bc53cd3e6134caedce27802f75c7 $(PKG)_SUBDIR := libsndfile-$($(PKG)_VERSION) $(PKG)_FILE := libsndfile-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/$(PKG)/$(PKG)/archive/$($(PKG)_VERSION).tar.gz diff -r 6090fc4102bb -r 6498b13b6de5 src/llvm.mk --- a/src/llvm.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/llvm.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := llvm $(PKG)_IGNORE := -$(PKG)_VERSION := 15.0.5 -$(PKG)_CHECKSUM := 9958ed0bdf9709833d4beb13ae954cc0fa6d3161 +$(PKG)_VERSION := 15.0.6 +$(PKG)_CHECKSUM := 60e9a385dde9a10e6ef7009ce342a119d3432eef $(PKG)_SUBDIR := llvm-$($(PKG)_VERSION).src $(PKG)_FILE := llvm-$($(PKG)_VERSION).src.tar.xz $(PKG)_URL := https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(PKG)_VERSION)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/mesa-2-ucrt.patch --- a/src/mesa-2-ucrt.patch Wed Nov 30 18:23:50 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -From a3b60fc23f2968e2d22c8d46baf29d4cd90b0d5c Mon Sep 17 00:00:00 2001 -From: Jeremy Drake -Date: Sat, 16 Oct 2021 16:50:46 -0700 -Subject: [PATCH] mesa: fixes for UCRT. - ---- mesa-21.2.4/src/compiler/nir/nir.h.orig 2021-10-14 12:59:05.367845000 -0700 -+++ mesa-21.2.4/src/compiler/nir/nir.h 2021-10-16 15:55:09.881268400 -0700 -@@ -54,7 +54,7 @@ - - #include "nir_opcodes.h" - --#if defined(_WIN32) && !defined(snprintf) -+#if defined(_WIN32) && !defined(snprintf) && !defined(_UCRT) - #define snprintf _snprintf - #endif - diff -r 6090fc4102bb -r 6498b13b6de5 src/mesa.mk --- a/src/mesa.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/mesa.mk Fri Dec 30 10:02:01 2022 +0100 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := mesa -$(PKG)_VERSION := 22.2.4 -$(PKG)_CHECKSUM := b131bcdd82effbbdaacfff07097bf5f0444d490c +$(PKG)_VERSION := 22.3.1 +$(PKG)_CHECKSUM := 3c996af7e8f82f1afe19fc5769424769f79df9d3 $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-bash.mk --- a/src/msys2-bash.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-bash.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-bash $(PKG)_NAME := bash $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.016-2 -$(PKG)_x86_64_CS := 7d05731b613cb408f73eddbbdcf4cfa5d54f4b05 -$(PKG)_i686_CS := 9984791443bc8cd08952f0af972765d546565895 +$(PKG)_VERSION := 5.2.009-1 +$(PKG)_x86_64_CS := 4d973772dcc7729d833dd94c200ddf1dbd932431 +$(PKG)_i686_CS := 7f55519517cc3dc0a515f835295e491bf8cc1ba2 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-coreutils.mk --- a/src/msys2-coreutils.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-coreutils.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-coreutils $(PKG)_NAME := coreutils $(PKG)_IGNORE := -$(PKG)_VERSION := 8.32-4 -$(PKG)_x86_64_CS := f4e2e8ada6dc88ced30f9449e78a8609a36159c1 -$(PKG)_i686_CS := 0d63128ca9b5408878e017f1a60c18b0cde5e799 +$(PKG)_VERSION := 8.32-5 +$(PKG)_x86_64_CS := 65e44864b7a63e482f6f0f98aca8c3e3e2264ed4 +$(PKG)_i686_CS := 5e7e6c26f7ccc7725919151a96df70057f9e564b $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-diffutils.mk --- a/src/msys2-diffutils.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-diffutils.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-diffutils $(PKG)_NAME := diffutils $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8-3 -$(PKG)_x86_64_CS := a838ab6e638ab102dac647800c0f8f796c70c342 -$(PKG)_i686_CS := b486290b5f2a0d8d5dbe8273e7a8e25edad437a9 +$(PKG)_VERSION := 3.8-4 +$(PKG)_x86_64_CS := c7d5f892cd384fd869f37c6bcb30e4d5a64c74e2 +$(PKG)_i686_CS := c555497a2261c46f76341aac43f975a15878afbe $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-filesystem.mk --- a/src/msys2-filesystem.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-filesystem.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-filesystem $(PKG)_NAME := filesystem $(PKG)_IGNORE := -$(PKG)_VERSION := 2022.01-5 -$(PKG)_x86_64_CS := cc9accd0fc874e20a89864407def1d8e3f413c0d -$(PKG)_i686_CS := cee395689352e73f66223badb68e6620bec1dd03 +$(PKG)_VERSION := 2022.01-7 +$(PKG)_x86_64_CS := ba05df7bfb54ab4462a528af75cf42786c2c8c36 +$(PKG)_i686_CS := 2a6fe78a3dee017f6e88fa5fa40b09fd7192d3de $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := @@ -23,5 +23,8 @@ define $(PKG)_BUILD echo "# mount tmp to users profile temp dir" >> "$(1)/etc/fstab" echo "none /tmp usertemp binary,noacl,posix=0 0 0" >> "$(1)/etc/fstab" + if [ "$(MSYS2_ARCH)" = "i686" ]; then \ + $(SED) -i 's/$.*refresh-keys.*$/#\1/g' "$(1)/etc/post-install/07-pacman-key.post"; \ + fi $(MSYS2_PKG_BUILD) endef diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-gawk.mk --- a/src/msys2-gawk.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-gawk.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-gawk $(PKG)_NAME := gawk $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.1-1 -$(PKG)_x86_64_CS := 9d8d2b79f0e973e7f8990a7ddc5beddddde067b0 -$(PKG)_i686_CS := d9810b73eb5900c21b20a8a85890994dbc830cb0 +$(PKG)_VERSION := 5.2.1-2 +$(PKG)_x86_64_CS := e2c8368dbe81ef3310fc21ea633ab9ebaa9ce4c6 +$(PKG)_i686_CS := ddf93b0c81d17ab2065aa814517a6b27ddf7ae1a $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-glib2.mk --- a/src/msys2-glib2.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-glib2.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-glib2 $(PKG)_NAME := glib2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.72.2-2 -$(PKG)_x86_64_CS := c66ebcbfebd463673e1fd93d6169280dc9d9ba2d -$(PKG)_i686_CS := 2a91c3c1140dbe74919553a31715ad414c80f6b0 +$(PKG)_VERSION := 2.74.3-1 +$(PKG)_x86_64_CS := 150648859fff6eb3a1ce3fc9b1e98c106a6ec088 +$(PKG)_i686_CS := 5b33ba2e8c0e1790636a57f00a890ed257a2f1ee $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-info.mk --- a/src/msys2-info.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-info.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-info $(PKG)_NAME := info $(PKG)_IGNORE := -$(PKG)_VERSION := 6.8-5 -$(PKG)_x86_64_CS := 665f51b49945cb7847210eb0e8ee555509644d53 -$(PKG)_i686_CS := 81a6b1a96468dcf38868f6ee21a15b23ef6bb8f8 +$(PKG)_VERSION := 7.0.1-1 +$(PKG)_x86_64_CS := 21df6935d9561850247a4c8fd5fed5cf1b50bb6a +$(PKG)_i686_CS := a35e9ba10ad972c3601ed208238e1a516e38cc4e $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-keyring.mk --- a/src/msys2-keyring.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-keyring.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,11 +4,11 @@ PKG := msys2-keyring $(PKG)_NAME := msys2-keyring $(PKG)_IGNORE := -$(PKG)_x86_64_VER := 1~20220623-1 -$(PKG)_i686_VER := 1.20220623-1 +$(PKG)_x86_64_VER := 1~20221024-1 +$(PKG)_i686_VER := 1.20221024-1 $(PKG)_VERSION := $($(PKG)_$(MSYS2_ARCH)_VER) -$(PKG)_x86_64_CS := 96c32c8aa60e1803f74f83d033aea6e5d4f3de82 -$(PKG)_i686_CS := ffca6b2c7f57700c6037c30472bfdf68e273f5d7 +$(PKG)_x86_64_CS := c9639076cf72d63380d6ec3b78a24f3e2fa75bbb +$(PKG)_i686_CS := db6423464bdd227ebe6eae50796c1fdf46719b55 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libexpat.mk --- a/src/msys2-libexpat.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libexpat.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libexpat $(PKG)_NAME := libexpat $(PKG)_IGNORE := -$(PKG)_VERSION := 2.4.9-1 -$(PKG)_x86_64_CS := 958eaa3da2cd5a471de5fd3eb42ae37a8cd1dabe -$(PKG)_i686_CS := 54f126b0064aecb2b70918643a8029fc7170ce9d +$(PKG)_VERSION := 2.5.0-1 +$(PKG)_x86_64_CS := a179150b2a59748319257713dac3c47c7cd7a6f4 +$(PKG)_i686_CS := 4a97070ac77e345fffc9d16cc8548a6c5a87c11e $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libffi.mk --- a/src/msys2-libffi.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libffi.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libffi $(PKG)_NAME := libffi $(PKG)_IGNORE := -$(PKG)_VERSION := 3.4.3-1 -$(PKG)_x86_64_CS := 57ea39c4c7e7571b18e7db26edf94233f4ca6822 -$(PKG)_i686_CS := 7f4f62e24806c1dd373a9bdf3d3cfa6405ce0489 +$(PKG)_VERSION := 3.4.4-1 +$(PKG)_x86_64_CS := a96267bf04a1931d3ad857d6a4b8193d6d48a0a5 +$(PKG)_i686_CS := d8fdc8bcc6a41d09b055d093e833da1420e68d2e $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libgnutls.mk --- a/src/msys2-libgnutls.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libgnutls.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libgnutls $(PKG)_NAME := libgnutls $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.8-1 -$(PKG)_x86_64_CS := 29f8073ef0dda53db98377cf0da9cda85cb21d60 -$(PKG)_i686_CS := 6aa1155504092f9161a4e74199064cc13a8bc9d0 +$(PKG)_VERSION := 3.7.8-2 +$(PKG)_x86_64_CS := 11853ea131397655be879a5520c94eb144bd1b71 +$(PKG)_i686_CS := 8f6d375c6c199602d0434f08e04a842cd13b30e9 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libidn2.mk --- a/src/msys2-libidn2.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libidn2.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libidn2 $(PKG)_NAME := libidn2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.3-1 -$(PKG)_x86_64_CS := 1e2f727c485c6121cbae2c1e56c804d6bd5185de -$(PKG)_i686_CS := ecf8e6a917683102205dfa15fbb6cb043d88ffbf +$(PKG)_VERSION := 2.3.4-2 +$(PKG)_x86_64_CS := b83eb06c16cfdbcfeae79b1b88f6bf80f541cd92 +$(PKG)_i686_CS := 030d0d6e851d2309bf5ee65b3dc3ae2eed0a3e6b $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-liblzma.mk --- a/src/msys2-liblzma.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-liblzma.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-liblzma $(PKG)_NAME := liblzma $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.7-1 -$(PKG)_x86_64_CS := 8d02c5d7a6c648eb18efeb3d79c55dca05d8aba0 -$(PKG)_i686_CS := 87de0261dbc8a5e01daea9c9931a8598a4b88cca +$(PKG)_VERSION := 5.4.0-1 +$(PKG)_x86_64_CS := 1f14b210d63a0934c8cec8f8f678715887550be7 +$(PKG)_i686_CS := c2e689e7a738498c7bed207e592ce354d770c22c $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libopenssl.mk --- a/src/msys2-libopenssl.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libopenssl.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libopenssl $(PKG)_NAME := libopenssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.q-1 -$(PKG)_x86_64_CS := 48415d1b2bc6c0d63133cacad2330eacc94713bf -$(PKG)_i686_CS := afae58394063366fd31f45a93c7b79f4c5ae9bb2 +$(PKG)_VERSION := 1.1.1.s-2 +$(PKG)_x86_64_CS := f65467b26d1048ca8c297919f90ef6525d9776e7 +$(PKG)_i686_CS := a71ff10072c6b4545c808799f4ce93ecda51bcd7 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libpcre.mk --- a/src/msys2-libpcre.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libpcre.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libpcre $(PKG)_NAME := libpcre $(PKG)_IGNORE := -$(PKG)_VERSION := 8.45-1 -$(PKG)_x86_64_CS := 5480625cfe7b8631b729013483652d47ef90ae0a -$(PKG)_i686_CS := 32c476fd099fb5c0ec79ae5fc3494c9e2cb5b9f7 +$(PKG)_VERSION := 8.45-3 +$(PKG)_x86_64_CS := a959727252343ab046f25b3783118343c5f9866a +$(PKG)_i686_CS := 7fe940169f5ae4fb8471d2c1a3a3b97c9506833f $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libpcre2.mk --- a/src/msys2-libpcre2.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libpcre2.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libpcre2 $(PKG)_NAME := libpcre2_8 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.40-1 -$(PKG)_x86_64_CS := ae96bfd39c53823dc06e3f3f58c8ce3e1acf31a2 -$(PKG)_i686_CS := 6ff74c1bb5f5450e8b54c8b111b625d29a458027 +$(PKG)_VERSION := 10.42-1 +$(PKG)_x86_64_CS := e1d8fef76e5b544093072ec85c781e5f365a52cc +$(PKG)_i686_CS := 82e3357441e4ba611b8b48760cf71fe8e9aaf400 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libpsl.mk --- a/src/msys2-libpsl.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libpsl.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libpsl $(PKG)_NAME := libpsl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.1-4 -$(PKG)_x86_64_CS := 9633ad8fa867138f060e8726493ac3770baa51aa -$(PKG)_i686_CS := 627325e67835d0c5ff7643ea7dcf3a79a807006d +$(PKG)_VERSION := 0.21.1-5 +$(PKG)_x86_64_CS := a26c71e38c3a2af3b59d3967fb4e8dd8b080eef7 +$(PKG)_i686_CS := 163f937bf58ca343162a9366d2f689f762535ca8 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libreadline.mk --- a/src/msys2-libreadline.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libreadline.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libreadline $(PKG)_NAME := libreadline $(PKG)_IGNORE := -$(PKG)_VERSION := 8.1.002-2 -$(PKG)_x86_64_CS := 5a29a9c5606122c2d2616e17b13e2162ab06ab20 -$(PKG)_i686_CS := 9d19610f8f4b142100a86034799315ccdb9d8a70 +$(PKG)_VERSION := 8.2.001-1 +$(PKG)_x86_64_CS := 8f0ec3c44cc868bb93a6c00a6385a5bcaf7acdd7 +$(PKG)_i686_CS := e3ad908ad961e55e00baf07a4d20dfe0e34d17b8 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libsqlite.mk --- a/src/msys2-libsqlite.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libsqlite.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libsqlite $(PKG)_NAME := libsqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3.39.4-1 -$(PKG)_x86_64_CS := 09568bab88be9bc4cc65a75404d0cb0dfa2c4448 -$(PKG)_i686_CS := ce90b4f46ccc95d3dd9f878385ce948eb86d0686 +$(PKG)_VERSION := 3.40.0-1 +$(PKG)_x86_64_CS := da9b8397ea4a5c8aae2f0e93da1553bcf3e4d7eb +$(PKG)_i686_CS := be2ab1117143b4f903343b795b39bce2f4d8411f $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libunistring.mk --- a/src/msys2-libunistring.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libunistring.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libunistring $(PKG)_NAME := libunistring $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0-1 -$(PKG)_x86_64_CS := 3d623163cd8059f3d339f2fafa7c3bf709f71def -$(PKG)_i686_CS := 28303c1f605d4f53a6707dc424b995738814b542 +$(PKG)_VERSION := 1.1-2 +$(PKG)_x86_64_CS := 750d6841c79630421a773d47d0d730eea4ad4ab4 +$(PKG)_i686_CS := b96427e9edde5e7057e515816f590a6f1b318e1b $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libutil-linux.mk --- a/src/msys2-libutil-linux.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libutil-linux.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libutil-linux $(PKG)_NAME := libutil-linux $(PKG)_IGNORE := -$(PKG)_VERSION := 2.35.2-1 -$(PKG)_x86_64_CS := a954a605386c24309f251c64a8d4e5d490355350 -$(PKG)_i686_CS := 199ffb8d40f76f89e33bb0f04d4323f6db982b5f +$(PKG)_VERSION := 2.35.2-3 +$(PKG)_x86_64_CS := e06ae1176e28f1675c441def8c437075aa082f80 +$(PKG)_i686_CS := bc0df067583d2afa5cd10d9b1c7a364b133b4222 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-libxml2.mk --- a/src/msys2-libxml2.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-libxml2.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libxml2 $(PKG)_NAME := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.10.2-1 -$(PKG)_x86_64_CS := f5f66db1b88743c58592a71723b34c45784b8152 -$(PKG)_i686_CS := 1a489698701b62ac01ff9221ee6a700a5b4a85c9 +$(PKG)_VERSION := 2.10.3-2 +$(PKG)_x86_64_CS := 1f5b4f74dcf4461762a1aada5befc6c904dd15cb +$(PKG)_i686_CS := 879d302bd87f719263da7ccdf01f77ad109ced7e $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-make.mk --- a/src/msys2-make.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-make.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-make $(PKG)_NAME := make $(PKG)_IGNORE := -$(PKG)_VERSION := 4.3-3 -$(PKG)_x86_64_CS := 9ce15a2a5443a33cf30869e7fb226ec4c60a9f93 -$(PKG)_i686_CS := 9bd1457265153f9a4d3cae1dcbb614e34007d6b3 +$(PKG)_VERSION := 4.4-1 +$(PKG)_x86_64_CS := 7a7e014f83c61c11910bd20e5e10f4b497fb3c92 +$(PKG)_i686_CS := b4bba2081716ea9ba5ddf55af1d93d6e5c65d359 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-mintty.mk --- a/src/msys2-mintty.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-mintty.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,12 +4,12 @@ PKG := msys2-mintty $(PKG)_NAME := mintty $(PKG)_IGNORE := -$(PKG)_x86_64_VER := 1~3.6.1-2 -$(PKG)_i686_VER := 1.3.6.1-2 +$(PKG)_x86_64_VER := 1~3.6.3-1 +$(PKG)_i686_VER := 1.3.6.3-1 $(PKG)_VERSION := $($(PKG)_$(MSYS2_ARCH)_VER) $(PKG)_FILTER := mintty-1~ -$(PKG)_x86_64_CS := 541340c39d997077f24ad9a434a8b7e1c3f66954 -$(PKG)_i686_CS := 6312bab7cf1557962c31c7901d819a52ee234bc2 +$(PKG)_x86_64_CS := b13bd644ad9992c802cc8cf19089597c5aeff02b +$(PKG)_i686_CS := 08869948ceae925cb7b5256bad4b806fdfc9f016 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-mpfr.mk --- a/src/msys2-mpfr.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-mpfr.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-mpfr $(PKG)_NAME := mpfr $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.0.p13-1 -$(PKG)_x86_64_CS := 64a6891cb7618842011fe64b6d353555135b3e77 -$(PKG)_i686_CS := f070aa6cd3aa99332dfabe8b1e078c32ce045b65 +$(PKG)_VERSION := 4.1.1.p1-1 +$(PKG)_x86_64_CS := a73f3a28b826c1297e681bf3ebc55f420aaba607 +$(PKG)_i686_CS := d9f8d7f367701fd2a02a43705c89327c521de379 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-openssl.mk --- a/src/msys2-openssl.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-openssl.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-openssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.q-1 -$(PKG)_x86_64_CS := 73a39c0086f1a8d499fa7586cd475fa83463ed16 -$(PKG)_i686_CS := da9323940b133dbae4be6a7c76ab6bb3d78a3038 +$(PKG)_VERSION := 1.1.1.s-2 +$(PKG)_x86_64_CS := b83eed9ebfcfa3fddda41de8273576fe1960d060 +$(PKG)_i686_CS := c13867605858f7b47fcf51ccc2722a8dcd8f5ded $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-pacman-mirrors.mk --- a/src/msys2-pacman-mirrors.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-pacman-mirrors.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,10 +4,10 @@ PKG := msys2-pacman-mirrors $(PKG)_NAME := pacman-mirrors $(PKG)_IGNORE := -$(PKG)_VERSION := 20220205-1 +$(PKG)_VERSION := 20221016-1 # the mirror package is NOT the same for both systems, but same name -$(PKG)_i686_CS := 5ed50ba2fb33df2405158b5d4d99f6e6a0a0de31 -$(PKG)_x86_64_CS := db715368ce0652892fa06649229198105e89af27 +$(PKG)_i686_CS := 15d6fea6b64c12e249e2c1d6a0272c446a16f03a +$(PKG)_x86_64_CS := 198fd2a194655e81a1c50e8d11a611f58376f9c2 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-pacman.mk --- a/src/msys2-pacman.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-pacman.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-pacman $(PKG)_NAME := pacman $(PKG)_IGNORE := -$(PKG)_VERSION := 6.0.1-18 -$(PKG)_x86_64_CS := 019c7e50f0af09a3bf043953baea4d2d2792a410 -$(PKG)_i686_CS := 66bfb5a61d72491da89329ca1edf234e4d08887d +$(PKG)_VERSION := 6.0.1-25 +$(PKG)_x86_64_CS := 42c624c1b541ebc43a5b095e22c0e48c961428c3 +$(PKG)_i686_CS := dc2dccb28c40a8e712728af7c46e79d793cebd5e $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := @@ -21,5 +21,8 @@ endef define $(PKG)_BUILD + if [ "$(MSYS2_ARCH)" = "i686" ]; then \ + $(SED) -i '/^\[msys\]/i \[build32\]\nServer = $(MSYS2_URL)\nSigLevel = Optional\n' "$(1)/etc/pacman.conf"; \ + fi $(MSYS2_PKG_BUILD) endef diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-patch.mk --- a/src/msys2-patch.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-patch.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,13 +4,13 @@ PKG := msys2-patch $(PKG)_NAME := patch $(PKG)_IGNORE := -$(PKG)_VERSION := 2.7.6-1 -$(PKG)_x86_64_CS := 6429c36b3116948d5268df98cbab6fce8b3dca99 -$(PKG)_i686_CS := 0da1fac9e66d5582f028aa50eb675d33eb5e0ba4 +$(PKG)_VERSION := 2.7.6-2 +$(PKG)_x86_64_CS := af2eb7ab494c99d3fda65a7abee281bd17d843a1 +$(PKG)_i686_CS := c749f589e4526296d7f9ff7e27a609f2f22faff1 $(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),) diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-perl.mk --- a/src/msys2-perl.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-perl.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-perl $(PKG)_NAME := perl $(PKG)_IGNORE := -$(PKG)_VERSION := 5.32.1-2 -$(PKG)_x86_64_CS := f66cf270e04f723c6cfa45071217a3e6ba6482e0 -$(PKG)_i686_CS := 6155b94aafaa85439669953d996dbfba1df4d5cd +$(PKG)_VERSION := 5.36.0-1 +$(PKG)_x86_64_CS := 0e27cbb79a06e00c5f09e384e8456df36de53b89 +$(PKG)_i686_CS := ea5d431936f9cdc3215ac530af3752358df0354c $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-python.mk --- a/src/msys2-python.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-python.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-python $(PKG)_NAME := python $(PKG)_IGNORE := -$(PKG)_VERSION := 3.10.6-1 -$(PKG)_x86_64_CS := 3ac7b040a22755c2c6ad9373d10a5488b752413e -$(PKG)_i686_CS := 08f9c0baabb12a8275129d946732d798c57e509f +$(PKG)_VERSION := 3.10.9-1 +$(PKG)_x86_64_CS := 269c9a7ebce56521f7b1f1ced308506adab6bed5 +$(PKG)_i686_CS := d87fecc12e7b61191a14a6efe81ed72936e94bc6 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-runtime.mk --- a/src/msys2-runtime.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-runtime.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-runtime $(PKG)_NAME := msys2-runtime $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.6-2 -$(PKG)_x86_64_CS := bb002d7ad12373b09cde0d619cc2b65b15075fc4 -$(PKG)_i686_CS := 8ce69a118fe6028ae3a39cebba69598a9681575a +$(PKG)_VERSION := 3.3.6-6 +$(PKG)_x86_64_CS := a0f810b6ef25ed10f72e91af989aebbfb8d7f089 +$(PKG)_i686_CS := 08e966d6645268a39d0c8ddb6c5549eead34afcd $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-sed.mk --- a/src/msys2-sed.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-sed.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-sed $(PKG)_NAME := sed $(PKG)_IGNORE := -$(PKG)_VERSION := 4.8-3 -$(PKG)_x86_64_CS := 77f52e17cb0c85589b2ec42d3c4a0cafaaa20d88 -$(PKG)_i686_CS := b5411db4f00c77af8b40facf70248e69b511aa76 +$(PKG)_VERSION := 4.9-1 +$(PKG)_x86_64_CS := c44320fa2ed0d5eca5f0a2b5c9b543efbcf6d8e9 +$(PKG)_i686_CS := 8fc94e617f89cb915f7a176019247a36dd53b10a $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-wget.mk --- a/src/msys2-wget.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-wget.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-wget $(PKG)_NAME := wget $(PKG)_IGNORE := -$(PKG)_VERSION := 1.21.3-1 -$(PKG)_x86_64_CS := a0212a39dc95ef3c70f07a15f331234fc3de578b -$(PKG)_i686_CS := a3b882a64527e0f8c07b59db18c08def751b4e32 +$(PKG)_VERSION := 1.21.3-2 +$(PKG)_x86_64_CS := fe4bbfe505407ae96b7fe80f1d5a777bba8e3d4e +$(PKG)_i686_CS := e525a541b0d41ac38a55400b21f878a021e1275e $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/msys2-zlib.mk --- a/src/msys2-zlib.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/msys2-zlib.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := msys2-zlib $(PKG)_NAME := zlib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.12-2 -$(PKG)_x86_64_CS := a74d3f5f32127a29c9c1623eb9b5c2c3d3c8f330 -$(PKG)_i686_CS := 1a40b6cba69b3d52085a4dce5bb17d0707ca8979 +$(PKG)_VERSION := 1.2.13-1 +$(PKG)_x86_64_CS := 0928ccf489476ab2d5118f068eb81e563856ea8a +$(PKG)_i686_CS := 3bbb51d12d4df57818ed09400b1d9fdc807ca64c $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6090fc4102bb -r 6498b13b6de5 src/npp.mk --- a/src/npp.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/npp.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := npp $(PKG)_IGNORE := -$(PKG)_VERSION := 8.4.7 -$(PKG)_CHECKSUM := bf6f9950591d95233598d8c1ff11e25225ed0b2f +$(PKG)_VERSION := 8.4.8 +$(PKG)_CHECKSUM := 9faf275fc941dff4223b75a7d960b697f922c3bd $(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) diff -r 6090fc4102bb -r 6498b13b6de5 src/of-statistics-fixes.patch --- a/src/of-statistics-fixes.patch Wed Nov 30 18:23:50 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -diff --git a/PKG_ADD b/inst/PKG_ADD -similarity index 88% -rename from PKG_ADD -rename to inst/PKG_ADD -index 937bc41..fc0ce78 100644 ---- a/PKG_ADD -+++ b/inst/PKG_ADD -@@ -8,7 +8,7 @@ d_2seRTE546_oyi_795jg09_dirname = fileparts (canonicalize_file_name ... - (mfilename ("fullpath"))); - - for iiII123DRT_idx = 1:length (a1_e324kporit985_itogj3_dirlist) -- addpath (fullfile (d_2seRTE546_oyi_795jg09_dirname, "..", ... -+ addpath (fullfile (d_2seRTE546_oyi_795jg09_dirname, ... - a1_e324kporit985_itogj3_dirlist{iiII123DRT_idx})); - endfor - -diff --git a/PKG_DEL b/inst/PKG_DEL -similarity index 90% -rename from PKG_DEL -rename to inst/PKG_DEL -index 095f782..dd619e6 100644 ---- a/PKG_DEL -+++ b/inst/PKG_DEL -@@ -10,7 +10,7 @@ d_2seRTE546_oyi_795jg09_dirname = fileparts (canonicalize_file_name ... - (mfilename ("fullpath"))); - - for iiII123DRT_idx = 1:length (a1_e324kporit985_itogj3_dirlist) -- rmpath (fullfile (d_2seRTE546_oyi_795jg09_dirname, "..", ... -+ rmpath (fullfile (d_2seRTE546_oyi_795jg09_dirname, ... - a1_e324kporit985_itogj3_dirlist{iiII123DRT_idx})); - endfor - diff -r 6090fc4102bb -r 6498b13b6de5 src/of-statistics.mk --- a/src/of-statistics.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/of-statistics.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := of-statistics $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.0 -$(PKG)_CHECKSUM := 45157ebc92edeb48913b7d7540a4b9d7cc192c6d +$(PKG)_VERSION := 1.5.2 +$(PKG)_CHECKSUM := f4f27430c79140f7c13b3c230c92a1ba6802f0c5 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := statistics-release-$($(PKG)_VERSION) $(PKG)_FILE := statistics-$($(PKG)_VERSION).tar.gz diff -r 6090fc4102bb -r 6498b13b6de5 src/opengl_switch.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opengl_switch.mk Fri Dec 30 10:02:01 2022 +0100 @@ -0,0 +1,59 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := opengl_switch +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.0.0 +$(PKG)_CHECKSUM := d3957e6f34f156e2c17498fbcc8dd6ddc8c1c9c7 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/lostbard/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz + + +ifeq ($(ENABLE_QT5),yes) + $(PKG)_DEPS := qt5 +else + $(PKG)_DEPS := qt +endif + +ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) + $(PKG)_INSTALL_ROOT := +else + $(PKG)_INSTALL_ROOT := $(3) +endif + +define $(PKG)_UPDATE + $(call GITHUB_PKG_UPDATE,lostbard,opengl_switch,v) +endef + +ifneq ($(MXE_NATIVE_BUILD),yes) + ifeq ($(MXE_SYSTEM),mingw) + ifeq ($(ENABLE_QT5),yes) + $(PKG)_QMAKE_SPEC_OPTION := -spec '$(BUILD_TOOLS_PREFIX)/mkspecs/win32-g++' + else + $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++' + endif + endif + ifeq ($(MXE_SYSTEM),msvc) + # FIXME: compute "2010" suffix dynamically + $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_LIBDIR)/qt4/mkspecs/win32-msvc2010' + endif +endif + +define $(PKG)_BUILD + cd '$(1)' && \ + '$(MXE_QMAKE)' -makefile \ + $($(PKG)_QMAKE_SPEC_OPTION) \ + QMAKE_UIC='$(MXE_UIC)' \ + QMAKE_MOC='$(MXE_MOC)' \ + QMAKE_LFLAGS=$(MXE_LDFLAGS) \ + QMAKE_CXXFLAGS='-std=c++11' + + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)' + + if [ $(MXE_WINDOWS_BUILD) = yes ]; then \ + $(INSTALL) -d '$(HOST_BINDIR)'; \ + mv '$(HOST_PREFIX)/qt5/bin/opengl_switch.exe' '$(HOST_BINDIR)/opengl_switch.exe'; \ + fi +endef diff -r 6090fc4102bb -r 6498b13b6de5 src/paho-mqtt-c.mk --- a/src/paho-mqtt-c.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/paho-mqtt-c.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := paho-mqtt-c $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.11 -$(PKG)_CHECKSUM := dde58a64eb4fbd19745a5b8adba2fa3f85ecff23 +$(PKG)_VERSION := 1.3.12 +$(PKG)_CHECKSUM := 34dc18d5df21d816276875da2fde314569865e14 $(PKG)_SUBDIR := paho.mqtt.c-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v$($(PKG)_VERSION).tar.gz diff -r 6090fc4102bb -r 6498b13b6de5 src/pcre2.mk --- a/src/pcre2.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/pcre2.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := pcre2 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.40 -$(PKG)_CHECKSUM := 5a433f92b29083d0d8ccd4ec56e3afbe1fa09863 +$(PKG)_VERSION := 10.42 +$(PKG)_CHECKSUM := 9876f2165ed6ee38d1853a8e2eaafdfbcb291b76 $(PKG)_SUBDIR := pcre2-$($(PKG)_VERSION) $(PKG)_FILE := pcre2-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://github.com/PCRE2Project/$(PKG)/releases/download/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/readline-2-event-hook.patch --- a/src/readline-2-event-hook.patch Wed Nov 30 18:23:50 2022 +0100 +++ b/src/readline-2-event-hook.patch Fri Dec 30 10:02:01 2022 +0100 @@ -1,20 +1,35 @@ diff -urN readline-8.2/input.c.orig readline-8.2/input.c --- readline-8.2/input.c.orig 2022-04-08 21:43:24.000000000 +0200 -+++ readline-8.2/input.c 2022-11-22 16:54:55.099070500 +0100 -@@ -176,6 +176,12 @@ ++++ readline-8.2/input.c 2022-12-12 09:58:00.410673600 +0100 +@@ -176,6 +176,14 @@ static unsigned char ibuffer[512]; static int ibuffer_len = sizeof (ibuffer) - 1; +#if defined (__MINGW32__) +#include -+static int _win32_getch (int *const is_char); ++static int _win32_getch (void); +static int _win32_kbhit (void); ++static char _win32_buf[16] = {'0'}; ++static int _win32_bufidx = 0; +#endif + #define any_typein (push_index != pop_index) int -@@ -306,7 +311,7 @@ +@@ -187,7 +195,11 @@ + int + _rl_pushed_input_available (void) + { +- return (push_index != pop_index); ++ return ((push_index != pop_index) ++#if defined (__MINGW32__) ++ || (_win32_bufidx > 0) ++#endif ++ ); + } + + /* Return the amount of space available in the buffer for stuffing +@@ -306,7 +318,7 @@ #if defined (__MINGW32__) /* Use getch/_kbhit to check for available console input, in the same way that we read it normally. */ @@ -23,7 +38,7 @@ result = 0; #endif -@@ -404,7 +409,7 @@ +@@ -404,7 +416,7 @@ #if defined (__MINGW32__) if (isatty (tty)) @@ -32,22 +47,19 @@ #endif return 0; -@@ -799,6 +804,139 @@ +@@ -799,6 +811,139 @@ 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, int *const is_char) ++_win32_getch_internal (int block) +{ + INPUT_RECORD rec; + DWORD evRead, waitResult; + HANDLE hInput = (HANDLE) _get_osfhandle (fileno (rl_instream)); -+ *is_char = 1; + + if (_win32_bufidx > 0) + return _win32_buf[--_win32_bufidx]; @@ -56,17 +68,15 @@ + + do + { -+ *is_char = 0; + if (! block) + { + if (WaitForSingleObject (hInput, _keyboard_input_timeout/1000) != WAIT_OBJECT_0) + return _WIN32_READ_NOCHAR; + } + -+ if (!ReadConsoleInputW (hInput, &rec, 1, &evRead) || evRead != 1) ++ if (! ReadConsoleInputW (hInput, &rec, 1, &evRead) || evRead != 1) + return EOF; + -+ *is_char = 1; + switch (rec.EventType) + { + case KEY_EVENT: @@ -78,33 +88,63 @@ + rec.Event.KeyEvent.uChar.UnicodeChar)) + { + if (rec.Event.KeyEvent.uChar.UnicodeChar) -+ return (int) rec.Event.KeyEvent.uChar.UnicodeChar; ++ { ++ int result = (int) rec.Event.KeyEvent.uChar.UnicodeChar; ++ char charbuf[5] = {0}; ++ wchar_t unicode[2] = {result, 0}; ++ int utf16_code_units = 1; ++ if ((unicode[0] & 0xF800) == 0xD800) /* outside BMP */ ++ { ++ ReadConsoleInputW (hInput, &rec, 1, &evRead); ++ unicode[1] = (int) rec.Event.KeyEvent.uChar.UnicodeChar; ++ utf16_code_units++; ++ } ++ /* convert to current codepage or UTF-8 byte sequence */ ++ unsigned int codepage = CP_THREAD_ACP; ++ if (_rl_utf8locale) ++ codepage = CP_UTF8; ++ int len = WideCharToMultiByte (codepage, 0, ++ (wchar_t *) &unicode, utf16_code_units, ++ charbuf, 5, NULL, NULL); ++ /* buffer is read from back to front */ ++ for (int i=0; i + ++#if defined (_WIN32) ++# include ++# include ++#endif ++ + #include "rldefs.h" + #include "readline.h" + #include "rlshell.h" +@@ -109,7 +114,11 @@ + char *cp; + size_t len; + +-#if HAVE_LANGINFO_CODESET ++#if defined (_WIN32) ++ /* On Windows, the relevant "locale" is the selected codepage of the used ++ console. */ ++ return (IsWindows7OrGreater () && (GetConsoleCP () == 65001)); ++#elif HAVE_LANGINFO_CODESET + cp = nl_langinfo (CODESET); + return (STREQ (cp, "UTF-8") || STREQ (cp, "utf8")); + #else +@@ -138,11 +147,18 @@ + #if defined (HAVE_SETLOCALE) + if (lspec == 0 || *lspec == 0) + lspec = setlocale (LC_CTYPE, (char *)NULL); ++#if defined (_WIN32) ++ /* Setting an UTF-8 locale is not a no-op on Windows. Instead the ++ information about the locale is lost. Use whatever we got at this ++ point. */ ++ ret = lspec; ++#else + if (lspec == 0) + lspec = ""; + ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ + if (ret == 0 || *ret == 0) + ret = setlocale (LC_CTYPE, (char *)NULL); ++#endif + if (ret == 0 || *ret == 0) + ret = RL_DEFAULT_LOCALE; + #else diff -r 6090fc4102bb -r 6498b13b6de5 src/sdl2.mk --- a/src/sdl2.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/sdl2.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := sdl2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.26.0 -$(PKG)_CHECKSUM := 788380a96075119a2ab1e5b53f2fee74fa957fa2 +$(PKG)_VERSION := 2.26.1 +$(PKG)_CHECKSUM := 08a8cec21ffcebf44e4633a786d594a7811100d2 $(PKG)_SUBDIR := SDL2-$($(PKG)_VERSION) $(PKG)_FILE := SDL2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libsdl.org/release/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-bash.mk --- a/src/src-msys2-bash.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-bash.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-bash $(PKG)_NAME := bash $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.016-2 -$(PKG)_CHECKSUM := 76c3ebc9a9ba53dcc2bf586f4f3d920a0471839a +$(PKG)_VERSION := 5.2.009-1 +$(PKG)_CHECKSUM := ddc98b4ec3073bd895f1c7882f0984f661d69348 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-coreutils.mk --- a/src/src-msys2-coreutils.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-coreutils.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-coreutils $(PKG)_NAME := coreutils $(PKG)_IGNORE := -$(PKG)_VERSION := 8.32-4 -$(PKG)_CHECKSUM := f8949c8d0f80c0563d871adb6c80fc9e227f7f3f +$(PKG)_VERSION := 8.32-5 +$(PKG)_CHECKSUM := 71e71aa6a0b934e36b0d0b86bcabae754ecaa9f2 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-diffutils.mk --- a/src/src-msys2-diffutils.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-diffutils.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-diffutils $(PKG)_NAME := diffutils $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8-3 -$(PKG)_CHECKSUM := 38705779fad8045181abe63ab53c47bee838fdae +$(PKG)_VERSION := 3.8-4 +$(PKG)_CHECKSUM := 178afff8e1b53dcfc9cb844d797cce671ba47319 $(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 := diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-filesystem.mk --- a/src/src-msys2-filesystem.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-filesystem.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-filesystem $(PKG)_NAME := filesystem $(PKG)_IGNORE := -$(PKG)_VERSION := 2022.01-5 -$(PKG)_CHECKSUM := e1e1956fd7543f097a116d113617a5e63fbd9b07 +$(PKG)_VERSION := 2022.01-7 +$(PKG)_CHECKSUM := 0ec7a7227e5e258c5268820cef07818fc5baf8d9 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-gawk.mk --- a/src/src-msys2-gawk.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-gawk.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-gawk $(PKG)_NAME := gawk $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.1-1 -$(PKG)_CHECKSUM := c6731e5c6047f7eabe927dc0d5a5af3f61d17ab2 +$(PKG)_VERSION := 5.2.1-2 +$(PKG)_CHECKSUM := e7093cca4ba20036c329d1ac9f6b2cd09a18c1a9 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-glib2.mk --- a/src/src-msys2-glib2.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-glib2.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-glib2 $(PKG)_NAME := glib2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.72.2-2 -$(PKG)_CHECKSUM := bfc7bb69bffd7c1de6acb6cffff37b512528195b +$(PKG)_VERSION := 2.74.3-1 +$(PKG)_CHECKSUM := 5b979868ce67f20bdac678158f264f93e1180d3c $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-info.mk --- a/src/src-msys2-info.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-info.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-info $(PKG)_NAME := texinfo $(PKG)_IGNORE := -$(PKG)_VERSION := 6.8-5 -$(PKG)_CHECKSUM := 545ee76c414454b8b175d21b68344dc1c005b043 +$(PKG)_VERSION := 7.0.1-1 +$(PKG)_CHECKSUM := 32d0c598b91257fbc70227a8b67d4bf330110231 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-keyring.mk --- a/src/src-msys2-keyring.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-keyring.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-keyring $(PKG)_NAME := msys2-keyring $(PKG)_IGNORE := -$(PKG)_VERSION := 1~20220623-1 -$(PKG)_CHECKSUM := f53e22863ec84b082105606973417780dab6eff3 +$(PKG)_VERSION := 1~20221024-1 +$(PKG)_CHECKSUM := a6ea41ae7aff8c41b43673c612dc893442736120 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libexpat.mk --- a/src/src-msys2-libexpat.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libexpat.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libexpat $(PKG)_NAME := expat $(PKG)_IGNORE := -$(PKG)_VERSION := 2.4.9-1 -$(PKG)_CHECKSUM := 8e25d121d24584538c24fc24879350128bcc0575 +$(PKG)_VERSION := 2.5.0-1 +$(PKG)_CHECKSUM := 1370693ae83fb11a1b8d7f73bd13d1fe840801e2 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libffi.mk --- a/src/src-msys2-libffi.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libffi.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libffi $(PKG)_NAME := libffi $(PKG)_IGNORE := -$(PKG)_VERSION := 3.4.3-1 -$(PKG)_CHECKSUM := 16c37eccbf5e8da048de6f7d18d444144d0b1a7a +$(PKG)_VERSION := 3.4.4-1 +$(PKG)_CHECKSUM := d76c0b37ccafde0ba2be6307cdc55173e6e2105f $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libgnutls.mk --- a/src/src-msys2-libgnutls.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libgnutls.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libgnutls $(PKG)_NAME := gnutls $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.8-1 -$(PKG)_CHECKSUM := a2562743015fec3210d0bbffdb29ce6ca640a00a +$(PKG)_VERSION := 3.7.8-2 +$(PKG)_CHECKSUM := cc647c48a61db5fb030ee8fc53684a822137f221 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libidn2.mk --- a/src/src-msys2-libidn2.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libidn2.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libidn2 $(PKG)_NAME := libidn2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.3-1 -$(PKG)_CHECKSUM := ac0333f3c40aeec691ccbf09ae35742bd7ecf3a0 +$(PKG)_VERSION := 2.3.4-2 +$(PKG)_CHECKSUM := 0d46047937cf4dea7aee0a7eccc5bf4182158b01 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-liblzma.mk --- a/src/src-msys2-liblzma.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-liblzma.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-liblzma $(PKG)_NAME := xz $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.7-1 -$(PKG)_CHECKSUM := e511805580e9a6ab42055e0e594088fdc3ce9a08 +$(PKG)_VERSION := 5.4.0-1 +$(PKG)_CHECKSUM := 4ff47b25f88f6540cd55fc9d52daa2bfb6941d41 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libopenssl.mk --- a/src/src-msys2-libopenssl.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libopenssl.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libopenssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.q-1 -$(PKG)_CHECKSUM := 46614def624db74ad8b3713a969bf836209fea90 +$(PKG)_VERSION := 1.1.1.s-2 +$(PKG)_CHECKSUM := 355f36ac5741887a66ec3d2ce2d15ef6a23024b4 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libpcre.mk --- a/src/src-msys2-libpcre.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libpcre.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libpcre $(PKG)_NAME := pcre $(PKG)_IGNORE := -$(PKG)_VERSION := 8.45-1 -$(PKG)_CHECKSUM := 7ecb3c6b4b2e57a5d112d4ed5955c4059f45b328 +$(PKG)_VERSION := 8.45-3 +$(PKG)_CHECKSUM := a51c3ab0780515ed42078db69e8e5cecbec71710 $(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 := diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libpcre2.mk --- a/src/src-msys2-libpcre2.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libpcre2.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libpcre2 $(PKG)_NAME := pcre2 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.40-1 -$(PKG)_CHECKSUM := 943d6387a67d27a1e75e55571e0f6cf74294c011 +$(PKG)_VERSION := 10.42-1 +$(PKG)_CHECKSUM := 995d9864321b4efc71cf486c06591a217474550b $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libpsl.mk --- a/src/src-msys2-libpsl.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libpsl.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libpsl $(PKG)_NAME := libpsl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.1-4 -$(PKG)_CHECKSUM := f31b9076e4bb77b3be98fba3d0cf43aa43e5ee41 +$(PKG)_VERSION := 0.21.1-5 +$(PKG)_CHECKSUM := 429a15c89843c4415f10f25e5fcc43e5e8223fe4 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libreadline.mk --- a/src/src-msys2-libreadline.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libreadline.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libreadline $(PKG)_NAME := readline $(PKG)_IGNORE := -$(PKG)_VERSION := 8.1.002-2 -$(PKG)_CHECKSUM := 9d88b538ab0521e869cec985af5ed568214fa2a5 +$(PKG)_VERSION := 8.2.001-1 +$(PKG)_CHECKSUM := 3e0255936341f2a9610f979c6f7669258863905f $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libsqlite.mk --- a/src/src-msys2-libsqlite.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libsqlite.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libsqlite $(PKG)_NAME := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3.39.4-1 -$(PKG)_CHECKSUM := 15df1827b17133bdd82c10cc80e99b67de0852f2 +$(PKG)_VERSION := 3.40.0-1 +$(PKG)_CHECKSUM := 00eb4775cda1cd74784a827576d8706e0dec6fb5 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libunistring.mk --- a/src/src-msys2-libunistring.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libunistring.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libunistring $(PKG)_NAME := libunistring $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0-1 -$(PKG)_CHECKSUM := 51c5ac598e77989162567549f13717445e029f45 +$(PKG)_VERSION := 1.1-2 +$(PKG)_CHECKSUM := 16833a109b70dd4bcdce13a4805c757d84c6b116 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libutil-linux.mk --- a/src/src-msys2-libutil-linux.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libutil-linux.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libutil-linux $(PKG)_NAME := util-linux $(PKG)_IGNORE := -$(PKG)_VERSION := 2.35.2-1 -$(PKG)_CHECKSUM := f5dfbbc2adefea121983fb0a955395ea86b9c4d1 +$(PKG)_VERSION := 2.35.2-3 +$(PKG)_CHECKSUM := 83a4e943497f6c0b781d89f6d0903e035aa8d439 $(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 := diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-libxml2.mk --- a/src/src-msys2-libxml2.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-libxml2.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libxml2 $(PKG)_NAME := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.10.2-1 -$(PKG)_CHECKSUM := 94b576e0706341710eb3a84006d630a3158ba393 +$(PKG)_VERSION := 2.10.3-2 +$(PKG)_CHECKSUM := a10d2d6838d783f5c82a5085de2f05c817f5f10d $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-make.mk --- a/src/src-msys2-make.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-make.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-make $(PKG)_NAME := make $(PKG)_IGNORE := -$(PKG)_VERSION := 4.3-3 -$(PKG)_CHECKSUM := 71f70d44070576f5896a2b83fe8729d249830bd2 +$(PKG)_VERSION := 4.4-1 +$(PKG)_CHECKSUM := b71fc4b2bd48a4488b7dce5355efe55cf7d45ad8 $(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 := diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-mintty.mk --- a/src/src-msys2-mintty.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-mintty.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,9 +4,9 @@ PKG := src-msys2-mintty $(PKG)_NAME := mintty $(PKG)_IGNORE := -$(PKG)_VERSION := 1~3.6.1-2 +$(PKG)_VERSION := 1~3.6.3-1 $(PKG)_FILTER := mintty-1~ -$(PKG)_CHECKSUM := ba749018cd2b0af6b668d9a4ffd016ef2f62ad5c +$(PKG)_CHECKSUM := 3cab0151201f862e5bc1797b65b1d87eeb3113f9 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-mpfr.mk --- a/src/src-msys2-mpfr.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-mpfr.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-mpfr $(PKG)_NAME := mpfr $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.0.p13-1 -$(PKG)_CHECKSUM := d76bfa28c4a493749115cf2159e2fa8e3dc4e018 +$(PKG)_VERSION := 4.1.1.p1-1 +$(PKG)_CHECKSUM := d3cbb6198cf3ebfa7e8c60930c54b7f209f43cf7 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-openssl.mk --- a/src/src-msys2-openssl.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-openssl.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-openssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.q-1 -$(PKG)_CHECKSUM := 46614def624db74ad8b3713a969bf836209fea90 +$(PKG)_VERSION := 1.1.1.s-2 +$(PKG)_CHECKSUM := 355f36ac5741887a66ec3d2ce2d15ef6a23024b4 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-pacman-mirrors.mk --- a/src/src-msys2-pacman-mirrors.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-pacman-mirrors.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-pacman-mirrors $(PKG)_NAME := pacman-mirrors $(PKG)_IGNORE := -$(PKG)_VERSION := 20220205-1 -$(PKG)_CHECKSUM := 2665c4a8b43fa998dc8025cb7874186fba1bf245 +$(PKG)_VERSION := 20221016-1 +$(PKG)_CHECKSUM := 88ffeeb74b1278ac6d146c8756018fc6c7e707a3 $(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 := diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-pacman.mk --- a/src/src-msys2-pacman.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-pacman.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-pacman $(PKG)_NAME := pacman $(PKG)_IGNORE := -$(PKG)_VERSION := 6.0.1-18 -$(PKG)_CHECKSUM := 5e0b9710d5dbfe7bc83448c4146e0ac6d63127ea +$(PKG)_VERSION := 6.0.1-25 +$(PKG)_CHECKSUM := 76d5dcadcd5e0542a41a3cbe608131c95551f723 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-patch.mk --- a/src/src-msys2-patch.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-patch.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-patch $(PKG)_NAME := patch $(PKG)_IGNORE := -$(PKG)_VERSION := 2.7.6-1 -$(PKG)_CHECKSUM := ddae0b3ee221c8d6e072dbd60a06792048a83205 +$(PKG)_VERSION := 2.7.6-2 +$(PKG)_CHECKSUM := 9a0ee4a7a2ca5562e234f32aad3c1c9a88e06363 $(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 := diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-perl.mk --- a/src/src-msys2-perl.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-perl.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-perl $(PKG)_NAME := perl $(PKG)_IGNORE := -$(PKG)_VERSION := 5.32.1-2 -$(PKG)_CHECKSUM := 8b0aa25b9958609978cecac9bdcd9f71e97a41d0 +$(PKG)_VERSION := 5.36.0-1 +$(PKG)_CHECKSUM := 02fa285847f4e266db3bb7d9a25cce09171bcfb8 $(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 := diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-python.mk --- a/src/src-msys2-python.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-python.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-python $(PKG)_NAME := python $(PKG)_IGNORE := -$(PKG)_VERSION := 3.10.6-1 -$(PKG)_CHECKSUM := 3ce08a7715c8be89cc32995dc8875ab1a4dce7a6 +$(PKG)_VERSION := 3.10.9-1 +$(PKG)_CHECKSUM := 0d2c1caf6f04e795004365827c658d4b45fb367c $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-runtime.mk --- a/src/src-msys2-runtime.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-runtime.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-runtime $(PKG)_NAME := msys2-runtime $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.6-2 -$(PKG)_CHECKSUM := ba16e0d999630456c1cc121f5feb24be2e8efbaa +$(PKG)_VERSION := 3.3.6-6 +$(PKG)_CHECKSUM := cabcd11b65819eba8821f7b30d1c5a7d5cce62fa $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-sed.mk --- a/src/src-msys2-sed.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-sed.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-sed $(PKG)_NAME := sed $(PKG)_IGNORE := -$(PKG)_VERSION := 4.8-3 -$(PKG)_CHECKSUM := 638fb77b52d68c9c7f0a3fc2cfc915cad8f7fb5d +$(PKG)_VERSION := 4.9-1 +$(PKG)_CHECKSUM := 1cac17013c0cf52476441fbb54b1a5fe2a172439 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-wget.mk --- a/src/src-msys2-wget.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-wget.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-wget $(PKG)_NAME := wget $(PKG)_IGNORE := -$(PKG)_VERSION := 1.21.3-1 -$(PKG)_CHECKSUM := 1efe472e1a166c06fcc9e314c156f5902ac19dce +$(PKG)_VERSION := 1.21.3-2 +$(PKG)_CHECKSUM := 71774bbedcd6df0deae160e8d3a747f26bbe0a8a $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/src-msys2-zlib.mk --- a/src/src-msys2-zlib.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/src-msys2-zlib.mk Fri Dec 30 10:02:01 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-zlib $(PKG)_NAME := zlib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.12-2 -$(PKG)_CHECKSUM := 9e59676213634a7b0b65406318d093f05c7d4fbd +$(PKG)_VERSION := 1.2.13-1 +$(PKG)_CHECKSUM := 0b05136843017be4d81bef217f463f5c264700c7 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 src/tiff.mk --- a/src/tiff.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/tiff.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,13 +3,13 @@ PKG := tiff $(PKG)_IGNORE := -$(PKG)_VERSION := 4.4.0 -$(PKG)_CHECKSUM := e11d05db71d243a62800b4bf4479eb4859714405 +$(PKG)_VERSION := 4.5.0 +$(PKG)_CHECKSUM := c799eb7161b6495042223d4dee0d2b3bdb12660c $(PKG)_SUBDIR := tiff-$($(PKG)_VERSION) $(PKG)_FILE := tiff-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/libtiff/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.remotesensing.org/libtiff/$($(PKG)_FILE) -$(PKG)_DEPS := zlib libjbig jpeg +$(PKG)_DEPS := zlib libjbig jpeg libwebp ifneq ($(MXE_SYSTEM),msvc) $(PKG)_DEPS += xz endif @@ -26,7 +26,9 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - --enable-jbig --without-x && $(CONFIGURE_POST_HOOK) + --enable-jbig \ + --disable-libdeflate \ + --without-x && $(CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) DESTDIR='$(3)' $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' diff -r 6090fc4102bb -r 6498b13b6de5 src/units.mk --- a/src/units.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/units.mk Fri Dec 30 10:02:01 2022 +0100 @@ -17,6 +17,11 @@ endef define $(PKG)_BUILD + # install all .units files in "share" for cross mingw (no reliable symlinks) + if [ "$(MXE_SYSTEM)$(MXE_NATIVE_BUILD)" == "mingwno" ]; then \ + $(SED) -i -e 's|@CDAT@|@UDAT@|g' '$(1)/Makefile.in'; \ + fi + cd '$(1)' && ./configure \ --prefix='$(HOST_PREFIX)' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) diff -r 6090fc4102bb -r 6498b13b6de5 src/xz.mk --- a/src/xz.mk Wed Nov 30 18:23:50 2022 +0100 +++ b/src/xz.mk Fri Dec 30 10:02:01 2022 +0100 @@ -3,8 +3,8 @@ PKG := xz $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.8 -$(PKG)_CHECKSUM := 8a7d724b0ba0bc57605113515dfebace9911d688 +$(PKG)_VERSION := 5.4.0 +$(PKG)_CHECKSUM := 4ab7e2e8ec266f8ab3444dda27c3924aff351842 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://tukaani.org/xz/$($(PKG)_FILE) diff -r 6090fc4102bb -r 6498b13b6de5 tools/makeinst-script.sh.in --- a/tools/makeinst-script.sh.in Wed Nov 30 18:23:50 2022 +0100 +++ b/tools/makeinst-script.sh.in Fri Dec 30 10:02:01 2022 +0100 @@ -696,6 +696,17 @@ \${EndIf} EOF fi + if [ -e $OCTAVE_SOURCE/$OCTAVE_SUBDIR/bin/opengl_switch.exe ]; then + cat >> $OUTFILE << EOF + CreateShortCut '\$SMPROGRAMS\\GNU Octave $VERSION\$MultiUser.Local\\OpenGL Switcher.lnk' '\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\opengl_switch.exe' '' '' 0 + \${If} \$MultiUser.InstallMode != "CurrentUser" + Push '\$SMPROGRAMS\\GNU Octave $VERSION\$MultiUser.Local\\OpenGL Switcher.lnk' + Call ShellLinkSetRunAs + Pop \$0 + \${EndIf} +EOF + fi + # if we have documentation files, create shortcuts if [ -d $OCTAVE_SOURCE/$OCTAVE_SUBDIR/share/doc/octave ]; then cat >> $OUTFILE << EOF