Mercurial > mxe-octave
changeset 6923:c3eff9a45253
maint: Merge release to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Thu, 12 Oct 2023 20:31:13 +0200 |
| parents | 7bfdd2c60a25 (diff) 7b62def65f7d (current diff) |
| children | f04699caf98e |
| files | |
| diffstat | 221 files changed, 1754 insertions(+), 2702 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Mon Oct 09 11:28:54 2023 -0400 +++ b/Makefile.in Thu Oct 12 20:31:13 2023 +0200 @@ -74,8 +74,8 @@ # create and install devel tools (default no) ENABLE_DEVEL_TOOLS := @ENABLE_DEVEL_TOOLS@ -# use qt5 instead of qt4 -ENABLE_QT5 := @ENABLE_QT5@ +# which qt +ENABLE_QT := @ENABLE_QT@ # Set to "yes" to use msys2 USE_MSYS2 := @USE_MSYS2@ @@ -393,7 +393,6 @@ MXE_STRIP := true MXE_WINDRES := windres MXE_PKG_CONFIG := pkg-config - MXE_QMAKE := qmake # Although the Fortran compiler is internally gfortran, we still # want to make it look like non-GNU compiler, otherwise libtool is # not playing nicely and trips over different variable values for @@ -420,13 +419,21 @@ MXE_WINDRES := true endif MXE_PKG_CONFIG := pkg-config - MXE_QMAKE := qmake endif - MXE_MOC := $(HOST_BINDIR)/moc - MXE_UIC := $(HOST_BINDIR)/uic - MXE_LRELEASE := $(HOST_BINDIR)/lrelease - MXE_RCC := $(HOST_BINDIR)/rcc + ifeq ($(ENABLE_QT),6) + MXE_QMAKE := $(HOST_PREFIX)/qt6/bin/qmake + MXE_MOC := $(HOST_PREFIX)/qt6/libexec/moc + MXE_UIC := $(HOST_PREFIX)/qt6/libexec/uic + MXE_LRELEASE := $(HOST_PREFIX)/qt6/bin/lrelease + MXE_RCC := $(HOST_PREFIX)/qt6/libexec/rcc + else + MXE_QMAKE := qmake + MXE_MOC := $(HOST_BINDIR)/moc + MXE_UIC := $(HOST_BINDIR)/uic + MXE_LRELEASE := $(HOST_BINDIR)/lrelease + MXE_RCC := $(HOST_BINDIR)/rcc + endif MXE_MKOCTFILE := $(HOST_BINDIR)/mkoctfile MXE_OCTAVECONFIG := $(HOST_BINDIR)/octave-config @@ -447,12 +454,16 @@ MXE_WINDRES := true endif MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/pkg-config' - ifeq ($(ENABLE_QT5),yes) - MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake-qt5' - else + ifeq ($(ENABLE_QT),4) MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' endif - + ifeq ($(ENABLE_QT),5) + MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake-qt5' + endif + ifeq ($(ENABLE_QT),6) + MXE_QMAKE6 := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake-qt6' + MXE_QMAKE := '$(HOST_PREFIX)/qt6/bin/qmake' + endif MXE_MOC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' MXE_UIC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' MXE_LRELEASE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease' @@ -1004,6 +1015,7 @@ rm -f installer-files/octave-launch.exe \ installer-files/octave-launch-firsttime.exe \ installer-files/octave-launch.res \ + installer-files/octave-launch.rc \ installer-files/.dirstamp .PHONY: realclean @@ -1141,12 +1153,17 @@ echo 'set(MSVC 1)'; \ fi; \ echo 'set(CMAKE_BUILD_TYPE Release)'; \ - if [ $(MXE_SYSTEM) = msvc ]; then \ + if [ "$(MXE_NATIVE_BUILD)" = yes ]; then \ + echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX);/usr)'; \ + echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ + else \ + if [ $(MXE_SYSTEM) = msvc ]; then \ echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX_NATIVE))'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)'; \ - else \ + else \ echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX))'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ + fi; \ fi; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)'; \ @@ -1161,6 +1178,7 @@ else \ echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX) CACHE PATH "Installation Prefix")'; \ fi; \ + echo 'set(CMAKE_INSTALL_LIBDIR "lib")'; \ echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ > '$(CMAKE_TOOLCHAIN_FILE)' endef @@ -1178,6 +1196,8 @@ echo 'set(CMAKE_CXX_COMPILER $(CXX))'; \ echo 'set(CMAKE_Fortran_COMPILER $(F77))'; \ echo 'set(CMAKE_RC_COMPILER $(WINDRES))'; \ + echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX_NATIVE) CACHE PATH "Installation Prefix")'; \ + echo 'set(CMAKE_INSTALL_LIBDIR "lib")'; \ echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ > '$(CMAKE_NATIVE_TOOLCHAIN_FILE)' endef
--- a/binary-dist-rules.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/binary-dist-rules.mk Thu Oct 12 20:31:13 2023 +0200 @@ -105,16 +105,22 @@ ## FIXME: We aren't using VPATH? installer-files/octave-launch.exe: $(TOP_DIR)/installer-files/octave-launch.c installer-files/octave-launch.res | installer-files/.dirstamp - $(MXE_CC) $< -o $@ installer-files/octave-launch.res -lshlwapi -municode -DUNICODE -D_UNICODE $(OCTAVE_LAUNCH_NO_SHORT_CPPFLAGS) + $(MXE_CC) $< -o $@ installer-files/octave-launch.res -lshlwapi -municode -DUNICODE -D_UNICODE -DQTVERSION=$(ENABLE_QT) $(OCTAVE_LAUNCH_NO_SHORT_CPPFLAGS) .PHONY: octave-launch-firsttime octave-launch-firsttime: installer-files/octave-launch-firsttime.exe ## FIXME: We aren't using VPATH? installer-files/octave-launch-firsttime.exe: $(TOP_DIR)/installer-files/octave-launch.c installer-files/octave-launch.res | installer-files/.dirstamp - $(MXE_CC) $< -o $@ installer-files/octave-launch.res -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE -DFIRST_TIME $(OCTAVE_LAUNCH_NO_SHORT_CPPFLAGS) + $(MXE_CC) $< -o $@ installer-files/octave-launch.res -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE -DFIRST_TIME -DQTVERSION=$(ENABLE_QT) $(OCTAVE_LAUNCH_NO_SHORT_CPPFLAGS) + +installer-files/octave-logo.ico: $(TOP_DIR)/installer-files/octave-logo.ico | installer-files/.dirstamp + cp -a $< $@ -installer-files/octave-launch.res: $(TOP_DIR)/installer-files/octave-launch.rc | installer-files/.dirstamp +installer-files/octave-launch.rc: $(TOP_DIR)/installer-files/octave-launch.rc.in | installer-files/octave-logo.ico installer-files/.dirstamp + $(SED) $< -e 's/@PRODUCT_VERSION@/$($(OCTAVE_TARGET)_VERSION)/' -e "s/@PRODUCT_VERSION_COMMA@/$(shell echo $($(OCTAVE_TARGET)_VERSION).0 | $(SED) 's|\.|,|g')/" > $@ + +installer-files/octave-launch.res: installer-files/octave-launch.rc | installer-files/.dirstamp $(MXE_WINDRES) $< -o $@ -O coff endif
--- a/configure.ac Mon Oct 09 11:28:54 2023 -0400 +++ b/configure.ac Thu Oct 12 20:31:13 2023 +0200 @@ -101,12 +101,12 @@ # Use "msvcrt" or "ucrt" on Windows AC_ARG_WITH([windows-msvcrt], - [AS_HELP_STRING([--with-windows-msvcrt=msvcrt], [select C runtime for windows distribution (default: msvcrt)])], + [AS_HELP_STRING([--with-windows-msvcrt=msvcrt], [select C runtime for windows distribution (default: ucrt)])], [case $withval in no) AC_MSG_ERROR([A runtime for Windows is required for --with-windows-msvcrt]) ;; - yes | "") HOST_MSVCRT=msvcrt ;; + yes | "") HOST_MSVCRT=ucrt ;; *) HOST_MSVCRT="$withval" ;; - esac], [HOST_MSVCRT=msvcrt]) + esac], [HOST_MSVCRT=ucrt]) AC_SUBST(HOST_MSVCRT) # try find pkg-config build paths @@ -360,15 +360,25 @@ esac], [ENABLE_DEVEL_TOOLS=no]) AC_SUBST(ENABLE_DEVEL_TOOLS) -AC_ARG_ENABLE([qt5], - [AS_HELP_STRING([--disable-qt5], - [Build GNU Octave using Qt 4 instead of the default Qt 5 (default: enable, i.e. use Qt5)])], +# FIXME: Adjust this condition when Octave 9 is on the stable branch or released. +if test "$ENABLE_OCTAVE" = "default-"; then + default_qt=6 +else + default_qt=5 +fi + +AC_ARG_ENABLE([qt], + [AS_HELP_STRING([--enable-qt=VER], + [Build GNU Octave using a specified Qt version])], [case "$enableval" in - no) ENABLE_QT5=no ;; - yes) ENABLE_QT5=yes ;; - *) AC_MSG_ERROR([bad value "$enableval" for --enable-qt5]) ;; - esac], [ENABLE_QT5=yes]) -AC_SUBST(ENABLE_QT5) + no) ENABLE_QT=$default_qt ;; + yes) ENABLE_QT=$default_qt ;; + 4) ENABLE_QT=4 ;; + 5) ENABLE_QT=5 ;; + 6) ENABLE_QT=6 ;; + *) AC_MSG_ERROR([bad value "$enableval" for --enable-qt]) ;; + esac], [ENABLE_QT=$default_qt]) +AC_SUBST(ENABLE_QT) # install documentation of build dependency packages (or not to save space) AC_ARG_ENABLE([dep-docs],
--- a/dist-files.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/dist-files.mk Thu Oct 12 20:31:13 2023 +0200 @@ -119,9 +119,7 @@ gd-1-libpng15.patch \ gd-test.c \ gd.mk \ - gdal-2-ucrt.patch \ gdal.mk \ - gdb-1-readline-8.2.patch \ gdb.mk \ gdcm-1-nosecapi.patch \ gdcm-2-getopt.patch \ @@ -142,8 +140,6 @@ gl2ps.mk \ glew-test.c \ glew.mk \ - glib-1-fixes.patch \ - glib-2-fixes.patch \ glib.mk \ glibmm.mk \ glpk-1-fixes.patch \ @@ -152,6 +148,8 @@ glu.mk \ gmp.mk \ gnuplot-1-fixes.patch \ + gnuplot-2-qt6.patch \ + gnuplot-3-qt6-native.patch \ gnuplot.mk \ gnutls-1-fixes.patch \ gnutls-test.c \ @@ -338,7 +336,6 @@ mesa.mk \ mingw-blas-1-xerbla.patch \ mingw-cairo-1-ssize-t-defined.patch \ - mingw-cfitsio-1-fixes.patch \ mingw-epstool-1-fixes.patch \ mingw-glpk-1-fixes.patch \ mingw-graphicsmagick-1-dcraw.patch \ @@ -353,7 +350,6 @@ mingw-texinfo-1-fixes.patch \ mingw-texinfo-2-makeinfo-non-ASCII-perl.patch \ mingw-utils-1-portability-fix.patch \ - mingw-w64-complex-inverse-trig.patch \ mingw-w64.mk \ mingw-zeromq-1-fixes.patch \ mingwrt.mk \ @@ -566,7 +562,6 @@ opencore-amr.mk \ opencsg-1-fixes.patch \ opencsg.mk \ - opencv-1-fixes.patch \ opencv.mk \ openexr.mk \ opengl_switch.mk \ @@ -647,16 +642,27 @@ qt.mk \ qt5.mk \ qtbase-1-fixes.patch \ + qtbase-2-fixes.patch \ qtbase.mk \ qtimageformats.mk \ qtsvg.mk \ qttranslations.mk \ qttools-1.patch \ qttools.mk \ + qt6.mk \ + qt6-qt5compat.mk \ + qt6-qtbase-1-fixes.patch \ + qt6-qtbase.mk \ + qt6-qtimageformats.mk \ + qt6-qtsvg.mk \ + qt6-qttranslations.mk \ + qt6-qttools-1-libclang.patch \ + qt6-qttools.mk \ qwt-1-fixes.patch \ qwt.mk \ qwtplot3d-1-fixes.patch \ qwtplot3d.mk \ + randrproto.mk \ rapidjson-1-prettywriter.patch \ rapidjson.mk \ readline-0-001-upstream.patch \ @@ -729,8 +735,6 @@ src-msys-zlib.mk \ stable-octave-1-gnulib.patch \ stable-octave.mk \ - suitesparse-1-fixes.patch \ - suitesparse-2-metis.patch \ suitesparse.mk \ sundials-ida.mk \ t4k_common.mk \ @@ -815,6 +819,7 @@ xkbcommon.mk \ xmlwrapp.mk \ xproto.mk \ + xrandr.mk \ xrender.mk \ xt.mk \ xtrans.mk \ @@ -827,6 +832,7 @@ zeromq.mk \ zlib-1-win32-static.patch \ zlib.mk \ + zstd.mk \ zziplib-1-fix-fnmatch.patch \ zziplib.mk @@ -980,6 +986,7 @@ msys2-libtasn1.mk \ msys2-libunistring.mk \ msys2-libutil-linux.mk \ + msys2-libxcrypt.mk \ msys2-libxml2.mk \ msys2-libxslt.mk \ msys2-make.mk \ @@ -1053,6 +1060,7 @@ src-msys2-libtasn1.mk \ src-msys2-libunistring.mk \ src-msys2-libutil-linux.mk \ + src-msys2-libxcrypt.mk \ src-msys2-libxml2.mk \ src-msys2-libxslt.mk \ src-msys2-make.mk \ @@ -1127,7 +1135,7 @@ octave-firsttime.vbs \ octave-hdr.bmp \ octave-launch.c \ - octave-launch.rc \ + octave-launch.rc.in \ octave-logo.ico \ octave-no-short-path.patch \ post-install.bat \
--- a/index.html Mon Oct 09 11:28:54 2023 -0400 +++ b/index.html Thu Oct 12 20:31:13 2023 +0200 @@ -1099,7 +1099,7 @@ </tr> <tr> <td class="package">build-zstd</td> - <td class="website"><a href="https://github.com/facebook/zstd">Yasm</a></td> + <td class="website"><a href="https://github.com/facebook/zstd">zstd</a></td> </tr> <tr> <td class="package">bzip2</td> @@ -2114,6 +2114,10 @@ <td class="website"><a href="https://www.msys2.org/">MSYS2 libutil-linux</a></td> </tr> <tr> + <td class="package">msys2-libxcrypt</td> + <td class="website"><a href="https://www.msys2.org/">MSYS2 libxcrypt</a></td> + </tr> + <tr> <td class="package">msys2-libxml2</td> <td class="website"><a href="https://www.msys2.org/">MSYS2 libxml2</a></td> </tr> @@ -2702,6 +2706,34 @@ <td class="website"><a href="http://qt.nokia.com/">Qt5 imageformats</a></td> </tr> <tr> + <td class="package">qt6</td> + <td class="website"><a href="http://qt.nokia.com/">Qt6</a></td> + </tr> + <tr> + <td class="package">qt6-qt5compat</td> + <td class="website"><a href="http://qt.nokia.com/">Qt6 qt5compat</a></td> + </tr> + <tr> + <td class="package">qt6-qtbase</td> + <td class="website"><a href="http://qt.nokia.com/">Qt6 base</a></td> + </tr> + <tr> + <td class="package">qt6-qttranslations</td> + <td class="website"><a href="http://qt.nokia.com/">Qt6 qttranslations</a></td> + </tr> + <tr> + <td class="package">qt6-qttools</td> + <td class="website"><a href="http://qt.nokia.com/">Qt6 tools</a></td> + </tr> + <tr> + <td class="package">qt6-qtsvg</td> + <td class="website"><a href="http://qt.nokia.com/">Qt6 svg</a></td> + </tr> + <tr> + <td class="package">qt6-qtimageformats</td> + <td class="website"><a href="http://qt.nokia.com/">Qt6 imageformats</a></td> + </tr> + <tr> <td class="package">qwt</td> <td class="website"><a href="http://qwt.sourceforge.net/">Qwt</a></td> </tr> @@ -2722,6 +2754,10 @@ <td class="website"><a href="https://octave.org/">Release Octave</a></td> </tr> <tr> + <td class="package">randrproto</td> + <td class="website"><a href="http://xorg.freedesktop.org/">randrproto</a></td> + </tr> + <tr> <td class="package">renderproto</td> <td class="website"><a href="http://xorg.freedesktop.org/">renderproto</a></td> </tr> @@ -3022,6 +3058,10 @@ <td class="website"><a href="http://xorg.freedesktop.org/">xproto></a></td> </tr> <tr> + <td class="package">xrandr</td> + <td class="website"><a href="http://xorg.freedesktop.org/">xrandr</a></td> + </tr> + <tr> <td class="package">xrender</td> <td class="website"><a href="http://xorg.freedesktop.org/">xrender</a></td> </tr> @@ -3062,6 +3102,10 @@ <td class="website"><a href="http://zlib.net/">zlib</a></td> </tr> <tr> + <td class="package">zstd</td> + <td class="website"><a href="https://github.com/facebook/zstd">zstd</a></td> + </tr> + <tr> <td class="package">zziplib</td> <td class="website"><a href="http://zziplib.sourceforge.net/">ZZIPlib</a></td> </tr>
--- a/installer-files/octave-firsttime.vbs Mon Oct 09 11:28:54 2023 -0400 +++ b/installer-files/octave-firsttime.vbs Thu Oct 12 20:31:13 2023 +0200 @@ -60,7 +60,10 @@ End If ' set Qt plugin directory and path -If objFSO.FolderExists(OctavePath & "\qt5\bin") Then +If objFSO.FolderExists(OctavePath & "\qt6\bin") Then + wshSystemEnv("PATH") = OctavePath & "\qt6\bin;" & wshSystemEnv("PATH") + wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\qt6\plugins" +ElseIf objFSO.FolderExists(OctavePath & "\qt5\bin") Then wshSystemEnv("PATH") = OctavePath & "\qt5\bin;" & wshSystemEnv("PATH") wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\qt5\plugins" Else
--- a/installer-files/octave-launch.c Mon Oct 09 11:28:54 2023 -0400 +++ b/installer-files/octave-launch.c Thu Oct 12 20:31:13 2023 +0200 @@ -127,7 +127,7 @@ paths */ /* FIXME: This won't help on systems with de-activated short paths. */ nSize = GetShortPathNameW (path, rootpath, PATH_SZ-1); - if (nSize == 0) + if (nSize == 0 || PathFileExistsW(rootpath) == FALSE) StringCchCopyW (rootpath, PATH_SZ, path); #endif @@ -189,11 +189,11 @@ #endif /* qt paths - * either %OCT_HOME%\qt5\plugins + * either %OCT_HOME%\qtX\plugins * or %OCT_HOME\plugins */ nSize = lstrlenW (path); - StringCchCatW (path, PATH_SZ, L"\\qt5\\plugins"); + StringCchPrintfW (&path[nSize], PATH_SZ-nSize, L"\\qt%d\\plugins", QTVERSION); SetEnvironmentVariableW (L"QT_PLUGIN_PATH", path); path[nSize] = L'\0';
--- a/installer-files/octave-launch.rc Mon Oct 09 11:28:54 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -#include "winver.h" - -VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,0,0,0 -PRODUCTVERSION 1,0,0,0 -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" // US-English, Unicode - BEGIN - VALUE "CompanyName", "GNU Octave" - VALUE "FileDescription", "GNU Octave Launcher" - VALUE "FileVersion", "1.0" - VALUE "InternalName", "octave-launcher.exe" - VALUE "LegalCopyright", " Copyright (C) 2021 The Octave Project Developers" - VALUE "OriginalFilename", "octave-launcher.exe" - VALUE "ProductName", "GNU Octave Launcher" - VALUE "ProductVersion", "1.0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 0x04B0 // US-English, Unicode - END -END - -11 ICON "octave-logo.ico"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/installer-files/octave-launch.rc.in Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,27 @@ +#include "winver.h" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION 1,0,0,1 +PRODUCTVERSION @PRODUCT_VERSION_COMMA@ +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" // US-English, Unicode + BEGIN + VALUE "CompanyName", "GNU Octave" + VALUE "FileDescription", "GNU Octave Launcher" + VALUE "FileVersion", "1.0.0.1" + VALUE "InternalName", "octave-launcher.exe" + VALUE "LegalCopyright", " Copyright (C) 2021-2023 The Octave Project Developers" + VALUE "OriginalFilename", "octave-launcher.exe" + VALUE "ProductName", "GNU Octave" + VALUE "ProductVersion", "@PRODUCT_VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 0x04B0 // US-English, Unicode + END +END + +11 ICON "octave-logo.ico"
--- a/installer-files/octave.bat Mon Oct 09 11:28:54 2023 -0400 +++ b/installer-files/octave.bat Thu Oct 12 20:31:13 2023 +0200 @@ -26,7 +26,7 @@ Rem Set up PATH. Make sure the octave bin dir comes first. -set PATH=%OCT_HOME%qt5\bin;%OCT_HOME%bin;%MSYSPATH%bin;%PATH% +set PATH=%OCT_HOME%bin;%MSYSPATH%bin;%PATH% Rem Set up any environment vars we may need. @@ -35,8 +35,12 @@ set GS=gs.exe Rem QT_PLUGIN_PATH must be set to avoid segfault (bug #53419). -IF EXIST "%OCT_HOME%\qt5\bin\" ( +IF EXIST "%OCT_HOME%\qt6\bin\" ( + set QT_PLUGIN_PATH=%OCT_HOME%\qt6\plugins + set PATH=%OCT_HOME%qt6\bin;%PATH% +) ELSE IF EXIST "%OCT_HOME%\qt5\bin\" ( set QT_PLUGIN_PATH=%OCT_HOME%\qt5\plugins + set PATH=%OCT_HOME%qt5\bin;%PATH% ) ELSE ( set QT_PLUGIN_PATH=%OCT_HOME%\plugins )
--- a/installer-files/octave.vbs Mon Oct 09 11:28:54 2023 -0400 +++ b/installer-files/octave.vbs Thu Oct 12 20:31:13 2023 +0200 @@ -60,7 +60,10 @@ End If ' set Qt plugin directory and path -If objFSO.FolderExists(OctavePath & "\qt5\bin") Then +If objFSO.FolderExists(OctavePath & "\qt6\bin") Then + wshSystemEnv("PATH") = OctavePath & "\qt6\bin;" & wshSystemEnv("PATH") + wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\qt6\plugins" +ElseIf objFSO.FolderExists(OctavePath & "\qt5\bin") Then wshSystemEnv("PATH") = OctavePath & "\qt5\bin;" & wshSystemEnv("PATH") wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\qt5\plugins" Else
--- a/src/arpack.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/arpack.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := arpack $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.0 -$(PKG)_CHECKSUM := 6b89dc1b298e1db7df17094308fc3309afa49618 +$(PKG)_VERSION := 3.9.0 +$(PKG)_CHECKSUM := 9959d84321ccb86de0a9e8088adab61cfeeab987 $(PKG)_SUBDIR := $(PKG)-ng-$($(PKG)_VERSION) $(PKG)_FILE := arpack-ng_$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/opencollab/arpack-ng/archive/$($(PKG)_VERSION).tar.gz
--- a/src/blas_switch.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/blas_switch.mk Thu Oct 12 20:31:13 2023 +0200 @@ -9,11 +9,14 @@ $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/lostbard/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz - -ifeq ($(ENABLE_QT5),yes) +ifeq ($(ENABLE_QT),4) + $(PKG)_DEPS := qt +endif +ifeq ($(ENABLE_QT),5) $(PKG)_DEPS := qt5 -else - $(PKG)_DEPS := qt +endif +ifeq ($(ENABLE_QT),6) + $(PKG)_DEPS := qt6 endif ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) @@ -26,12 +29,19 @@ $(call GITHUB_PKG_UPDATE,lostbard,blas_switch,v) endef +$(PKG)_QMAKE_FLAGS := ifneq ($(MXE_NATIVE_BUILD),yes) ifeq ($(MXE_SYSTEM),mingw) - ifeq ($(ENABLE_QT5),yes) + ifeq ($(ENABLE_QT),4) + $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++' + endif + ifeq ($(ENABLE_QT),5) $(PKG)_QMAKE_SPEC_OPTION := -spec '$(BUILD_TOOLS_PREFIX)/mkspecs/win32-g++' - else - $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++' + $(PKG)_QMAKE_FLAGS += QMAKE_CXXFLAGS='-std=c++11' + endif + ifeq ($(ENABLE_QT),6) + $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/qt6/mkspecs/win32-g++' + $(PKG)_QMAKE_FLAGS += QMAKE_CXXFLAGS='-std=c++17' endif endif ifeq ($(MXE_SYSTEM),msvc) @@ -44,16 +54,16 @@ cd '$(1)' && \ '$(MXE_QMAKE)' -makefile \ $($(PKG)_QMAKE_SPEC_OPTION) \ + $($(PKG)_QMAKE_FLAGS) \ QMAKE_UIC='$(MXE_UIC)' \ QMAKE_MOC='$(MXE_MOC)' \ - QMAKE_LFLAGS=$(MXE_LDFLAGS) \ - QMAKE_CXXFLAGS='-std=c++11' + QMAKE_LFLAGS=$(MXE_LDFLAGS) $(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/blas_switch.exe' '$(HOST_BINDIR)/blas_switch.exe'; \ + mv '$(HOST_PREFIX)/qt$(ENABLE_QT)/bin/blas_switch.exe' '$(HOST_BINDIR)/blas_switch.exe'; \ fi endef
--- a/src/build-binutils.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/build-binutils.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := build-binutils $(PKG)_IGNORE := -$(PKG)_VERSION := 2.39 -$(PKG)_CHECKSUM := f17653e7b1d1fa5242a408919845da23e8cc5141 +$(PKG)_VERSION := 2.40 +$(PKG)_CHECKSUM := fee4fbef9d632afc1988dd631d7f75d4394b7f8d $(PKG)_SUBDIR := binutils-$($(PKG)_VERSION) $(PKG)_FILE := binutils-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE)
--- a/src/build-gcc.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/build-gcc.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := build-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 12.2.0 -$(PKG)_CHECKSUM := 5dce6dc0091b8049b530d1587513a07201691760 +$(PKG)_VERSION := 13.2.0 +$(PKG)_CHECKSUM := 5f95b6d042fb37d45c6cbebfc91decfbc4fb493c $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/build-meson.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/build-meson.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := build-meson $(PKG)_IGNORE := -$(PKG)_VERSION := 0.62.1 -$(PKG)_CHECKSUM := 4ba6f57629e5f38ea7b82e6edcd2baa2ab9c1edb +$(PKG)_VERSION := 1.2.2 +$(PKG)_CHECKSUM := 93f44be8b00b7a9cb57973e271e6cbf6fff5c098 $(PKG)_SUBDIR := meson-$($(PKG)_VERSION) $(PKG)_FILE := meson-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/mesonbuild/meson/archive/$($(PKG)_VERSION).tar.gz @@ -48,7 +48,13 @@ echo "strip = '$(shell echo $(MXE_STRIP) | $(SED) "s/'//g")'"; \ fi; \ echo "pkgconfig = '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config'"; \ - echo "llvm-config = '$(HOST_BINDIR)/$(MXE_TOOL_PREFIX)llvm-config'";\ + echo "llvm-config = '$(HOST_BINDIR)/$(MXE_TOOL_PREFIX)llvm-config'"; \ + if [ x$(MXE_SYSTEM) = xmingw ]; then \ + echo "windres = '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)windres'"; \ + fi; \ + echo ""; \ + echo "[paths]"; \ + echo "libdir = 'lib'"; \ if [ x$(MXE_NATIVE_BUILD) = xno ]; then \ echo ""; \ echo "[host_machine]"; \
--- a/src/build-texinfo.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/build-texinfo.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := build-texinfo $(PKG)_IGNORE := -$(PKG)_VERSION := 6.8 -$(PKG)_CHECKSUM := 37f5ff5f748fb11bcbd57b82f3fdb5c365e82d61 +$(PKG)_VERSION := 7.0.3 +$(PKG)_CHECKSUM := d9c7fb736aeb8965b12c32d24e1006e5ce6965f1 $(PKG)_SUBDIR := texinfo-$($(PKG)_VERSION) $(PKG)_FILE := texinfo-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)
--- a/src/build-xz.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/build-xz.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := build-xz $(PKG)_IGNORE := -$(PKG)_VERSION := 5.4.0 -$(PKG)_CHECKSUM := 4ab7e2e8ec266f8ab3444dda27c3924aff351842 +$(PKG)_VERSION := 5.4.4 +$(PKG)_CHECKSUM := a7ba54953bafe4ba02936be56f32391f48806fed $(PKG)_SUBDIR := xz-$($(PKG)_VERSION) $(PKG)_FILE := xz-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://tukaani.org/xz/$($(PKG)_FILE)
--- a/src/build-zstd.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/build-zstd.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := build-zstd $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.2 -$(PKG)_CHECKSUM := c56c8e6d703d14029464b2a1a66164dc5cf80855 +$(PKG)_VERSION := 1.5.5 +$(PKG)_CHECKSUM := 4479ecc74300d23391d99fbebf2fddd47aed9b28 $(PKG)_SUBDIR := zstd-$($(PKG)_VERSION) $(PKG)_FILE := zstd-$($(PKG)_VERSION).tar.lz $(PKG)_URL := https://github.com/facebook/zstd/releases/download/v$($(PKG)_VERSION)/zstd-$($(PKG)_VERSION).tar.gz @@ -24,6 +24,7 @@ $($(PKG)_CMAKE_FLAGS) \ $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_INSTALL_PREFIX='$(3)$(BUILD_TOOLS_PREFIX)' \ + -DCMAKE_INSTALL_LIBDIR='lib' \ -DBUILD_TESTING=Off cmake --build '$(1)/.build' -j '$(JOBS)'
--- a/src/cfitsio.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/cfitsio.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := cfitsio $(PKG)_IGNORE := -$(PKG)_VERSION := 4.2.0 -$(PKG)_CHECKSUM := 165f0af3c9931ae5ad0dc3eb396a10711b4fdd6b +$(PKG)_VERSION := 4.3.0 +$(PKG)_CHECKSUM := ccacad868712821c345da3313c3c83afb8efde1e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/$($(PKG)_FILE) @@ -17,7 +17,7 @@ $(PKG)_CONFIGURE_FLAGS := ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_CONFIGURE_FLAGS += CURLCONFIG=none + $(PKG)_CONFIGURE_FLAGS += --disable-curl endif define $(PKG)_UPDATE
--- a/src/curl.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/curl.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.87.0 -$(PKG)_CHECKSUM := cc61d854fc1dbb769052839829f9412d41879674 +$(PKG)_VERSION := 8.3.0 +$(PKG)_CHECKSUM := cf25feae114a5ae4f9eb6dd43586e1f2cd918ff6 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE)
--- a/src/dbus.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/dbus.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.15.2 -$(PKG)_CHECKSUM := 5cb3f74b408f97e91247a8e82366a60028bf2ecb +$(PKG)_VERSION := 1.15.6 +$(PKG)_CHECKSUM := 7256744ea329b8640df9ce2fc4792256f4f5c6c9 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) @@ -37,5 +37,6 @@ --disable-xml-docs \ CFLAGS='-DPROCESS_QUERY_LIMITED_INFORMATION=0x1000' \ && $(CONFIGURE_POST_HOOK) + $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_DOCS) $($(PKG)_DISABLE_PROGS) DESTDIR='$(3)' endef
--- a/src/dcmtk.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/dcmtk.mk Thu Oct 12 20:31:13 2023 +0200 @@ -13,7 +13,7 @@ $(PKG)_DEPS := tiff libpng libxml2 zlib define $(PKG)_UPDATE - $(WGET) -q -O- 'http://dicom.offis.de/dcmtk.php.en' | \ + $(WGET) -q -O- 'https://dicom.offis.de/en/dcmtk/dcmtk-software-development/' | \ $(SED) -n 's,.*/dcmtk-\([0-9][^"]*\)\.tar.*,\1,p' | \ head -1 endef
--- a/src/default-octave.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/default-octave.mk Thu Oct 12 20:31:13 2023 +0200 @@ -23,10 +23,14 @@ endif $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre2 portaudio pstoedit qhull qrupdate qscintilla rapidjson readline sundials-ida suitesparse texinfo zlib -ifeq ($(ENABLE_QT5),yes) +ifeq ($(ENABLE_QT),4) + $(PKG)_DEPS += qt +endif +ifeq ($(ENABLE_QT),5) $(PKG)_DEPS += qt5 -else - $(PKG)_DEPS += qt +endif +ifeq ($(ENABLE_QT),6) + $(PKG)_DEPS += qt6 endif ifeq ($(USE_SYSTEM_OPENGL),no) @@ -74,17 +78,25 @@ RCC_QTVER=$(MXE_RCC) \ LRELEASE_QTVER=$(MXE_LRELEASE) -ifeq ($(ENABLE_QT5),yes) +ifeq ($(ENABLE_QT),4) + $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" + $(PKG)_QTDIR := $(HOST_PREFIX) + $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt4" +endif +ifeq ($(ENABLE_QT),5) #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" $(PKG)_QTDIR := $(HOST_PREFIX)/qt5 $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt5" -else - $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" - $(PKG)_QTDIR := $(HOST_PREFIX) - $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt4" endif - +ifeq ($(ENABLE_QT),6) + $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt6/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" + $(PKG)_QTDIR := $(HOST_PREFIX)/qt6 + $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt6" + ifeq ($(MXE_NATIVE_BUILD),yes) + $(PKG)_QT_CONFIGURE_OPTIONS += QTPATHS6="$(HOST_PREFIX)/qt6/bin/qtpaths6" + endif +endif ifneq ($(ENABLE_DOCS),yes) $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
--- a/src/double-conversion.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/double-conversion.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := double-conversion $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.1 -$(PKG)_CHECKSUM := 1739208c8ca88a6073e738a96ebde73ec9bdebe7 +$(PKG)_VERSION := 3.3.0 +$(PKG)_CHECKSUM := 31bbee2c38287a71901e818010dd9427567e6c1f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
--- a/src/eigen.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/eigen.mk Thu Oct 12 20:31:13 2023 +0200 @@ -11,10 +11,9 @@ $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://eigen.tuxfamily.org/index.php?title=Main_Page#Download' | \ - $(GREP) 'released!' | \ - $(SED) -n 's,.*>Eigen \([0-9.]*\) released!.*,\1,p' | \ - head -1 + $(WGET) -q -O- https://gitlab.com/libeigen/eigen/tags | \ + $(SED) -n 's|.*/tags/\([0-9][^"]*\).*|\1|p' | grep -v 'rc' | $(SORT) -V | \ + tail -1 endef define $(PKG)_BUILD
--- a/src/ffmpeg.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/ffmpeg.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 4.2.8 -$(PKG)_CHECKSUM := 9ce0fd730c0c05ae636033828303e2b2eca99171 +$(PKG)_VERSION := 4.2.9 +$(PKG)_CHECKSUM := 7bfec63cfe78f50775f0931396552b7e898dfff7 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE) @@ -24,6 +24,11 @@ $(PKG)_CONFIG_OPTS += --disable-optimizations endif +# disable asm usage when native linux with system gcc +ifeq ($(MXE_SYSTEM)$(USE_SYSTEM_GCC),gnu-linuxyes) + $(PKG)_CONFIG_OPTS += --disable-asm +endif + ifeq ($(MXE_NATIVE_BUILD),no) define $(PKG)_BUILD @@ -82,7 +87,8 @@ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ --enable-libx264 \ - --enable-libvpx + --enable-libvpx \ + $($(PKG)_CONFIG_OPTS) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)' rm -rf "$(3)$(HOST_PREFIX)/share/ffmpeg"
--- a/src/flac.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/flac.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := flac $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.2 -$(PKG)_CHECKSUM := 4297c4f7c8665705f46886403755061dd0a30289 +$(PKG)_VERSION := 1.4.3 +$(PKG)_CHECKSUM := a8c36ac8c6e2df8611aab9590bb9e6bdf646c0e1 $(PKG)_SUBDIR := flac-$($(PKG)_VERSION) $(PKG)_FILE := flac-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://downloads.xiph.org/releases/flac/$($(PKG)_FILE)
--- a/src/fontconfig.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/fontconfig.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := fontconfig $(PKG)_IGNORE := -$(PKG)_VERSION := 2.14.1 -$(PKG)_CHECKSUM := 1e0c542d35783f25ed3f4d3eb843fd81cb01a81d +$(PKG)_VERSION := 2.14.2 +$(PKG)_CHECKSUM := 3631a6a6ccb870d88149538cf9e6ad3fa27e056b $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) $(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://fontconfig.org/release/$($(PKG)_FILE)
--- a/src/freetds.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/freetds.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.16 -$(PKG)_CHECKSUM := c05fc2d63fc1f6dfe9efec73fe5941015182191c +$(PKG)_VERSION := 1.4.2 +$(PKG)_CHECKSUM := 5ab9e26b56d8e989742b986ac5e449cc66bda03f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE)
--- a/src/freetype.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/freetype.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := freetype $(PKG)_IGNORE := -$(PKG)_VERSION := 2.12.1 -$(PKG)_CHECKSUM := 5133eed28a7624ffabbf6d00aa3f68b841d62d80 +$(PKG)_VERSION := 2.13.2 +$(PKG)_CHECKSUM := 2d8d5917a1983ebd04921f2993a88858d6f72dec $(PKG)_SUBDIR := freetype-$($(PKG)_VERSION) $(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/fribidi.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/fribidi.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := fribidi $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.12 -$(PKG)_CHECKSUM := c042d9a6e42d9871ea485bb734df049cc57a7185 +$(PKG)_VERSION := 1.0.13 +$(PKG)_CHECKSUM := 02d1c34ac49de25240aa1c7a87adb8d3125d7ee1 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://github.com/fribidi/fribidi/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/gcc-gmp.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/gcc-gmp.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := gcc-gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2.1 -$(PKG)_CHECKSUM := 2dcf34d4a432dbe6cce1475a835d20fe44f75822 +$(PKG)_VERSION := 6.3.0 +$(PKG)_CHECKSUM := 32d21c4fae046de45e8fce37bf4002236d283b71 $(PKG)_SUBDIR := gmp-$($(PKG)_VERSION) $(PKG)_FILE := gmp-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://gmplib.org/download/gmp/$($(PKG)_FILE)
--- a/src/gcc-mpc.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/gcc-mpc.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := gcc-mpc $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.1 -$(PKG)_CHECKSUM := 2a4919abf445c6eda4e120cd669b8733ce337227 +$(PKG)_VERSION := 1.3.1 +$(PKG)_CHECKSUM := bac1c1fa79f5602df1e29e4684e103ad55714e02 $(PKG)_SUBDIR := mpc-$($(PKG)_VERSION) $(PKG)_FILE := mpc-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://ftp.gnu.org/gnu/mpc/$($(PKG)_FILE)
--- a/src/gdal-2-ucrt.patch Mon Oct 09 11:28:54 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -From bd4d925741b6c06ba38888a9bb959b490adf27af Mon Sep 17 00:00:00 2001 -From: Jeremy Drake <github@jdrake.com> -Date: Mon, 18 Oct 2021 11:02:08 -0700 -Subject: [PATCH] gdal: don't define __MSVCRT_VERSION__ - ---- gdal-3.3.2/port/cpl_port.h.orig 2021-10-18 10:57:01.393925700 -0700 -+++ gdal-3.3.2/port/cpl_port.h 2021-10-18 10:57:27.784506600 -0700 -@@ -113,15 +113,6 @@ - /* MinGW stuff */ - /* ==================================================================== */ - --/* We need __MSVCRT_VERSION__ >= 0x0700 to have "_aligned_malloc" */ --/* Latest versions of mingw32 define it, but with older ones, */ --/* we need to define it manually */ --#if defined(__MINGW32__) --#ifndef __MSVCRT_VERSION__ --#define __MSVCRT_VERSION__ 0x0700 --#endif --#endif -- - /* Needed for std=c11 on Solaris to have strcasecmp() */ - #if defined(GDAL_COMPILATION) && defined(__sun__) && (__STDC_VERSION__ + 0) >= 201112L && (_XOPEN_SOURCE + 0) < 600 - #ifdef _XOPEN_SOURCE
--- a/src/gdal.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/gdal.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := gdal $(PKG)_IGNORE : -$(PKG)_VERSION := 3.6.2 -$(PKG)_CHECKSUM := 6ab39f56f8214b5ee943756e82dc23377cb7a713 +$(PKG)_VERSION := 3.7.2 +$(PKG)_CHECKSUM := 1b26dab7cc02af2597be71b7b2782ce94505772c $(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/gdb-1-readline-8.2.patch Mon Oct 09 11:28:54 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -commit 1add37b567a7dee39d99f37b37802034c3fce9c4 -Author: Andreas Schwab <schwab@linux-m68k.org> -Date: Sun Mar 20 14:01:54 2022 +0100 - - Add support for readline 8.2 - - In readline 8.2 the type of rl_completer_word_break_characters changed to - include const. - -diff --git a/gdb/completer.c b/gdb/completer.c -index d3900ae2014..a51c16ac7f8 100644 ---- a/gdb/completer.c -+++ b/gdb/completer.c -@@ -36,7 +36,7 @@ - calling a hook instead so we eliminate the CLI dependency. */ - #include "gdbcmd.h" - --/* Needed for rl_completer_word_break_characters() and for -+/* Needed for rl_completer_word_break_characters and for - rl_filename_completion_function. */ - #include "readline/readline.h" - -@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw () - rl_basic_quote_characters = NULL; - } - -- return rl_completer_word_break_characters; -+ return (char *) rl_completer_word_break_characters; - } - - char *
--- a/src/gdb.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/gdb.mk Thu Oct 12 20:31:13 2023 +0200 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gdb -$(PKG)_VERSION := 12.1 -$(PKG)_CHECKSUM := 2edabd9f5766b84889b07b366b4438e93e994005 +$(PKG)_VERSION := 13.2 +$(PKG)_CHECKSUM := bcd6b05a2565f4339e1187dae428fb58a000d690 $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) $(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
--- a/src/gdcm.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/gdcm.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := gdcm $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.20 -$(PKG)_CHECKSUM := 7d8ce96cf468031805b119b26853a9d4e795bd72 +$(PKG)_VERSION := 3.0.21 +$(PKG)_CHECKSUM := 41d867c3283bc38d29270f82aab804b8ac2732f3 $(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/geos.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/geos.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := geos $(PKG)_IGNORE := -$(PKG)_VERSION := 3.11.1 -$(PKG)_CHECKSUM := d22faaa5892014d35dcc8ff845c98b7427477dd7 +$(PKG)_VERSION := 3.12.0 +$(PKG)_CHECKSUM := ccba1c7aa90077522cad2ca9e615d24de913c010 $(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' | $(SORT) -V | \ + $(SED) -n 's,.*geos-\([0-9][\.0-9]*\)\.tar.*,\1,p' | $(SORT) -V | \ tail -1 endef
--- a/src/glib-1-fixes.patch Mon Oct 09 11:28:54 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,634 +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: Mark Brand <mabrand@mabrand.nl> -Date: Thu, 23 Sep 2010 21:42:46 +0200 -Subject: [PATCH 1/9] fix tool paths - - -diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in -index 1111111..2222222 100644 ---- a/glib-2.0.pc.in -+++ b/glib-2.0.pc.in -@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ - --glib_genmarshal=glib-genmarshal --gobject_query=gobject-query --glib_mkenums=glib-mkenums -+glib_genmarshal=@bindir@/glib-genmarshal -+gobject_query=@bindir@/gobject-query -+glib_mkenums=@bindir@/glib-mkenums - - Name: GLib - Description: C Utility Library - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Hans Petter Jansson <hpj@cl.no> -Date: Fri, 15 Jun 2012 15:25:01 +0200 -Subject: [PATCH 2/9] Avoid DllMain symbol conflict when linking statically - -Adjusted by Boris Nagaev on 29-Jan-2017 to fix -https://gist.github.com/starius/f4fc85939352cb50122ba29e0f5b140d -when updating to glib-2.50.2. - -diff --git a/gio/giomodule.c b/gio/giomodule.c -index 1111111..2222222 100644 ---- a/gio/giomodule.c -+++ b/gio/giomodule.c -@@ -928,14 +928,12 @@ extern GType g_cocoa_notification_backend_get_type (void); - - static HMODULE gio_dll = NULL; - --#ifdef DLL_EXPORT -- --BOOL WINAPI DllMain (HINSTANCE hinstDLL, -+BOOL WINAPI gio_DllMain (HINSTANCE hinstDLL, - DWORD fdwReason, - LPVOID lpvReserved); - - BOOL WINAPI --DllMain (HINSTANCE hinstDLL, -+gio_DllMain (HINSTANCE hinstDLL, - DWORD fdwReason, - LPVOID lpvReserved) - { -@@ -945,8 +943,6 @@ DllMain (HINSTANCE hinstDLL, - return TRUE; - } - --#endif -- - void * - _g_io_win32_get_module (void) - { -diff --git a/glib/glib-init.c b/glib/glib-init.c -index 1111111..2222222 100644 ---- a/glib/glib-init.c -+++ b/glib/glib-init.c -@@ -245,14 +245,14 @@ glib_init (void) - - #if defined (G_OS_WIN32) - --BOOL WINAPI DllMain (HINSTANCE hinstDLL, -+BOOL WINAPI glib_DllMain (HINSTANCE hinstDLL, - DWORD fdwReason, - LPVOID lpvReserved); - - HMODULE glib_dll; - - BOOL WINAPI --DllMain (HINSTANCE hinstDLL, -+glib_DllMain (HINSTANCE hinstDLL, - DWORD fdwReason, - LPVOID lpvReserved) - { -diff --git a/gobject/gtype.c b/gobject/gtype.c -index 1111111..2222222 100644 ---- a/gobject/gtype.c -+++ b/gobject/gtype.c -@@ -4450,7 +4450,7 @@ gobject_init (void) - _g_signal_init (); - } - --#if defined (G_OS_WIN32) -+#if 0 - - BOOL WINAPI DllMain (HINSTANCE hinstDLL, - DWORD fdwReason, - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Hans Petter Jansson <hpj@cl.no> -Date: Fri, 15 Jun 2012 15:27:22 +0200 -Subject: [PATCH 3/9] Allow building without inotify support - - -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1599,10 +1599,16 @@ dnl ***************************** - dnl ** Check for inotify (GIO) ** - dnl ***************************** - inotify_support=no -+ AC_ARG_ENABLE(inotify, -+ AC_HELP_STRING([--disable-inotify], -+ [build without inotify support])) -+ -+ if test "x$enable_inotify" != "xno"; then - AC_CHECK_HEADERS([sys/inotify.h], - [ - AC_CHECK_FUNCS(inotify_init1, [inotify_support=yes], [inotify_support=no]) - ]) -+fi - - AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"]) - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Hans Petter Jansson <hpj@cl.no> -Date: Fri, 15 Jun 2012 15:28:14 +0200 -Subject: [PATCH 4/9] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. - Backported from upstream - - -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -511,6 +511,8 @@ LT_INIT([disable-static win32-dll]) - dnl when using libtool 2.x create libtool early, because it's used in configure - m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - -+# Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF -+AS_IF([false], [AC_CHECK_HEADER([stdint.h])]) - - AS_IF([test "$glib_native_win32" = "yes"], [ - if test x$enable_static = xyes -a x$enable_shared = xyes; then - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Hans Petter Jansson <hpj@cl.no> -Date: Fri, 15 Jun 2012 15:29:06 +0200 -Subject: [PATCH 5/9] Link with dnsapi - - -diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in -index 1111111..2222222 100644 ---- a/gio-2.0.pc.in -+++ b/gio-2.0.pc.in -@@ -13,6 +13,6 @@ Description: glib I/O library - Version: @VERSION@ - Requires: glib-2.0 gobject-2.0 - Requires.private: gmodule-no-export-2.0 --Libs: -L${libdir} -lgio-2.0 -+Libs: -L${libdir} -lgio-2.0 -ldnsapi -liphlpapi - Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @LIBMOUNT_LIBS@ - Cflags: - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Hans Petter Jansson <hpj@cl.no> -Date: Fri, 15 Jun 2012 15:29:38 +0200 -Subject: [PATCH 6/9] Ensure globals are initialized even when DllMain is not - being run - - -diff --git a/glib/gmain.c b/glib/gmain.c -index 1111111..2222222 100644 ---- a/glib/gmain.c -+++ b/glib/gmain.c -@@ -2688,12 +2688,15 @@ g_get_real_time (void) - * So for now we calculate (usec_per_sec / ticks_per_sec) and use floating point - */ - static gdouble g_monotonic_usec_per_tick = 0; -+static gboolean g_win32_clock_is_initialized; - - void - g_clock_win32_init (void) - { - LARGE_INTEGER freq; - -+ g_win32_clock_is_initialized = TRUE; -+ - if (!QueryPerformanceFrequency (&freq) || freq.QuadPart == 0) - { - /* The documentation says that this should never happen */ -@@ -2707,6 +2709,9 @@ g_get_monotonic_time (void) - gint64 - g_get_monotonic_time (void) - { -+ if (!g_win32_clock_is_initialized) -+ g_clock_win32_init (); -+ - if (G_LIKELY (g_monotonic_usec_per_tick != 0)) - { - LARGE_INTEGER ticks; -diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c -index 1111111..2222222 100644 ---- a/glib/gthread-win32.c -+++ b/glib/gthread-win32.c -@@ -60,6 +60,10 @@ g_thread_abort (gint status, - strerror (status), function); - g_abort (); - } -+/* Needed for static builds where DllMain initializer doesn't get called */ -+static gboolean g_threads_is_initialized; -+G_GNUC_INTERNAL void g_thread_win32_init (void); -+ - - /* Starting with Vista and Windows 2008, we have access to the - * CONDITION_VARIABLE and SRWLock primatives on Windows, which are -@@ -79,6 +83,9 @@ g_thread_abort (gint status, - void - g_mutex_init (GMutex *mutex) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - InitializeSRWLock ((gpointer) mutex); - } - -@@ -90,18 +97,27 @@ g_mutex_clear (GMutex *mutex) - void - g_mutex_lock (GMutex *mutex) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - AcquireSRWLockExclusive ((gpointer) mutex); - } - - gboolean - g_mutex_trylock (GMutex *mutex) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - return TryAcquireSRWLockExclusive ((gpointer) mutex); - } - - void - g_mutex_unlock (GMutex *mutex) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - ReleaseSRWLockExclusive ((gpointer) mutex); - } - -@@ -112,6 +128,9 @@ g_rec_mutex_impl_new (void) - { - CRITICAL_SECTION *cs; - -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - cs = g_slice_new (CRITICAL_SECTION); - InitializeCriticalSection (cs); - -@@ -122,6 +141,10 @@ static void - g_rec_mutex_impl_free (CRITICAL_SECTION *cs) - { - DeleteCriticalSection (cs); -+ -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - g_slice_free (CRITICAL_SECTION, cs); - } - -@@ -130,6 +153,9 @@ g_rec_mutex_get_impl (GRecMutex *mutex) - { - CRITICAL_SECTION *impl = mutex->p; - -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - if G_UNLIKELY (mutex->p == NULL) - { - impl = g_rec_mutex_impl_new (); -@@ -144,30 +170,45 @@ g_rec_mutex_get_impl (GRecMutex *mutex) - void - g_rec_mutex_init (GRecMutex *mutex) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - mutex->p = g_rec_mutex_impl_new (); - } - - void - g_rec_mutex_clear (GRecMutex *mutex) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - g_rec_mutex_impl_free (mutex->p); - } - - void - g_rec_mutex_lock (GRecMutex *mutex) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - EnterCriticalSection (g_rec_mutex_get_impl (mutex)); - } - - void - g_rec_mutex_unlock (GRecMutex *mutex) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - LeaveCriticalSection (mutex->p); - } - - gboolean - g_rec_mutex_trylock (GRecMutex *mutex) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - return TryEnterCriticalSection (g_rec_mutex_get_impl (mutex)); - } - -@@ -176,6 +217,9 @@ g_rec_mutex_trylock (GRecMutex *mutex) - void - g_rw_lock_init (GRWLock *lock) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - InitializeSRWLock ((gpointer) lock); - } - -@@ -187,36 +231,54 @@ g_rw_lock_clear (GRWLock *lock) - void - g_rw_lock_writer_lock (GRWLock *lock) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - AcquireSRWLockExclusive ((gpointer) lock); - } - - gboolean - g_rw_lock_writer_trylock (GRWLock *lock) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - return TryAcquireSRWLockExclusive ((gpointer) lock); - } - - void - g_rw_lock_writer_unlock (GRWLock *lock) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - ReleaseSRWLockExclusive ((gpointer) lock); - } - - void - g_rw_lock_reader_lock (GRWLock *lock) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - AcquireSRWLockShared ((gpointer) lock); - } - - gboolean - g_rw_lock_reader_trylock (GRWLock *lock) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - return TryAcquireSRWLockShared ((gpointer) lock); - } - - void - g_rw_lock_reader_unlock (GRWLock *lock) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - ReleaseSRWLockShared ((gpointer) lock); - } - -@@ -224,6 +286,9 @@ g_rw_lock_reader_unlock (GRWLock *lock) - void - g_cond_init (GCond *cond) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - InitializeConditionVariable ((gpointer) cond); - } - -@@ -235,12 +300,18 @@ g_cond_clear (GCond *cond) - void - g_cond_signal (GCond *cond) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - WakeConditionVariable ((gpointer) cond); - } - - void - g_cond_broadcast (GCond *cond) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - WakeAllConditionVariable ((gpointer) cond); - } - -@@ -248,6 +319,9 @@ void - g_cond_wait (GCond *cond, - GMutex *entered_mutex) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - SleepConditionVariableSRW ((gpointer) cond, (gpointer) entered_mutex, INFINITE, 0); - } - -@@ -260,6 +334,9 @@ g_cond_wait_until (GCond *cond, - DWORD span_millis; - gboolean signalled; - -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - start_time = g_get_monotonic_time (); - do - { -@@ -311,6 +388,9 @@ g_private_get_impl (GPrivate *key) - - if G_UNLIKELY (impl == 0) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - EnterCriticalSection (&g_private_lock); - impl = (DWORD) key->p; - if (impl == 0) -@@ -404,6 +484,9 @@ g_system_thread_free (GRealThread *thread) - { - GThreadWin32 *wt = (GThreadWin32 *) thread; - -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - win32_check_for_error (CloseHandle (wt->handle)); - g_slice_free (GThreadWin32, wt); - } -@@ -411,6 +494,9 @@ g_system_thread_free (GRealThread *thread) - void - g_system_thread_exit (void) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - _endthreadex (0); - } - -@@ -419,6 +505,9 @@ g_thread_win32_proxy (gpointer data) - { - GThreadWin32 *self = data; - -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - self->proxy (self); - - g_system_thread_exit (); -@@ -436,6 +525,9 @@ g_system_thread_new (GThreadFunc func, - GThreadWin32 *thread; - guint ignore; - -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - thread = g_slice_new0 (GThreadWin32); - thread->proxy = func; - -@@ -465,6 +557,9 @@ g_system_thread_wait (GRealThread *thread) - { - GThreadWin32 *wt = (GThreadWin32 *) thread; - -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - win32_check_for_error (WAIT_FAILED != WaitForSingleObject (wt->handle, INFINITE)); - } - -@@ -536,6 +631,8 @@ g_system_thread_set_name (const gchar *name) - void - g_thread_win32_init (void) - { -+ g_threads_is_initialized = TRUE; -+ - InitializeCriticalSection (&g_private_lock); - - #ifndef _MSC_VER - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Gerardo Ballabio <gerardo.ballabio@gmail.com> -Date: Sun, 16 Aug 2015 13:18:24 +0200 -Subject: [PATCH 7/9] Remove an annoying runtime warning - -that pops up when using GtkApplication in Gtk+ 3 programs. - -diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c -index 1111111..2222222 100644 ---- a/gio/gdbusaddress.c -+++ b/gio/gdbusaddress.c -@@ -1387,6 +1387,7 @@ __declspec(dllexport) void CALLBACK g_win32_run_session_bus (HWND hwnd, HINSTANC - __declspec(dllexport) void CALLBACK - g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow) - { -+ /* - GDBusDaemon *daemon; - GMainLoop *loop; - const char *address; -@@ -1418,6 +1419,7 @@ g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow - - g_main_loop_unref (loop); - g_object_unref (daemon); -+ */ - } - - static gchar * - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: aquiles2k <aj@elane2k.com> -Date: Wed, 6 Apr 2016 22:39:53 +0300 -Subject: [PATCH 8/9] fix error "won't overwrite defined macro" on OSX - -See https://github.com/mxe/mxe/issues/1281 - -diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 -index 1111111..2222222 100644 ---- a/m4macros/glib-gettext.m4 -+++ b/m4macros/glib-gettext.m4 -@@ -36,8 +36,8 @@ dnl We go to great lengths to make sure that aclocal won't - dnl try to pull in the installed version of these macros - dnl when running aclocal in the glib directory. - dnl --m4_copy([AC_DEFUN],[glib_DEFUN]) --m4_copy([AC_REQUIRE],[glib_REQUIRE]) -+m4_copy_force([AC_DEFUN],[glib_DEFUN]) -+m4_copy_force([AC_REQUIRE],[glib_REQUIRE]) - dnl - dnl At the end, if we're not within glib, we'll define the public - dnl definitions in terms of our private definitions. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik <ekulik@redhat.com> -Date: Tue, 29 Jan 2019 09:50:46 +0100 -Subject: [PATCH 10/10] gdbus: Avoid printing null strings - -This mostly affects the 2.56 branch, but, given that GCC 9 is being -stricter about passing null string pointers to printf-like functions, it -might make sense to proactively fix such calls. - -gdbusauth.c: In function '_g_dbus_auth_run_server': -gdbusauth.c:1302:11: error: '%s' directive argument is null -[-Werror=format-overflow=] - 1302 | debug_print ("SERVER: WaitingForBegin, read '%s'", - line); - | - -gdbusmessage.c: In function ‘g_dbus_message_to_blob’: -gdbusmessage.c:2730:30: error: ‘%s’ directive argument is null [-Werror=format-overflow=] - 2730 | tupled_signature_str = g_strdup_printf ("(%s)", signature_str); - | - -diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c -index 1111111..2222222 100644 ---- a/gio/gdbusauth.c -+++ b/gio/gdbusauth.c -@@ -1295,9 +1295,9 @@ _g_dbus_auth_run_server (GDBusAuth *auth, - &line_length, - cancellable, - error); -- debug_print ("SERVER: WaitingForBegin, read '%s'", line); - if (line == NULL) - goto out; -+ debug_print ("SERVER: WaitingForBegin, read '%s'", line); - if (g_strcmp0 (line, "BEGIN") == 0) - { - /* YAY, done! */ -diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c -index 1111111..2222222 100644 ---- a/gio/gdbusmessage.c -+++ b/gio/gdbusmessage.c -@@ -2695,7 +2695,6 @@ g_dbus_message_to_blob (GDBusMessage *message, - if (message->body != NULL) - { - gchar *tupled_signature_str; -- tupled_signature_str = g_strdup_printf ("(%s)", signature_str); - if (signature == NULL) - { - g_set_error (error, -@@ -2703,10 +2702,10 @@ g_dbus_message_to_blob (GDBusMessage *message, - G_IO_ERROR_INVALID_ARGUMENT, - _("Message body has signature “%s” but there is no signature header"), - signature_str); -- g_free (tupled_signature_str); - goto out; - } -- else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) -+ tupled_signature_str = g_strdup_printf ("(%s)", signature_str); -+ if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) - { - g_set_error (error, - G_IO_ERROR,
--- a/src/glib-2-fixes.patch Mon Oct 09 11:28:54 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1428 - ---- a/glib/gtypes.h 2016-10-22 07:21:52.000000000 +0200 -+++ b/glib/gtypes.h 2020-05-17 11:13:49.369639688 +0200 -@@ -522,7 +522,7 @@ - # else /* !GLIB_STATIC_COMPILATION */ - # ifdef GLIB_COMPILATION - # ifdef DLL_EXPORT --# define GLIB_VAR __declspec(dllexport) -+# define GLIB_VAR extern __declspec(dllexport) - # else /* !DLL_EXPORT */ - # define GLIB_VAR extern - # endif /* !DLL_EXPORT */ ---- a/gobject/gparamspecs.h 2016-10-22 07:22:21.000000000 +0200 -+++ b/gobject/gparamspecs.h 2020-05-17 11:16:37.803281391 +0200 -@@ -1144,7 +1144,7 @@ - # else /* !GOBJECT_STATIC_COMPILATION */ - # ifdef GOBJECT_COMPILATION - # ifdef DLL_EXPORT --# define GOBJECT_VAR __declspec(dllexport) -+# define GOBJECT_VAR extern __declspec(dllexport) - # else /* !DLL_EXPORT */ - # define GOBJECT_VAR extern - # endif /* !DLL_EXPORT */
--- a/src/glib.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/glib.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,12 +3,12 @@ PKG := glib $(PKG)_IGNORE := -$(PKG)_VERSION := 2.58.0 -$(PKG)_CHECKSUM := c00e433c56e0ba3541abc5222aeca4136de10fb8 +$(PKG)_VERSION := 2.78.0 +$(PKG)_CHECKSUM := 664e2498cffb55016abfc3a4a0158ee2586d05d1 $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) $(PKG)_FILE := glib-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) -$(PKG)_DEPS := gettext pcre libiconv zlib libffi dbus +$(PKG)_DEPS := gettext pcre2 libiconv zlib libffi dbus build-meson define $(PKG)_UPDATE $(WGET) -q -O- 'https://github.com/GNOME/glib/tags' | \ @@ -17,69 +17,37 @@ head -1 endef -define $(PKG)_SYMLINK - $(LN_SF) `which glib-genmarshal` '$(HOST_BINDIR)' - $(LN_SF) `which glib-compile-schemas` '$(HOST_BINDIR)' - $(LN_SF) `which glib-compile-resources` '$(HOST_BINDIR)' +# FIXME: Should this be defined in the top-level Makefile? +ifeq ($(MXE_NATIVE_BUILD),yes) + MESON_TOOLCHAIN_FILE := $(HOST_PREFIX)/share/meson/native/mxe-conf.ini + $(PKG)_MESON_TOOLCHAIN_FILE := --native-file='$(MESON_TOOLCHAIN_FILE)' +else + MESON_TOOLCHAIN_FILE := $(HOST_PREFIX)/share/meson/cross/mxe-conf.ini + $(PKG)_MESON_TOOLCHAIN_FILE := --cross-file='$(MESON_TOOLCHAIN_FILE)' +endif + +ifeq ($(BUILD_SHARED),yes) + $(PKG)_MESON_CONFIG_FLAGS += -Ddefault_library=shared +else + $(PKG)_MESON_CONFIG_FLAGS += -Ddefault_library=static +endif + +define $(PKG)_BUILD + rm -f '$(HOST_BINDIR)/glib-*' + + PKG_CONFIG='$(MXE_PKG_CONFIG)' \ + PKG_CONFIG_PATH='$(PKG_CONFIG_PATH)' \ + meson setup --errorlogs \ + $($(PKG)_MESON_TOOLCHAIN_FILE) \ + --wrap-mode=nodownload \ + --prefix='$(HOST_PREFIX)' \ + -Dlibelf=disabled \ + -Dtests=false \ + -Dforce_posix_threads=true \ + $($(PKG)_MESON_CONFIG_FLAGS) \ + $(1)/.build $(1) + + ninja -C '$(1)/.build' -j '$(JOBS)' + ninja -C '$(1)/.build' -j '$(JOBS)' install endef -ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) -define $(PKG)_BUILD - cd $(1) && NOCONFIGURE=true ./autogen.sh - cd '$(1)' && PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(HOST_PREFIX)' \ - --with-threads=win32 \ - --enable-regex \ - --disable-threads \ - --disable-selinux \ - --disable-inotify \ - --disable-fam \ - --disable-xattr \ - --disable-dtrace \ - --disable-libmount \ - --with-libiconv=gnu \ - --with-pcre=internal \ - --disable-compile-warnings \ - && $(CONFIGURE_POST_HOOK) - - $(SED) -i 's,#define G_ATOMIC.*,,' '$(1)/config.h' - $(MAKE) -C '$(1)/glib' -j '$(JOBS)' - $(MAKE) -C '$(1)/gthread' -j '$(JOBS)' - $(MAKE) -C '$(1)/gmodule' -j '$(JOBS)' - $(MAKE) -C '$(1)/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec - $(MAKE) -C '$(1)/gio/xdgmime' -j '$(JOBS)' - $(MAKE) -C '$(1)/gio' -j '$(JOBS)' glib-compile-schemas - $(MAKE) -C '$(1)/gio' -j '$(JOBS)' glib-compile-resources - $(INSTALL) -m755 '$(1)/gio/glib-compile-schemas' '$(HOST_BINDIR)/' - $(INSTALL) -m755 '$(1)/gio/glib-compile-resources' '$(HOST_BINDIR)/' -endef -else -define $(PKG)_BUILD - cd '$(1)' && NOCONFIGURE=true ./autogen.sh - rm -f '$(HOST_BINDIR)/glib-*' - # cross build - cd '$(1)' && ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --prefix='$(HOST_PREFIX)' \ - --with-threads=win32 \ - --with-pcre=system \ - --with-libiconv=gnu \ - --disable-inotify \ - --disable-compile-warnings \ - PKG_CONFIG='$(MXE_PKG_CONFIG)' \ - PKG_CONFIG_PATH='$(PKG_CONFIG_PATH)' - - $(MAKE) -C '$(1)/glib' -j '$(JOBS)' install sbin_PROGRAMS= noinst_PROGRAMS= - $(MAKE) -C '$(1)/gmodule' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(MAKE) -C '$(1)/gthread' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(MAKE) -C '$(1)/gobject' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(MAKE) -C '$(1)/gio' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= MISC_STUFF= - $(MAKE) -C '$(1)' -j '$(JOBS)' install-pkgconfigDATA - $(MAKE) -C '$(1)/m4macros' install -endef - -endif
--- a/src/glpk-1-fixes.patch Mon Oct 09 11:28:54 2023 -0400 +++ b/src/glpk-1-fixes.patch Thu Oct 12 20:31:13 2023 +0200 @@ -90,20 +90,6 @@ +simplex/spydual.c ## eof ## -diff -ur glpk-4.65.orig/src/draft/glpmat.c glpk-4.65/src/draft/glpmat.c ---- glpk-4.65.orig/src/draft/glpmat.c 2019-02-20 15:21:37.117944413 -0500 -+++ glpk-4.65/src/draft/glpmat.c 2019-02-20 15:22:58.407893375 -0500 -@@ -25,8 +25,8 @@ - #include "env.h" - #include "glpmat.h" - #include "qmd.h" --#include "amd.h" --#include "colamd.h" -+#include <suitesparse/amd.h> -+#include <suitesparse/colamd.h> - - /*---------------------------------------------------------------------- - -- check_fvs - check sparse vector in full-vector storage format. diff -ur glpk-4.65.orig/src/env/stdc.c glpk-4.65/src/env/stdc.c --- glpk-4.65.orig/src/env/stdc.c 2019-02-20 15:29:18.821040444 -0500 +++ glpk-4.65/src/env/stdc.c 2019-02-20 15:40:06.948676811 -0500
--- a/src/gmp.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/gmp.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2.1 -$(PKG)_CHECKSUM := 2dcf34d4a432dbe6cce1475a835d20fe44f75822 +$(PKG)_VERSION := 6.3.0 +$(PKG)_CHECKSUM := 32d21c4fae046de45e8fce37bf4002236d283b71 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://gmplib.org/download/gmp/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gnuplot-2-qt6.patch Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,126 @@ +diff -ur gnuplot-5.2.8.orig/config/mingw/Makefile gnuplot-5.2.8/config/mingw/Makefile +--- gnuplot-5.2.8.orig/config/mingw/Makefile 2023-08-18 15:53:34.185447448 -0400 ++++ gnuplot-5.2.8/config/mingw/Makefile 2023-08-18 16:03:31.492411188 -0400 +@@ -463,11 +463,13 @@ + endif + + ifdef QT +- QT_LIBS = -lQt5Core -lQt5Gui -lQt5Network -lQt5Svg -lQt5Widgets -lQt5PrintSupport -lqtmain ++ QT_VERSION ?= 5 ++ QT_EXTRA_LIBS ?= -lqtmain ++ QT_LIBS = -lQt$(QT_VERSION)Core -lQt$(QT_VERSION)Gui -lQt$(QT_VERSION)Network -lQt$(QT_VERSION)Svg -lQt$(QT_VERSION)Widgets -lQt$(QT_VERSION)PrintSupport $(QT_EXTRA_LIBS) + QT_CXXFLAGS = -I$(QT_DIR)/include -I$(QT_DIR)/include/Qt -I$(QT_DIR)/include/QtCore -I$(QT_DIR)/include/QtGui + QT_CXXFLAGS += -I$(QT_DIR)/include/QtWidgets -I$(QT_DIR)/include/QtNetwork +- QT_CXXFLAGS += -I$(QT_DIR)/include/QtSvg -DQTGNUPLOT_DATA_DIR=\"$(GNUPLOT_QT_DIR)\" +- QT_LDFLAGS = -L$(QT_DIR)/lib ++ QT_CXXFLAGS += -I$(QT_DIR)/include/QtSvg -DQTGNUPLOT_DATA_DIR=\"$(GNUPLOT_QT_DIR)\" $(QT_EXTRA_CXXFLAGS) ++ QT_LDFLAGS = -L$(QT_DIR)/lib $(QT_EXTRA_LDFLAGS) + # + CFLAGS += -DQTTERM -DQT_NO_OPENGL + TERMLIBS += $(QT_LIBS) +diff -ur gnuplot-5.2.8.orig/src/qtterminal/qt_term.cpp gnuplot-5.2.8/src/qtterminal/qt_term.cpp +--- gnuplot-5.2.8.orig/src/qtterminal/qt_term.cpp 2023-08-18 15:53:34.166446304 -0400 ++++ gnuplot-5.2.8/src/qtterminal/qt_term.cpp 2023-08-18 16:05:08.522243654 -0400 +@@ -76,6 +76,7 @@ + #include "qt_term.h" + #include "QtGnuplotEvent.h" + #include "QtGnuplotApplication.h" ++#include <QTextCodec> + #include "qt_conversion.cpp" + + void qt_atexit(); +diff -ur gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotScene.cpp gnuplot-5.2.8/src/qtterminal/QtGnuplotScene.cpp +--- gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotScene.cpp 2023-08-19 07:00:17.830930697 -0400 ++++ gnuplot-5.2.8/src/qtterminal/QtGnuplotScene.cpp 2023-08-19 07:29:58.464228586 -0400 +@@ -649,7 +649,7 @@ + { + QFontMetrics metrics(m_font); + int par1 = (metrics.ascent() + metrics.descent()); +- int par2 = metrics.width("0123456789")/10.; ++ int par2 = metrics.horizontalAdvance("0123456789")/10.; + m_eventHandler->postTermEvent(GE_fontprops, 0, 0, par1, par2, m_widget); + } + else if (type == GEDone) +@@ -803,7 +803,7 @@ + + int button = 0; + if (event->button()== Qt::LeftButton) button = 1; +- else if (event->button()== Qt::MidButton) button = 2; ++ else if (event->button()== Qt::MiddleButton) button = 2; + else if (event->button()== Qt::RightButton) button = 3; + + m_eventHandler->postTermEvent(GE_buttonpress, +@@ -892,7 +892,7 @@ + + int button = 0; + if (event->button()== Qt::LeftButton) button = 1; +- else if (event->button()== Qt::MidButton) button = 2; ++ else if (event->button()== Qt::MiddleButton) button = 2; + else if (event->button()== Qt::RightButton) button = 3; + + qint64 time = 301; /* Only used the first time in, when timer not yet running */ +diff -ur gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotScene.h gnuplot-5.2.8/src/qtterminal/QtGnuplotScene.h +--- gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotScene.h 2023-08-19 07:00:17.831930754 -0400 ++++ gnuplot-5.2.8/src/qtterminal/QtGnuplotScene.h 2023-08-19 07:31:27.261363017 -0400 +@@ -51,7 +51,7 @@ + + #include <QGraphicsScene> + #include <QGraphicsItemGroup> +-#include <QTime> ++#include <QElapsedTimer> + + class QtGnuplotEnhanced; + class QtGnuplotWidget; +@@ -106,7 +106,7 @@ + QPoint m_currentBoxOrigin; + QPoint m_textOffset; + double m_currentZ; +- QTime m_watches[4]; ++ QElapsedTimer m_watches[4]; + int m_currentPlotNumber; + bool m_inKeySample; + bool m_preserve_visibility; +diff -ur gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotWidget.cpp gnuplot-5.2.8/src/qtterminal/QtGnuplotWidget.cpp +--- gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotWidget.cpp 2023-08-19 07:00:17.831930754 -0400 ++++ gnuplot-5.2.8/src/qtterminal/QtGnuplotWidget.cpp 2023-08-19 07:16:25.518277987 -0400 +@@ -128,7 +128,7 @@ + + void QtGnuplotWidget::setViewMatrix() + { +- m_view->resetMatrix(); ++ m_view->resetTransform(); + } + + void QtGnuplotWidget::processEvent(QtGnuplotEventType type, QDataStream& in) +@@ -146,7 +146,7 @@ + QSize s; + in >> s; + m_lastSizeRequest = s; +- m_view->resetMatrix(); ++ m_view->resetTransform(); + QWidget* viewport = m_view->viewport(); + /* qDebug() << "QtGnuplotWidget::processEvent Size request" << s << size() << " / viewport" << m_view->maximumViewportSize(); + qDebug() << " widget size " << size(); +@@ -291,8 +291,8 @@ + QPrinter printer; + printer.setOutputFormat(QPrinter::PdfFormat); + printer.setOutputFileName(fileName); +- printer.setPaperSize(QSizeF(m_scene->width(), m_scene->height()), QPrinter::Point); +- printer.setPageMargins(0, 0, 0, 0, QPrinter::Point); ++ printer.setPageSize(QPageSize(QSizeF(m_scene->width(), m_scene->height()), QPageSize::Point)); ++ printer.setPageMargins(QMarginsF(0,0,0,0), QPageLayout::Unit(QPrinter::Point)); + QPainter painter(&printer); + painter.setRenderHints(renderHints()); + m_scene->render(&painter); +diff -ur gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotItems.cpp gnuplot-5.2.8/src/qtterminal/QtGnuplotItems.cpp +--- gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotItems.cpp 2023-08-19 07:54:01.475635227 -0400 ++++ gnuplot-5.2.8/src/qtterminal/QtGnuplotItems.cpp 2023-08-19 07:56:36.531724069 -0400 +@@ -111,7 +111,7 @@ + qreal QtGnuplotEnhancedFragment::width() const + { + QFontMetricsF metrics(m_font); +- return metrics.width(m_text); ++ return metrics.horizontalAdvance(m_text); + } + + void QtGnuplotEnhancedFragment::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gnuplot-3-qt6-native.patch Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,133 @@ +From e458b88e481e8af4ef2d97c9af79fdf40e40ed81 Mon Sep 17 00:00:00 2001 +From: Ethan A Merritt <merritt@u.washington.edu> +Date: Sun, 30 Jul 2023 11:37:14 -0700 +Subject: [PATCH] configure: Check for Qt6, fall back to Qt5 + +Note: requires C++ -std=c++17 + +Note: requires Qt6 compatibility module Core5Compat + for class QTextCodec + codecForLocale() codecForMib() fromUnicode() toUnicode() + in order to support non-utf8 encodings (gnuplot's "set encoding"). + + This is not entirely satisfactory, since there is apparently not + a guarantee from Qt that the compatibility modules will continue + to be available in the future. + +./configure --with-qt=qt4 is still accepted but I no longer have +the Qt4 libraries installed to confirm that it works. +--- + configure.ac | 53 ++++++++++++++++++++++---------- + src/qtterminal/qt_conversion.cpp | 9 ++++++ + 2 files changed, 45 insertions(+), 17 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3f98c46d0..ca09c31d2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1065,29 +1065,48 @@ if test "${enable_qt}" = yes ; then + enable_qt_ok=no + fi + +- dnl First check for Qt5 +- if test "x${with_qt}" = "xqt5"; then +- try_qt4=no +- else ++ dnl Qt4 only by special request ++ if test "x${with_qt}" = "xqt4"; then + try_qt4=yes ++ else ++ try_qt4=no + fi ++ + if test "x${with_qt}" != "xqt4"; then +- PKG_CHECK_MODULES_NOFAIL(QT, [Qt5Core Qt5Gui Qt5Network Qt5Svg Qt5PrintSupport]) ++ AC_MSG_CHECKING([Checking for Qt6 support libraries]) ++ PKG_CHECK_MODULES_NOFAIL(QT, [Qt6Core Qt6Gui Qt6Network Qt6Svg Qt6PrintSupport Qt6Core5Compat]) + if test $pkg_failed = no; then +- try_qt4=no +- QT5LOC=`$PKG_CONFIG --variable=host_bins Qt5Core` +- if test "x${QT5LOC}" != "x"; then +- UIC=${QT5LOC}/uic +- MOC=${QT5LOC}/moc +- RCC=${QT5LOC}/rcc +- LRELEASE=${QT5LOC}/lrelease ++ QT6LOC=`$PKG_CONFIG --variable=host_bins Qt6Core` ++ if test "x${QT6LOC}" != "x"; then ++ UIC=${QT6LOC}/uic ++ MOC=${QT6LOC}/moc ++ RCC=${QT6LOC}/rcc ++ LRELEASE=${QT6LOC}/lrelease + fi + CXXFLAGS="$CXXFLAGS -fPIC" ++ AC_MSG_RESULT([The Qt terminal will use Qt6.]) ++ QTVER="6" ++ else ++ AC_MSG_CHECKING([Checking for Qt5 support libraries]) ++ PKG_CHECK_MODULES_NOFAIL(QT, [Qt5Core Qt5Gui Qt5Network Qt5Svg Qt5PrintSupport]) ++ if test $pkg_failed = no; then ++ QT5LOC=`$PKG_CONFIG --variable=host_bins Qt5Core` ++ if test "x${QT5LOC}" != "x"; then ++ UIC=${QT5LOC}/uic ++ MOC=${QT5LOC}/moc ++ RCC=${QT5LOC}/rcc ++ LRELEASE=${QT5LOC}/lrelease ++ fi ++ CXXFLAGS="$CXXFLAGS -fPIC" ++ AC_MSG_RESULT([The Qt terminal will use Qt5.]) ++ QTVER="5" ++ fi + fi + fi + +- dnl No Qt5, check for Qt4.5 or greater +- if test ${try_qt4} != no; then ++ dnl Explicit request for qt4 ++ if test ${try_qt4} = yes; then ++ AC_MSG_CHECKING([Checking for Qt4 support]) + PKG_CHECK_MODULES_NOFAIL(QT, [QtCore >= 4.5 QtGui >= 4.5 QtNetwork >= 4.5 QtSvg >= 4.5]) + if test $pkg_failed != no; then + enable_qt_ok=no +@@ -1170,9 +1189,6 @@ if test "${enable_qt}" = yes ; then + AC_MSG_WARN([The Qt terminal will use Qt4.]) + QTVER="4" + fi +- else +- AC_MSG_WARN([The Qt terminal will use Qt5.]) +- QTVER="5" + fi + fi + +@@ -1366,6 +1382,9 @@ if test "$enable_qt_ok" = yes; then + if test "$QTVER" = 5; then + AC_MSG_RESULT([ Qt : yes (qt5)]) + fi ++ if test "$QTVER" = 6; then ++ AC_MSG_RESULT([ Qt : yes (qt6)]) ++ fi + else + AC_MSG_RESULT([ Qt : no (use --with-qt or --with-qt=qt4 to enable]) + fi +diff --git a/src/qtterminal/qt_conversion.cpp b/src/qtterminal/qt_conversion.cpp +index cf8a20930..a50d357b8 100644 +--- a/src/qtterminal/qt_conversion.cpp ++++ b/src/qtterminal/qt_conversion.cpp +@@ -41,6 +41,15 @@ + * under either the GPL or the gnuplot license. + ]*/ + ++/* ++ * Qt6 no longer supports other 8-bit encodings natively, relegating the ++ * QTextCodec functions to a compatibility module Core5Compat. ++ * FIXME: roll our own? ++ */ ++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) ++ #include <QTextCodec> ++#endif ++ + static QColor qt_colorList[12] = + { + Qt::white, +-- +2.38.0.windows.1 +
--- a/src/gnuplot.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/gnuplot.mk Thu Oct 12 20:31:13 2023 +0200 @@ -18,9 +18,15 @@ $(PKG)_EXTRAFLAGS += WXT=1 WX_CONFIG=$(MXE_TOOL_PREFIX)wx-config endif -ifeq ($(ENABLE_QT5),yes) +ifeq ($(ENABLE_QT),5) $(PKG)_DEPS += qt5 $(PKG)_EXTRAFLAGS += QT=1 QT_DIR="$(HOST_PREFIX)/qt5" QT_BIN_DIR="$(BUILD_TOOLS_PREFIX)/bin" + $(PKG)_STDVER := -std=gnu++11 +endif +ifeq ($(ENABLE_QT),6) + $(PKG)_DEPS += qt6 + $(PKG)_EXTRAFLAGS += QT=1 QT_VERSION=6 QT_DIR="$(HOST_PREFIX)/qt6" QT_EXTRA_CXXFLAGS="-I$(HOST_PREFIX)/qt6/include/QtCore5Compat" QT_BIN_DIR="$(BUILD_TOOLS_PREFIX)/bin" QT_EXTRA_LIBS=-lQt6Core5Compat UIC=$(MXE_UIC) MOC=$(MXE_MOC) QMAKE=$(MXE_QMAKE) RCC=$(MXE_RCC) + $(PKG)_STDVER := -std=gnu++17 endif ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) @@ -35,16 +41,16 @@ ifeq ($(MXE_SYSTEM),mingw) define $(PKG)_BUILD - make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX) -std=gnu++11' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe - make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX) -std=gnu++11' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe + make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX) $($(PKG)_STDVER)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe + make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX) $($(PKG)_STDVER)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe $(INSTALL) -d '$(3)$(HOST_BINDIR)' $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(3)$(HOST_BINDIR)' $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(3)$(HOST_BINDIR)' $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(3)$(HOST_BINDIR)' - if [ "$(ENABLE_QT5)" == "yes" ]; then \ - make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX) -std=gnu++11' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot_qt.exe gnuplot_qt.exe; \ + if [ "$(ENABLE_QT)" != "4" ]; then \ + make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX) $($(PKG)_STDVER)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot_qt.exe gnuplot_qt.exe; \ $(INSTALL) -m755 '$(1)/config/mingw/gnuplot_qt.exe' '$(3)$(HOST_BINDIR)'; \ fi @@ -96,11 +102,33 @@ env -u MAKE -u MAKEFLAGS nmake DESTDIR=$(shell (cd '$(HOST_PREFIX)' && pwd -W) | sed -e 's#/#\\\\#g') && \ env -u MAKE -u MAKEFLAGS nmake DESTDIR=$(shell (cd '$(3)$(HOST_PREFIX)' && pwd -W) | sed -e 's#/#\\\\#g') install endef + else + +## If we allow the system Qt libraries to be used, then these +## won't make sense. +$(PKG)_QT_CONFIGURE_OPTIONS := \ + MOC=$(MXE_MOC) \ + UIC=$(MXE_UIC) \ + RCC=$(MXE_RCC) \ + LRELEASE=$(MXE_LRELEASE) + +ifeq ($(ENABLE_QT),5) + $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" + $(PKG)_QT_CONFIGURE_OPTIONS += --with-qt=qt5 +endif +ifeq ($(ENABLE_QT),6) + $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt6/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" + $(PKG)_QT_CONFIGURE_OPTIONS += --with-qt=qt6 +endif + define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(1)' && autoreconf -fi && PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \ + ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) LIBS=-liconv \ - --without-lua --prefix='$(HOST_PREFIX)' + --without-lua \ + $($(PKG)_QT_CONFIGURE_OPTIONS) \ + --prefix='$(HOST_PREFIX)' make -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)' endef endif
--- a/src/graphicsmagick.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/graphicsmagick.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,12 +3,15 @@ PKG := graphicsmagick $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.39 -$(PKG)_CHECKSUM := 03f85f866d2a6e1466518bd85f4460f3ab328886 +$(PKG)_VERSION := 1.3.42 +$(PKG)_CHECKSUM := a48ec3fa59d9ca0915e1e6f78fd8bda55e9e0c6f $(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION) $(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := zlib bzip2 libjbig jpeg jasper lcms libpng tiff freetype libxml2 +ifeq ($(MXE_SYSTEM),mingw) + $(PKG)_DEPS += transfig +endif ifneq ($(MXE_SYSTEM),msvc) $(PKG)_DEPS += pthreads libtool endif
--- a/src/hdf5.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/hdf5.mk Thu Oct 12 20:31:13 2023 +0200 @@ -81,6 +81,7 @@ -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \ -DHDF5_ENABLE_SZIP_SUPPORT=OFF \ -DHDF5_ENABLE_SZIP_ENCODING=OFF \ + -DHDF5_BUILD_DOC=OFF \ -DBUILD_TESTING=OFF \ $($(PKG)_CROSS_CONFIG_OPTIONS) \ -DHDF5_USE_PREGEN_DIR='$(1)/pregen'
--- a/src/icu4c.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/icu4c.mk Thu Oct 12 20:31:13 2023 +0200 @@ -1,10 +1,10 @@ PKG := icu4c $(PKG)_IGNORE := -$(PKG)_VERSION := 72.1 -$(PKG)_CHECKSUM := a97546f0119c37a3526143bc29fb573a4417ff84 -$(PKG)_SUBDIR := icu -$(PKG)_FILE := $(PKG)-$(subst .,_,$($(PKG)_VERSION))-src.tgz -$(PKG)_URL := https://github.com/unicode-org/icu/releases/download/release-$(subst .,-,$($(PKG)_VERSION))/$($(PKG)_FILE) +$(PKG)_VERSION := 73.2 +$(PKG)_CHECKSUM := 89da11263da991336632cae52a5226334198a64c +$(PKG)_SUBDIR := icu-release-$(subst .,-,$($(PKG)_VERSION))/icu4c +$(PKG)_FILE := $(PKG)-$(subst .,-,$($(PKG)_VERSION)).tar.gz +$(PKG)_URL := https://github.com/unicode-org/icu/archive/refs/tags/release-$(subst .,-,$($(PKG)_VERSION)).tar.gz $(PKG)_DEPS := define $(PKG)_UPDATE
--- a/src/lcms.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/lcms.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := lcms $(PKG)_IGNORE := -$(PKG)_VERSION := 2.14 -$(PKG)_CHECKSUM := 94350a2638fe58da736e8726048c859b46a69e6f +$(PKG)_VERSION := 2.15 +$(PKG)_CHECKSUM := b143ff29b03676119dbca30f13cbed72af15cce8 $(PKG)_SUBDIR := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)) $(PKG)_FILE := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
--- a/src/libgcrypt.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libgcrypt.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10.1 -$(PKG)_CHECKSUM := de2cc32e7538efa376de7bf5d3eafa85626fb95f +$(PKG)_VERSION := 1.10.2 +$(PKG)_CHECKSUM := 0b9555960d84a09ea14e52360808f2e02e9c12d2 $(PKG)_SUBDIR := libgcrypt-$($(PKG)_VERSION) $(PKG)_FILE := libgcrypt-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/$($(PKG)_FILE)
--- a/src/libgpg_error.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libgpg_error.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := libgpg_error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.46 -$(PKG)_CHECKSUM := a6e5efdd72e848aab4064e5ef4c6835ba344bcf1 +$(PKG)_VERSION := 1.47 +$(PKG)_CHECKSUM := 94668233fd7bd8e7c0ec5e363134cd53c575da60 $(PKG)_SUBDIR := libgpg-error-$($(PKG)_VERSION) $(PKG)_FILE := libgpg-error-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE)
--- a/src/libntlm.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libntlm.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,18 +3,17 @@ PKG := libntlm $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3 -$(PKG)_CHECKSUM := 5dd798d5fb9a75656225052aa88ceb9befbbd4a0 +$(PKG)_VERSION := 1.6 +$(PKG)_CHECKSUM := d6f9b69f154d82d0f9a49e9686b79fc03f21c3c6 $(PKG)_SUBDIR := libntlm-$($(PKG)_VERSION) $(PKG)_FILE := libntlm-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.nongnu.org/libntlm/releases/$($(PKG)_FILE) +$(PKG)_URL := https://download.savannah.nongnu.org/releases/libntlm/$($(PKG)_FILE) $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=libntlm.git;a=tags' | \ - grep '<a class="list subject"' | \ - $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \ - head -1 + $(WGET) -q -O- 'https://download.savannah.nongnu.org/releases/libntlm/' | \ + $(SED) -n 's,.*libntlm-\([0-9]\+\)\(\.[0-9]\+\)*\..*,\1\2,p' |\ + tail -1 endef define $(PKG)_BUILD
--- a/src/libpaper.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libpaper.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := libpaper $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.28 -$(PKG)_CHECKSUM := c6583fbdaebe091d11d81c4e59514e58996f22ba +$(PKG)_VERSION := 1.1.29 +$(PKG)_CHECKSUM := 2152e07102931b0488a53b4fcad921aa02c5034b $(PKG)_SUBDIR := libpaper-$($(PKG)_VERSION) $(PKG)_FILE := libpaper_$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.debian.org/debian/pool/main/libp/$(PKG)/$($(PKG)_FILE)
--- a/src/libpng.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libpng.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.39 -$(PKG)_CHECKSUM := 3f2386d61eccae211ec4f57899e4ac2ca60d390b +$(PKG)_VERSION := 1.6.40 +$(PKG)_CHECKSUM := 1c37609e3f0740ae52ca9e2a6adfc9743497b870 $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(subst .,,$(call SHORT_PKG_VERSION,$(PKG)))/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/libsndfile.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libsndfile.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,12 +3,12 @@ PKG := libsndfile $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.0 -$(PKG)_CHECKSUM := 48050964a229bc53cd3e6134caedce27802f75c7 +$(PKG)_VERSION := 1.2.2 +$(PKG)_CHECKSUM := 28acc1c19b06c18f38f906d7efef404b2078a19a $(PKG)_SUBDIR := libsndfile-$($(PKG)_VERSION) $(PKG)_FILE := libsndfile-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/$(PKG)/$(PKG)/archive/$($(PKG)_VERSION).tar.gz -$(PKG)_DEPS := sqlite flac mpg123 ogg opus vorbis +$(PKG)_DEPS := sqlite flac lame mpg123 ogg opus vorbis define $(PKG)_UPDATE $(call GITHUB_PKG_UPDATE,libsndfile,libsndfile,[v]*) @@ -33,5 +33,4 @@ if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ rm -rf '$(3)$(HOST_PREFIX)/share/doc/$(PKG)'; \ fi - endef
--- a/src/libsodium.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libsodium.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := libsodium $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.18 -$(PKG)_CHECKSUM := cd8a76b79aeb077e8d3eea478ea6241972593dfd +$(PKG)_VERSION := 1.0.19 +$(PKG)_CHECKSUM := d7b35afe5ae7995e3ef22605093cfadd5ce41afa $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/jedisct1/$(PKG)/archive/$($(PKG)_VERSION).tar.gz
--- a/src/libssh2.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libssh2.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,13 +3,17 @@ PKG := libssh2 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10.0 -$(PKG)_CHECKSUM := 2ebb3bc5c944090ade840f3a0ada9874eced979b +$(PKG)_VERSION := 1.11.0 +$(PKG)_CHECKSUM := fbdb4751a4bc93e895e9c3426f7f80b437d250fe $(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION) $(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.libssh2.org/download/$($(PKG)_FILE) $(PKG)_DEPS := libgcrypt zlib +ifeq ($(MXE_SYSTEM),mingw) + $(PKG)_CONFIGURE_OPTIONS := --disable-rpath +endif + define $(PKG)_UPDATE $(WGET) -q -O- 'https://www.libssh2.org/download/?C=M;O=D' | \ grep 'libssh2-' | \ @@ -20,6 +24,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $($(PKG)_CONFIGURE_OPTIONS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \
--- a/src/libusb.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libusb.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := libusb $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.6.0 -$(PKG)_CHECKSUM := 6b90d083e4aee2fa0edbf18dec79d40afe9ded7d +$(PKG)_VERSION := 1.2.7.3 +$(PKG)_CHECKSUM := 7e5327f8fbf872b8adf02f2ef42401c8fcfe32e3 $(PKG)_SUBDIR := $(PKG)-win32-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-win32-src-$($(PKG)_VERSION).zip $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)-win32/$(PKG)-win32-releases/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/libvpx.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libvpx.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := libvpx $(PKG)_IGNORE := -$(PKG)_VERSION := 1.12.0 -$(PKG)_CHECKSUM := e5f344d28752344d4c6e0c83b055093932b8d2c9 +$(PKG)_VERSION := 1.13.1 +$(PKG)_CHECKSUM := abde9c00ecb478e5740837f96fe8b71e2e029b03 $(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
--- a/src/libwebp.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libwebp.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := libwebp $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.4 -$(PKG)_CHECKSUM := 24586e2a8e01a9cced102d68852661b964502429 +$(PKG)_VERSION := 1.3.2 +$(PKG)_CHECKSUM := f941661a869df7347d7ca9208acb4e6d41f614de $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$($(PKG)_FILE)
--- a/src/libxml2.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/libxml2.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.10.3 -$(PKG)_CHECKSUM := 18aa1ab0caf4ca8b092613acac992a33fa432311 +$(PKG)_VERSION := 2.11.5 +$(PKG)_CHECKSUM := 7322b493661ab44a220f6e255c9cea33ae040300 $(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) @@ -14,6 +14,10 @@ $(PKG)_DEPS := xz endif +ifneq ($(MXE_SYSTEM),linux) + $(PKG)_CONFIGURE_OPTIONS := ac_cv_search_iconv=-liconv +endif + define $(PKG)_UPDATE $(WGET) -q -O- https://gitlab.gnome.org/GNOME/libxml2/tags | \ $(SED) -n 's|.*/tags/v\([^"]*\).*|\1|p' | grep -v 'rc' | $(SORT) -V | \ @@ -26,6 +30,7 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ + $($(PKG)_CONFIGURE_OPTIONS) \ --without-debug \ --prefix='$(HOST_PREFIX)' \ --with-zlib='$(HOST_PREFIX)' \
--- a/src/llvm.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/llvm.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,18 +3,15 @@ PKG := llvm $(PKG)_IGNORE := -$(PKG)_VERSION := 15.0.6 -$(PKG)_CHECKSUM := 60e9a385dde9a10e6ef7009ce342a119d3432eef +$(PKG)_VERSION := 15.0.7 +$(PKG)_CHECKSUM := 497ca3b2010cc0e3e38bc9dc6dda19041dbd7066 $(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) $(PKG)_DEPS := build-cmake build-ninja build-python define $(PKG)_UPDATE - wget -q -O- 'http://releases.llvm.org/download.html?' | \ - grep 'Download LLVM' | \ - $(SED) -n 's,.*LLVM \([0-9][^<]*\).*,\1,p' | \ - head -1 + $(call GITHUB_PKG_UPDATE,llvm,llvm-project,llvmorg-) endef ifeq ($(MXE_NATIVE_BUILD),yes)
--- a/src/lua.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/lua.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := lua $(PKG)_IGNORE := -$(PKG)_VERSION := 5.4.4 -$(PKG)_CHECKSUM := 03c27684b9d5d9783fb79a7c836ba1cdc5f309cd +$(PKG)_VERSION := 5.4.6 +$(PKG)_CHECKSUM := 83f41abf92620dd15f022e6f863807b07e318495 $(PKG)_SUBDIR := lua-$($(PKG)_VERSION) $(PKG)_FILE := lua-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lua.org/ftp/$($(PKG)_FILE)
--- a/src/mesa.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/mesa.mk Thu Oct 12 20:31:13 2023 +0200 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := mesa -$(PKG)_VERSION := 22.3.2 -$(PKG)_CHECKSUM := 3074a9fba66f4d3788384721c0089f93d5afa1b3 +$(PKG)_VERSION := 23.2.1 +$(PKG)_CHECKSUM := ff0c9a72acdc1547b60cdedbf2bad4fefe0f1983 $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE) @@ -26,7 +26,7 @@ $(PKG)_MESON_TOOLCHAIN_FILE := --cross-file '$(MESON_TOOLCHAIN_FILE)' else ifeq ($(USE_SYSTEM_X11_LIBS),no) - $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext xfixes + $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext xfixes xrandr $(PKG)_BUILD_X11_LIBS_FLAGS = -Dxlib-lease=disabled else $(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$(BUILD_PKG_CONFIG_PATH) @@ -38,7 +38,6 @@ $(PKG)_X11_FLAGS := -Dplatforms='x11' \ -Dglx=xlib \ - -Ddri-drivers='' \ $($(PKG)_BUILD_X11_LIBS_FLAGS) endif @@ -68,4 +67,10 @@ if [ x$(MXE_NATIVE_BUILD) == xno ]; then \ rm -f $(3)$(HOST_LIBDIR)/opengl32.dll.a; \ fi + + # provide s/w backup opengl + if [ x$(MXE_WINDOWS_BUILD) == xyes ]; then \ + $(INSTALL) "$(3)/$(HOST_BINDIR)/opengl32.dll" "$(3)/$(HOST_BINDIR)/opengl32sw.dll"; \ + fi + endef
--- a/src/mingw-cfitsio-1-fixes.patch Mon Oct 09 11:28:54 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -ur cfitsio-4.1.0.orig/configure.in cfitsio-4.1.0/configure.in ---- cfitsio-4.1.0.orig/configure.in 2022-05-26 08:43:32.205001801 -0400 -+++ cfitsio-4.1.0/configure.in 2022-05-26 08:44:53.020552448 -0400 -@@ -489,7 +489,7 @@ - if test "x$ADD_CURL" = xyes; then - # Use curl-config to get compiler & linker flags, if available. - AC_CHECK_PROG([CURLCONFIG], [curl-config], [curl-config], [], [], []) -- if test "x$CURLCONFIG" != x; then -+ if test "x$CURLCONFIG" != x && test "x$CURLCONFIG" != "xnone"; then - CURL_LIB=`$CURLCONFIG --libs` - CURL_INC=`$CURLCONFIG --cflags` - if test "x$CURL_LIB" != x; then
--- a/src/mingw-w64-complex-inverse-trig.patch Mon Oct 09 11:28:54 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,333 +0,0 @@ -From 59fd6e6ab7c93545175fa6ff46532b7a80dbdbfb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> -Date: Sat, 23 Jul 2022 15:30:46 +0200 -Subject: [PATCH 1/2] casinh: Use approximation for large input. - ---- - mingw-w64-crt/complex/casinh.def.h | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/mingw-w64-crt/complex/casinh.def.h b/mingw-w64-crt/complex/casinh.def.h -index 050d885a0..cce2d864e 100644 ---- a/mingw-w64-crt/complex/casinh.def.h -+++ b/mingw-w64-crt/complex/casinh.def.h -@@ -87,6 +87,27 @@ __FLT_ABI(casinh) (__FLT_TYPE __complex__ z) - if (r_class == FP_ZERO && i_class == FP_ZERO) - return z; - -+ /* casinh(z) = log(z + sqrt(z*z + 1)) */ -+ -+ if (__FLT_ABI(fabs) (__real__ z) >= __FLT_CST(1.0)/__FLT_EPSILON -+ || __FLT_ABI(fabs) (__imag__ z) >= __FLT_CST(1.0)/__FLT_EPSILON) -+ { -+ /* For large z, z + sqrt(z*z + 1) is approximately 2*z. -+ Use that approximation to avoid overflow when squaring. -+ Additionally, use symmetries to perform the calculation in the first -+ quadrant. */ -+ __real__ x = __FLT_ABI(fabs) (__real__ z); -+ __imag__ x = __FLT_ABI(fabs) (__imag__ z); -+ x = __FLT_ABI(clog) (x); -+ __real__ x += M_LN2; -+ -+ /* adjust signs for input quadrant */ -+ __real__ ret = __FLT_ABI(copysign) (__real__ x, __real__ z); -+ __imag__ ret = __FLT_ABI(copysign) (__imag__ x, __imag__ z); -+ -+ return ret; -+ } -+ - __real__ x = (__real__ z - __imag__ z) * (__real__ z + __imag__ z) + __FLT_CST(1.0); - __imag__ x = __FLT_CST(2.0) * __real__ z * __imag__ z; - --- -2.35.3.windows.1 - -From 4b5a229573ca98a622cc15d20bd561dbaec9bbfc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> -Date: Sat, 23 Jul 2022 18:01:29 +0200 -Subject: [PATCH 2/2] cacosh: Use approximation for large input. - ---- - mingw-w64-crt/complex/cacosh.def.h | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/mingw-w64-crt/complex/cacosh.def.h b/mingw-w64-crt/complex/cacosh.def.h -index f4ea2da07..a3edd5288 100644 ---- a/mingw-w64-crt/complex/cacosh.def.h -+++ b/mingw-w64-crt/complex/cacosh.def.h -@@ -80,6 +80,27 @@ __FLT_ABI(cacosh) (__FLT_TYPE __complex__ z) - return ret; - } - -+ /* cacosh(z) = log(z + sqrt(z*z - 1)) */ -+ -+ if (__FLT_ABI(fabs) (__real__ z) >= __FLT_CST(1.0)/__FLT_EPSILON -+ || __FLT_ABI(fabs) (__imag__ z) >= __FLT_CST(1.0)/__FLT_EPSILON) -+ { -+ /* For large z, z + sqrt(z*z - 1) is approximately 2*z. -+ Use that approximation to avoid overflow when squaring. -+ Additionally, use symmetries to perform the calculation in the positive -+ half plane. */ -+ __real__ x = __real__ z; -+ __imag__ x = __FLT_ABI(fabs) (__imag__ z); -+ x = __FLT_ABI(clog) (x); -+ __real__ x += M_LN2; -+ -+ /* adjust signs for input */ -+ __real__ ret = __real__ x; -+ __imag__ ret = __FLT_ABI(copysign) (__imag__ x, __imag__ z); -+ -+ return ret; -+ } -+ - __real__ x = (__real__ z - __imag__ z) * (__real__ z + __imag__ z) - __FLT_CST(1.0); - __imag__ x = __FLT_CST(2.0) * __real__ z * __imag__ z; - --- -2.35.3.windows.1 - -From 9fcac91fc50120a5e6acfa94ba0a917c7faf2306 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> -Date: Fri, 5 Aug 2022 18:36:49 +0200 -Subject: [PATCH] cacosh: Handle negative zero input - ---- - mingw-w64-crt/complex/cacosh.def.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mingw-w64-crt/complex/cacosh.def.h b/mingw-w64-crt/complex/cacosh.def.h -index 1f03befae..addf2958e 100644 ---- a/mingw-w64-crt/complex/cacosh.def.h -+++ b/mingw-w64-crt/complex/cacosh.def.h -@@ -106,7 +106,7 @@ __FLT_ABI(cacosh) (__FLT_TYPE __complex__ z) - - x = __FLT_ABI(csqrt) (x); - -- if (__real__ z < __FLT_CST(0.0)) -+ if (signbit (__real__ z)) - x = -x; - - __real__ x += __real__ z; -@@ -114,7 +114,7 @@ __FLT_ABI(cacosh) (__FLT_TYPE __complex__ z) - - ret = __FLT_ABI(clog) (x); - -- if (__real__ ret < __FLT_CST(0.0)) -+ if (signbit (__real__ ret)) - ret = -ret; - - return ret; --- -2.35.3.windows.1 - -From cddd2eb87270f368d18f79a1070a36e4dc5464eb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> -Date: Mon, 8 Aug 2022 18:01:32 +0200 -Subject: [PATCH 1/3] casinh: Use symmetries also for default case. - ---- - mingw-w64-crt/complex/casinh.def.h | 47 +++++++++++++++++------------- - 1 file changed, 26 insertions(+), 21 deletions(-) - -diff --git a/mingw-w64-crt/complex/casinh.def.h b/mingw-w64-crt/complex/casinh.def.h -index cce2d864e..40ff67579 100644 ---- a/mingw-w64-crt/complex/casinh.def.h -+++ b/mingw-w64-crt/complex/casinh.def.h -@@ -47,6 +47,7 @@ __FLT_ABI(casinh) (__FLT_TYPE __complex__ z) - { - __complex__ __FLT_TYPE ret; - __complex__ __FLT_TYPE x; -+ __FLT_TYPE arz, aiz; - int r_class = fpclassify (__real__ z); - int i_class = fpclassify (__imag__ z); - -@@ -89,32 +90,36 @@ __FLT_ABI(casinh) (__FLT_TYPE __complex__ z) - - /* casinh(z) = log(z + sqrt(z*z + 1)) */ - -- if (__FLT_ABI(fabs) (__real__ z) >= __FLT_CST(1.0)/__FLT_EPSILON -- || __FLT_ABI(fabs) (__imag__ z) >= __FLT_CST(1.0)/__FLT_EPSILON) -+ /* Use symmetries to perform the calculation in the first quadrant. */ -+ arz = __FLT_ABI(fabs) (__real__ z); -+ aiz = __FLT_ABI(fabs) (__imag__ z); -+ -+ if (arz >= __FLT_CST(1.0)/__FLT_EPSILON -+ || aiz >= __FLT_CST(1.0)/__FLT_EPSILON) - { - /* For large z, z + sqrt(z*z + 1) is approximately 2*z. -- Use that approximation to avoid overflow when squaring. -- Additionally, use symmetries to perform the calculation in the first -- quadrant. */ -- __real__ x = __FLT_ABI(fabs) (__real__ z); -- __imag__ x = __FLT_ABI(fabs) (__imag__ z); -- x = __FLT_ABI(clog) (x); -- __real__ x += M_LN2; -- -- /* adjust signs for input quadrant */ -- __real__ ret = __FLT_ABI(copysign) (__real__ x, __real__ z); -- __imag__ ret = __FLT_ABI(copysign) (__imag__ x, __imag__ z); -- -- return ret; -+ Use that approximation to avoid overflow when squaring. */ -+ __real__ x = arz; -+ __imag__ x = aiz; -+ ret = __FLT_ABI(clog) (x); -+ __real__ ret += M_LN2; - } -+ else -+ { -+ __real__ x = (arz - aiz) * (arz + aiz) + __FLT_CST(1.0); -+ __imag__ x = __FLT_CST(2.0) * arz * aiz; -+ -+ x = __FLT_ABI(csqrt) (x); - -- __real__ x = (__real__ z - __imag__ z) * (__real__ z + __imag__ z) + __FLT_CST(1.0); -- __imag__ x = __FLT_CST(2.0) * __real__ z * __imag__ z; -+ __real__ x += arz; -+ __imag__ x += aiz; - -- x = __FLT_ABI(csqrt) (x); -+ ret = __FLT_ABI(clog) (x); -+ } - -- __real__ x += __real__ z; -- __imag__ x += __imag__ z; -+ /* adjust signs for input quadrant */ -+ __real__ ret = __FLT_ABI(copysign) (__real__ ret, __real__ z); -+ __imag__ ret = __FLT_ABI(copysign) (__imag__ ret, __imag__ z); - -- return __FLT_ABI(clog) (x); -+ return ret; - } --- -2.35.3.windows.1 - -From f309692d67674526ec9a87ecae527cb6c207cf93 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> -Date: Mon, 8 Aug 2022 18:02:40 +0200 -Subject: [PATCH 2/3] casinh: Use approximations for small real part and - absolute imaginary part < 1 - ---- - mingw-w64-crt/complex/casinh.def.h | 31 ++++++++++++++++++++++++++++++ - 1 file changed, 31 insertions(+) - -diff --git a/mingw-w64-crt/complex/casinh.def.h b/mingw-w64-crt/complex/casinh.def.h -index 40ff67579..8d61b1399 100644 ---- a/mingw-w64-crt/complex/casinh.def.h -+++ b/mingw-w64-crt/complex/casinh.def.h -@@ -104,6 +104,37 @@ __FLT_ABI(casinh) (__FLT_TYPE __complex__ z) - ret = __FLT_ABI(clog) (x); - __real__ ret += M_LN2; - } -+ else if (arz <= __FLT_EPSILON && aiz < __FLT_CST(1.0)) -+ { -+ /* Taylor series expansion around arz=0 for z + sqrt(z*z + 1): -+ c = arz + sqrt(1-aiz^2) + i*(aiz + arz*aiz / sqrt(1-aiz^2)) + O(arz^2) -+ Identity: clog(c) = log(|c|) + i*arg(c) -+ For real part of result: -+ |c| = 1 + arz / sqrt(1-aiz^2) + O(arz^2) (Taylor series expansion) -+ For imaginary part of result: -+ c = (arz + sqrt(1-aiz^2))/sqrt(1-aiz^2) * (sqrt(1-aiz^2) + i*aiz) + O(arz^6) -+ */ -+ __FLT_TYPE s1maiz2 = __FLT_ABI(sqrt) ((__FLT_CST(1.0)+aiz)*(__FLT_CST(1.0)-aiz)); -+ __real__ ret = __FLT_ABI(log1p) (arz / s1maiz2); -+ __imag__ ret = __FLT_ABI(atan2) (aiz, s1maiz2); -+ } -+ else if (arz*arz <= __FLT_EPSILON && aiz < __FLT_CST(1.0)) -+ { -+ /* Taylor series expansion around arz=0 for z + sqrt(z*z + 1): -+ c = arz + sqrt(1-aiz^2) + arz^2 / (2*(1-aiz^2)^(3/2)) + i*(aiz + arz*aiz / sqrt(1-aiz^2)) + O(arz^4) -+ Identity: clog(c) = log(|c|) + i*arg(c) -+ For real part of result: -+ |c| = 1 + arz / sqrt(1-aiz^2) + arz^2/(2*(1-aiz^2)) + O(arz^3) (Taylor series expansion) -+ For imaginary part of result: -+ c = 1/sqrt(1-aiz^2) * ((1-aiz^2) + arz*sqrt(1-aiz^2) + arz^2/(2*(1-aiz^2)) + i*aiz*(sqrt(1-aiz^2)+arz)) + O(arz^3) -+ */ -+ __FLT_TYPE onemaiz2 = (__FLT_CST(1.0)+aiz)*(__FLT_CST(1.0)-aiz); -+ __FLT_TYPE s1maiz2 = __FLT_ABI(sqrt) (onemaiz2); -+ __FLT_TYPE arz2red = arz * arz / __FLT_CST(2.0) / s1maiz2; -+ __real__ ret = __FLT_ABI(log1p) ((arz + arz2red) / s1maiz2); -+ __imag__ ret = __FLT_ABI(atan2) (aiz * (s1maiz2 + arz), -+ onemaiz2 + arz*s1maiz2 + arz2red); -+ } - else - { - __real__ x = (arz - aiz) * (arz + aiz) + __FLT_CST(1.0); --- -2.35.3.windows.1 - -From b2ad7c96b759e8bc3af504018b70c91c8b0f135c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> -Date: Mon, 8 Aug 2022 18:03:49 +0200 -Subject: [PATCH 3/3] catanh: Use approximations for small real part - ---- - mingw-w64-crt/complex/catanh.def.h | 37 +++++++++++++++++++++++++----- - 1 file changed, 31 insertions(+), 6 deletions(-) - -From 7589dfe1f5478a3ba7b93ea6dc28fc0ffd271f12 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> -Date: Mon, 8 Aug 2022 18:26:20 +0200 -Subject: [PATCH 3/3] catanh: Use approximations for small real part - ---- - mingw-w64-crt/complex/catanh.def.h | 37 +++++++++++++++++++++++++----- - 1 file changed, 31 insertions(+), 6 deletions(-) - -diff --git a/mingw-w64-crt/complex/catanh.def.h b/mingw-w64-crt/complex/catanh.def.h -index 68949d139..1d46d4dcd 100644 ---- a/mingw-w64-crt/complex/catanh.def.h -+++ b/mingw-w64-crt/complex/catanh.def.h -@@ -75,17 +75,42 @@ __FLT_ABI(catanh) (__FLT_TYPE __complex__ z) - if (r_class == FP_ZERO && i_class == FP_ZERO) - return z; - -+ /* catanh(z) = 1/2 * clog(1+z) - 1/2 * clog(1-z) = 1/2 * clog((1+z)/(1-z)) */ -+ -+ /* Use identity clog(c) = 1/2*log(|c|^2) + i*arg(c) to calculate real and -+ imaginary parts separately. */ -+ -+ /* real part */ -+ /* |c|^2 = (Im(z)^2 + (1+Re(z))^2)/(Im(z)^2 + (1-Re(z))^2) */ - i2 = __imag__ z * __imag__ z; - -- n = __FLT_CST(1.0) + __real__ z; -- n = i2 + n * n; -+ if (__FLT_ABI(fabs) (__real__ z) <= __FLT_EPSILON) -+ { -+ /* |c|^2 = 1 + 4*Re(z)/(1+Im(z)^2) + O(Re(z)^2) (Taylor series) */ -+ __real__ ret = __FLT_CST(0.25) * -+ __FLT_ABI(log1p) (__FLT_CST(4.0)*(__real__ z) / (__FLT_CST(1.0) + i2)); -+ } -+ else if ((__real__ z)*(__real__ z) <= __FLT_EPSILON) -+ { -+ /* |c|^2 = 1 + 4*Re(z)/(1+Im(z)^2) + 8*Re(z)^2/(1+Im(z)^2)^2 + O(Re(z)^3) (Taylor series) */ -+ d = __real__ z / (__FLT_CST(1.0) + i2); -+ __real__ ret = __FLT_CST(0.25) * -+ __FLT_ABI(log1p) (__FLT_CST(4.0) * d * (__FLT_CST(1.0) + __FLT_CST(2.0) * d)); -+ } -+ else -+ { -+ n = __FLT_CST(1.0) + __real__ z; -+ n = i2 + n * n; - -- d = __FLT_CST(1.0) - __real__ z; -- d = i2 + d * d; -+ d = __FLT_CST(1.0) - __real__ z; -+ d = i2 + d * d; - -- __real__ ret = __FLT_CST(0.25) * (__FLT_ABI(log) (n) - __FLT_ABI(log) (d)); -+ __real__ ret = __FLT_CST(0.25) * (__FLT_ABI(log) (n) - __FLT_ABI(log) (d)); -+ } - -- d = 1 - __real__ z * __real__ z - i2; -+ /* imaginary part */ -+ /* z = (1 - Re(z)^2 - Im(z)^2 + 2i * Im(z) / ((1-Re(z))^2 + Im(z)^2) */ -+ d = __FLT_CST(1.0) - __real__ z * __real__ z - i2; - - __imag__ ret = __FLT_CST(0.5) * __FLT_ABI(atan2) (__FLT_CST(2.0) * __imag__ z, d); - --- -2.35.3.windows.1 -
--- a/src/mingw-w64.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/mingw-w64.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := mingw-w64 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.0.0 -$(PKG)_CHECKSUM := 56143558d81dae7628a232ca7582b947e65392b1 +$(PKG)_VERSION := 11.0.1 +$(PKG)_CHECKSUM := ab23c9af10fb38388ac75145dd9ffed3c64d1eeb $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)
--- a/src/mpc.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/mpc.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := mpc $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.1 -$(PKG)_CHECKSUM := 2a4919abf445c6eda4e120cd669b8733ce337227 +$(PKG)_VERSION := 1.3.1 +$(PKG)_CHECKSUM := bac1c1fa79f5602df1e29e4684e103ad55714e02 $(PKG)_SUBDIR := mpc-$($(PKG)_VERSION) $(PKG)_FILE := mpc-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://ftp.gnu.org/gnu/mpc/$($(PKG)_FILE)
--- a/src/mpfr.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/mpfr.mk Thu Oct 12 20:31:13 2023 +0200 @@ -9,7 +9,7 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/gnu/mpfr/$($(PKG)_FILE) $(PKG)_URL_2 := https://www.mpfr.org/mpfr-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := build-gcc gmp +$(PKG)_DEPS := gmp define $(PKG)_UPDATE $(WGET) -q -O- 'https://www.mpfr.org/mpfr-current/' | \
--- a/src/mpg123.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/mpg123.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := mpg123 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.31.1 -$(PKG)_CHECKSUM := ef0e6eb48a13d901ab8b3a7a4526dc5476720da7 +$(PKG)_VERSION := 1.32.3 +$(PKG)_CHECKSUM := 3a94848a620db7917c757cb21e261c711e44618f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/mpg123/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -32,5 +32,5 @@ $($(PKG)_CONFIGURE_OPTIONS) $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(1)' -j 1 $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS) DESTDIR=$(3) install endef
--- a/src/msys2-bash.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-bash.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-bash $(PKG)_NAME := bash $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.009-1 -$(PKG)_x86_64_CS := 4d973772dcc7729d833dd94c200ddf1dbd932431 -$(PKG)_i686_CS := 7f55519517cc3dc0a515f835295e491bf8cc1ba2 +$(PKG)_VERSION := 5.2.015-2 +$(PKG)_x86_64_CS := 7b761f155cbd2b7e6b04b7d458e18e3baf3e4cd3 +$(PKG)_i686_CS := 3e3bb03dfb27d4fe758a6a2d1e541b6a5b0dcf2f $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-ca-certificates.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-ca-certificates.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-ca-certificates $(PKG)_NAME := ca-certificates $(PKG)_IGNORE := -$(PKG)_VERSION := 20211016-2 -$(PKG)_x86_64_CS := fa44882c856f1f96735c9ae2021eee2a3dc44efe -$(PKG)_i686_CS := cae6ae719a006b7d06fc0f86eb41ee6f99865baa +$(PKG)_VERSION := 20230311-1 +$(PKG)_x86_64_CS := 21d0e4628f4a83d5c4a18c23626b898e41ab741f +$(PKG)_i686_CS := 3db34b7b2a34dd6e390e7748a031f18f962c3e3e $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-diffutils.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-diffutils.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-diffutils $(PKG)_NAME := diffutils $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8-4 -$(PKG)_x86_64_CS := c7d5f892cd384fd869f37c6bcb30e4d5a64c74e2 -$(PKG)_i686_CS := c555497a2261c46f76341aac43f975a15878afbe +$(PKG)_VERSION := 3.10-1 +$(PKG)_x86_64_CS := fe677d9c7c39d28d50f106568c31b3dcd1ff7836 +$(PKG)_i686_CS := 5957051ba450e0fc943303fa904720e4792b3d22 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-dos2unix.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-dos2unix.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-dos2unix $(PKG)_NAME := dos2unix $(PKG)_IGNORE := -$(PKG)_VERSION := 7.4.3-1 -$(PKG)_x86_64_CS := 0123e1da2849ba22c82b00fff85160215715e90c -$(PKG)_i686_CS := 2a301b038177e8bd77a48f369dc2347e3f2e2057 +$(PKG)_VERSION := 7.5.1-1 +$(PKG)_x86_64_CS := ba8ca3ee97bfc26fa1acf07194980b364d1f790c +$(PKG)_i686_CS := fe847b17533cd63bd5055cb1e7862e0088d9de70 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-filesystem.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-filesystem.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-filesystem $(PKG)_NAME := filesystem $(PKG)_IGNORE := -$(PKG)_VERSION := 2022.01-7 -$(PKG)_x86_64_CS := ba05df7bfb54ab4462a528af75cf42786c2c8c36 -$(PKG)_i686_CS := 2a6fe78a3dee017f6e88fa5fa40b09fd7192d3de +$(PKG)_VERSION := 2023.02.07-1 +$(PKG)_x86_64_CS := ec28b755f2c794451e39daab401aef2964dad8f3 +$(PKG)_i686_CS := 89a23b0a3a5c745ab507989b5f2f7b5286085272 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-gawk.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-gawk.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-gawk $(PKG)_NAME := gawk $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.1-2 -$(PKG)_x86_64_CS := e2c8368dbe81ef3310fc21ea633ab9ebaa9ce4c6 -$(PKG)_i686_CS := ddf93b0c81d17ab2065aa814517a6b27ddf7ae1a +$(PKG)_VERSION := 5.2.2-1 +$(PKG)_x86_64_CS := 08bbd5f4601846c301fe200a9ea7d036dc534d71 +$(PKG)_i686_CS := d6bc7071dbcbd4625c3c4cb5d452efdb4f4fb1ef $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-gcc-libs.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-gcc-libs.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-gcc-libs $(PKG)_NAME := gcc-libs $(PKG)_IGNORE := -$(PKG)_VERSION := 11.3.0-2 -$(PKG)_x86_64_CS := 086f4372c7f55928d3391b71289b1b631a12fe30 -$(PKG)_i686_CS := 815d5209c966e6c0b4db387ebc0faffd0140c9ad +$(PKG)_VERSION := 13.2.0-2 +$(PKG)_x86_64_CS := 90b740d2ccbad40b1cc7864180439cfd04f8a5c6 +$(PKG)_i686_CS := ec6865ca98e745f5a9dfa1a3784e93d074425c65 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-glib2.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-glib2.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-glib2 $(PKG)_NAME := glib2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.74.4-1 -$(PKG)_x86_64_CS := 5cfee297f46d57a95c00fae7b3e0ba255ae0739b -$(PKG)_i686_CS := bbdbde5a7a622cc3a80eb5c56dd780468990d424 +$(PKG)_VERSION := 2.76.5-1 +$(PKG)_x86_64_CS := 4f42e34ef92b6c74c345caded48ad1de8914cb64 +$(PKG)_i686_CS := 330849accf3eb24d81cb1c2d78667a7a37c78dd1 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-gmp.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-gmp.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-gmp $(PKG)_NAME := gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2.1-2 -$(PKG)_x86_64_CS := 3583590c69c3116f1415b54ee47ed75391a40669 -$(PKG)_i686_CS := d3c7d4b6a00d284b3e84773dcbf08d88ed860fa2 +$(PKG)_VERSION := 6.3.0-1 +$(PKG)_x86_64_CS := b2daaea7c3ea62d02f430ecf5c99b9ca3e8e9083 +$(PKG)_i686_CS := 193dfbf00c8158d1af2139ca91d958d12d5b62f2 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-gnupg.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-gnupg.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-gnupg $(PKG)_NAME := gnupg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.40-1 -$(PKG)_x86_64_CS := bfedcb91d77844ab0e7fb4aba5dbfafe7541ca8a -$(PKG)_i686_CS := 40c09083ff95849a2207e6b6837081db674cf73e +$(PKG)_VERSION := 2.2.41-1 +$(PKG)_x86_64_CS := 81dc250c9cdffe47a8caea32ef8b018b96b64458 +$(PKG)_i686_CS := 0588ac526b0180ab164f6b033ad84ed86654831d $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-grep.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-grep.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,11 @@ PKG := msys2-grep $(PKG)_NAME := grep $(PKG)_IGNORE := -$(PKG)_VERSION := 3.6-1 -$(PKG)_x86_64_CS := e0a4116c894bd01f41cb28de064127108ddf3aff -$(PKG)_i686_CS := 6ad5a97ac3f224fddbc5636f4b69c0650a2f7635 +$(PKG)_x86_64_VER := 1~3.0-6 +$(PKG)_i686_VER := 1.3.0-6 +$(PKG)_VERSION := $($(PKG)_$(MSYS2_ARCH)_VER) +$(PKG)_x86_64_CS := 8b42f9ed05eb7e30ee60cd02b4c98b3c2a7da688 +$(PKG)_i686_CS := 5cb218607654f8f6dc82e17e0c52a650b753bfbf $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-gzip.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-gzip.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-gzip $(PKG)_NAME := gzip $(PKG)_IGNORE := -$(PKG)_VERSION := 1.12-2 -$(PKG)_x86_64_CS := c16f31dca96194bbc09690116ed0f5a21abc0843 -$(PKG)_i686_CS := 1c48e95a75392edb9604fe1190cc2225b318c4c6 +$(PKG)_VERSION := 1.13-1 +$(PKG)_x86_64_CS := 3665e6d001de2ce2060b5109078edad3e2f9dfb4 +$(PKG)_i686_CS := 55d2221d7833d5ed7d4ff4f47865e7d443b11e38 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-icu.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-icu.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-icu $(PKG)_NAME := icu $(PKG)_IGNORE := -$(PKG)_VERSION := 71.1-2 -$(PKG)_x86_64_CS := 914807a04f52bae1c79c9ba264da2f6c1ee0d93a -$(PKG)_i686_CS := d1128b7371fed148c785385575e0b1152482cddb +$(PKG)_VERSION := 73.2-2 +$(PKG)_x86_64_CS := c42bb8d2f5c879d2834b7cd160f29f8054935e23 +$(PKG)_i686_CS := 224ee1bd1a544370010ee1e0816ac24a51e2276d $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-info.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-info.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-info $(PKG)_NAME := info $(PKG)_IGNORE := -$(PKG)_VERSION := 7.0.1-1 -$(PKG)_x86_64_CS := 21df6935d9561850247a4c8fd5fed5cf1b50bb6a -$(PKG)_i686_CS := a35e9ba10ad972c3601ed208238e1a516e38cc4e +$(PKG)_VERSION := 7.0.3-3 +$(PKG)_x86_64_CS := 6ebf4144e864cd2f97f2251743f1c3ae2f66c2d9 +$(PKG)_i686_CS := 88fdc6c8c96bf5492e42d850aeeaac514bf16008 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-keyring.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-keyring.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,11 +4,11 @@ PKG := msys2-keyring $(PKG)_NAME := msys2-keyring $(PKG)_IGNORE := -$(PKG)_x86_64_VER := 1~20221024-1 -$(PKG)_i686_VER := 1.20221024-1 +$(PKG)_x86_64_VER := 1~20230703-1 +$(PKG)_i686_VER := 1.20230703-1 $(PKG)_VERSION := $($(PKG)_$(MSYS2_ARCH)_VER) -$(PKG)_x86_64_CS := c9639076cf72d63380d6ec3b78a24f3e2fa75bbb -$(PKG)_i686_CS := db6423464bdd227ebe6eae50796c1fdf46719b55 +$(PKG)_x86_64_CS := b537cf9ffa29412120efe87bc4c43d59d2c24f66 +$(PKG)_i686_CS := 7e05a489215b511a837208f900e54af1a6f46d1d $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-less.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-less.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-less $(PKG)_NAME := less $(PKG)_IGNORE := -$(PKG)_VERSION := 608-2 -$(PKG)_x86_64_CS := cec12d01a0193544121c1280e7eb983487f15277 -$(PKG)_i686_CS := 7195d2a96288b4de5f20480ddef4ab3a301e5c4c +$(PKG)_VERSION := 643-1 +$(PKG)_x86_64_CS := aa790979562ba16337d63b260008add67f81f691 +$(PKG)_i686_CS := caa711ea7a5d77836f525198842623e45e54aecc $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libassuan.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libassuan.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libassuan $(PKG)_NAME := libassuan $(PKG)_IGNORE := -$(PKG)_VERSION := 2.5.5-2 -$(PKG)_x86_64_CS := c9379233cb5721806c90a1b1f75b725f2cac49ae -$(PKG)_i686_CS := 1ad3ca773a9804e0d4b76d33decffa0629174bb9 +$(PKG)_VERSION := 2.5.6-1 +$(PKG)_x86_64_CS := dadf38e6ef3a6583e5aff601e77996c389ec2123 +$(PKG)_i686_CS := 4b801e56a62ee2ef339dda565ff36f1728c8ba4b $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libcrypt.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libcrypt.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libcrypt $(PKG)_NAME := libcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1-4 -$(PKG)_x86_64_CS := 914c92b6fd282a20c64ce54bc3a992b0053327a2 -$(PKG)_i686_CS := 16793c6a7b96cdb30454d38d49d7f3ee2bfe8cad +$(PKG)_VERSION := 2.1-5 +$(PKG)_x86_64_CS := 995cd1c548efaa996bf400c9f448c944226e08fb +$(PKG)_i686_CS := 96482b1353db9ecb5f019c80bca03b24b1d601f6 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libgcrypt.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libgcrypt.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libgcrypt $(PKG)_NAME := libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10.1-5 -$(PKG)_x86_64_CS := 299fd6a19a3bfbffdc370280c0aa8044b635c2a7 -$(PKG)_i686_CS := 28f3736638a523f543d247845906013be3eca01d +$(PKG)_VERSION := 1.10.2-1 +$(PKG)_x86_64_CS := 392eccbe6f07adf90cf2bd4003c8996329ab7bd8 +$(PKG)_i686_CS := 7748d697773f2aa3f80bbc035c3295ff9d9eb3c3 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libgnutls.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libgnutls.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libgnutls $(PKG)_NAME := libgnutls $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.8-2 -$(PKG)_x86_64_CS := 11853ea131397655be879a5520c94eb144bd1b71 -$(PKG)_i686_CS := 8f6d375c6c199602d0434f08e04a842cd13b30e9 +$(PKG)_VERSION := 3.8.1-2 +$(PKG)_x86_64_CS := e87a79d6c345401c1220060079a0a07394282f51 +$(PKG)_i686_CS := 7dadc01a792ed02cad2e980c438c8799cb71bf75 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libgpg-error.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libgpg-error.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libgpg-error $(PKG)_NAME := libgpg-error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.46-2 -$(PKG)_x86_64_CS := 4e297398e0e5a62f8342f128583f74e51008ce94 -$(PKG)_i686_CS := dab1460466d800fc866e0f3bb2ee64efda034dfa +$(PKG)_VERSION := 1.47-1 +$(PKG)_x86_64_CS := fe35e0c3b97b3ceb8014ea1c1c9c12fb73c2ed9d +$(PKG)_i686_CS := 7fbf0b00d6779f1bab317f0dbe173933e6b8df48 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libgpgme.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libgpgme.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libgpgme $(PKG)_NAME := libgpgme $(PKG)_IGNORE := -$(PKG)_VERSION := 1.18.0-1 -$(PKG)_x86_64_CS := c820ba7f81617be9e97c09513a7e6468cfe15a37 -$(PKG)_i686_CS := f764a6052868ff2804ac9f39acef68b16e5a42c0 +$(PKG)_VERSION := 1.22.0-2 +$(PKG)_x86_64_CS := 31fc9074c190ec2c6eb54badecade75efb5461c4 +$(PKG)_i686_CS := 74b91588be470850cb6246901d7a69e4552c3eea $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libhogweed.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libhogweed.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libhogweed $(PKG)_NAME := libhogweed $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.1-1 -$(PKG)_x86_64_CS := 8f1ac0e6cf38977b9346c68b332fe03dacad8664 -$(PKG)_i686_CS := de0e5edabea456bfee70701705aaf6d324b5ab9b +$(PKG)_VERSION := 3.9.1-1 +$(PKG)_x86_64_CS := 009b24e3e83fb748b4ce1da8c407ae0d0481d68d +$(PKG)_i686_CS := 8899aa121292ef6e6ffa381419c1c4e52330bbbf $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libintl.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libintl.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libintl $(PKG)_NAME := libintl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21-2 -$(PKG)_x86_64_CS := 53416ede6dc08bde6af0e7986b1103576384b0af -$(PKG)_i686_CS := ecbd6cc2c48f5486961b63c473470f5b0480877b +$(PKG)_VERSION := 0.22-2 +$(PKG)_x86_64_CS := deaca766080a35776b564135d79b5268e1e35bb9 +$(PKG)_i686_CS := ef7f068dbfb96b21eb04f582c9a8cca3917195bb $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libksba.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libksba.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libksba $(PKG)_NAME := libksba $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.3-1 -$(PKG)_x86_64_CS := 8a6cd861dfa73c175c659498ba18ae835b714df5 -$(PKG)_i686_CS := 8e28fcbf86c4e49039cad4e017e136a00177ef4f +$(PKG)_VERSION := 1.6.4-1 +$(PKG)_x86_64_CS := 3009154c7fb70f4fb7e9e16d09f1418e990ee885 +$(PKG)_i686_CS := 4ee24f3df377fae24247c9451c426e2b90538c81 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-liblzma.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-liblzma.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-liblzma $(PKG)_NAME := liblzma $(PKG)_IGNORE := -$(PKG)_VERSION := 5.4.0-1 -$(PKG)_x86_64_CS := 1f14b210d63a0934c8cec8f8f678715887550be7 -$(PKG)_i686_CS := c2e689e7a738498c7bed207e592ce354d770c22c +$(PKG)_VERSION := 5.4.4-1 +$(PKG)_x86_64_CS := f457d9f403a7dd96561b2597c311f0383e5fa858 +$(PKG)_i686_CS := e3e12a1f4092905a6caed8a99a83c446c01cff4f $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libnettle.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libnettle.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libnettle $(PKG)_NAME := libnettle $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.1-1 -$(PKG)_x86_64_CS := 1cca284a206b6c2b30383705ab92a92f52968f71 -$(PKG)_i686_CS := d822bbb4bc5f15b010921a304cfa7b6770a5e812 +$(PKG)_VERSION := 3.9.1-1 +$(PKG)_x86_64_CS := 4c3273b6439217651e2f2e84a45f7a20426f8a03 +$(PKG)_i686_CS := 6b5f54d4ff96fd19a84f418af3ac85c65f8bc00c $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libopenssl.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libopenssl.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libopenssl $(PKG)_NAME := libopenssl $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.7-2 -$(PKG)_x86_64_CS := e150c365f62401a61bbc0d9f91aa4a9defb26477 -$(PKG)_i686_CS := 31e2234c431c349fb7bfe129a8759eb0c3daf79a +$(PKG)_VERSION := 3.1.2-1 +$(PKG)_x86_64_CS := 244d5c1685f4b0815e75b00fbd068335f852fea4 +$(PKG)_i686_CS := cc8f54040dac6f088007553cc68cd4d9167caead $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libp11-kit.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libp11-kit.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libp11-kit $(PKG)_NAME := libp11-kit $(PKG)_IGNORE := -$(PKG)_VERSION := 0.24.1-4 -$(PKG)_x86_64_CS := b919c0e12c8e963e43958bee851a7910f6c5ed87 -$(PKG)_i686_CS := 61e53152f7cc58058b7aa817c157d59b202a2cae +$(PKG)_VERSION := 0.25.0-1 +$(PKG)_x86_64_CS := f3ebe04d24c8144fa1e93f70d3d8bd81d9f77ae1 +$(PKG)_i686_CS := 5dbb2d62088d78797fe85180fdf8329bd1bcbe71 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libpcre.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libpcre.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libpcre $(PKG)_NAME := libpcre $(PKG)_IGNORE := -$(PKG)_VERSION := 8.45-3 -$(PKG)_x86_64_CS := a959727252343ab046f25b3783118343c5f9866a -$(PKG)_i686_CS := 7fe940169f5ae4fb8471d2c1a3a3b97c9506833f +$(PKG)_VERSION := 8.45-4 +$(PKG)_x86_64_CS := 094b36495b81f86bc511d9de1b4bcb94f40d85d3 +$(PKG)_i686_CS := 65f37c7f21bdba0407f3cdfb16d55697c7aacc1b $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libreadline.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libreadline.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libreadline $(PKG)_NAME := libreadline $(PKG)_IGNORE := -$(PKG)_VERSION := 8.2.001-1 -$(PKG)_x86_64_CS := 8f0ec3c44cc868bb93a6c00a6385a5bcaf7acdd7 -$(PKG)_i686_CS := e3ad908ad961e55e00baf07a4d20dfe0e34d17b8 +$(PKG)_VERSION := 8.2.001-3 +$(PKG)_x86_64_CS := 8bad2ef937d2f2e2a7f1a9c556a2d3dc49599a5a +$(PKG)_i686_CS := bb1590bc37f91398b50410a10ac656ceaf109fa2 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libsqlite.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libsqlite.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libsqlite $(PKG)_NAME := libsqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3.40.1-1 -$(PKG)_x86_64_CS := 951a5c809c618d56842f5b9a01bc69a83456306d -$(PKG)_i686_CS := 2bd1e53df837ff2ba5854dc7dd7bec1b5954a193 +$(PKG)_VERSION := 3.42.0-2 +$(PKG)_x86_64_CS := 8d64302cc1b3c1a8ed97861e1737835a44abf45b +$(PKG)_i686_CS := bdb40706737a3ac00ebfe4a2d8f502bbfb3bcdfc $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libutil-linux.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libutil-linux.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libutil-linux $(PKG)_NAME := libutil-linux $(PKG)_IGNORE := -$(PKG)_VERSION := 2.35.2-3 -$(PKG)_x86_64_CS := e06ae1176e28f1675c441def8c437075aa082f80 -$(PKG)_i686_CS := bc0df067583d2afa5cd10d9b1c7a364b133b4222 +$(PKG)_VERSION := 2.35.2-4 +$(PKG)_x86_64_CS := 8092c4b5aaaca97043c284afaf83b20c0b4e81b0 +$(PKG)_i686_CS := 37dc84cd3a3bd0bbead8657768512c8cc94a5644 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/msys2-libxcrypt.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := msys2-libxcrypt +$(PKG)_NAME := libxcrypt +$(PKG)_IGNORE := +$(PKG)_VERSION := 4.4.36-1 +$(PKG)_x86_64_CS := a7a1cc7ec40ae6e33b0f2ff7cf0477194b70e4a1 +$(PKG)_i686_CS := 3056a9b2123602bba44cfd3faa56d622b6c80a3c +$(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) +$(PKG)_CHECKSUM := $($(PKG)_CS) +$(PKG)_SUBDIR := +$(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),) + +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(MSYS2_PKG_UPDATE) +endef + +define $(PKG)_BUILD + $(MSYS2_PKG_BUILD) +endef
--- a/src/msys2-libxml2.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libxml2.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libxml2 $(PKG)_NAME := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.10.3-2 -$(PKG)_x86_64_CS := 1f5b4f74dcf4461762a1aada5befc6c904dd15cb -$(PKG)_i686_CS := 879d302bd87f719263da7ccdf01f77ad109ced7e +$(PKG)_VERSION := 2.11.5-1 +$(PKG)_x86_64_CS := 3b594e61da28757a81f0a1587cd0dd7b80e7197b +$(PKG)_i686_CS := 20bc14295a8f854dbeb4ccae8bf444e05ac5cc51 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-libxslt.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-libxslt.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-libxslt $(PKG)_NAME := libxslt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.37-1 -$(PKG)_x86_64_CS := dadcd3658a505d3d48a7d01f69367ae220b09af5 -$(PKG)_i686_CS := 3f298bb8a1f382e8d4a604f079af3adc8a60022e +$(PKG)_VERSION := 1.1.38-1 +$(PKG)_x86_64_CS := f3830ba5f9c5ad62a7969c28515f6e78951733e8 +$(PKG)_i686_CS := 0cff6dd54431cc05dab084e33a4bea1e6edaa93c $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-make.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-make.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-make $(PKG)_NAME := make $(PKG)_IGNORE := -$(PKG)_VERSION := 4.4-1 -$(PKG)_x86_64_CS := 7a7e014f83c61c11910bd20e5e10f4b497fb3c92 -$(PKG)_i686_CS := b4bba2081716ea9ba5ddf55af1d93d6e5c65d359 +$(PKG)_VERSION := 4.4.1-1 +$(PKG)_x86_64_CS := fb49dc12540ca9608e7ae86b4ca552673bf6b733 +$(PKG)_i686_CS := 4aea74f88902512168ac3651642401fb4a3b059e $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-mintty.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-mintty.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,12 +4,12 @@ PKG := msys2-mintty $(PKG)_NAME := mintty $(PKG)_IGNORE := -$(PKG)_x86_64_VER := 1~3.6.3-1 -$(PKG)_i686_VER := 1.3.6.3-1 +$(PKG)_x86_64_VER := 1~3.6.5-1 +$(PKG)_i686_VER := 1.3.6.5-1 $(PKG)_VERSION := $($(PKG)_$(MSYS2_ARCH)_VER) $(PKG)_FILTER := mintty-1~ -$(PKG)_x86_64_CS := b13bd644ad9992c802cc8cf19089597c5aeff02b -$(PKG)_i686_CS := 08869948ceae925cb7b5256bad4b806fdfc9f016 +$(PKG)_x86_64_CS := a0af867c164a8b2d58f7c9174d752575b0a91d5c +$(PKG)_i686_CS := f58e6147f18158b3eb79b94c0c5d4fd8b2c76708 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-mpdecimal.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-mpdecimal.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-mpdecimal $(PKG)_NAME := mpdecimal $(PKG)_IGNORE := -$(PKG)_VERSION := 2.5.0-1 -$(PKG)_x86_64_CS := e49198d21fcd50b5b42baf2185e0046adffbd14d -$(PKG)_i686_CS := b613d59ad12bd9de6741f61eda10719cd2a11fa8 +$(PKG)_VERSION := 2.5.1-2 +$(PKG)_x86_64_CS := 993b22e2ee9272078a063cae2007a2a75109fe51 +$(PKG)_i686_CS := 937d26a6c476cfd384b29a0067c8dd672ea3c4f8 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-mpfr.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-mpfr.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-mpfr $(PKG)_NAME := mpfr $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.1.p1-1 -$(PKG)_x86_64_CS := a73f3a28b826c1297e681bf3ebc55f420aaba607 -$(PKG)_i686_CS := d9f8d7f367701fd2a02a43705c89327c521de379 +$(PKG)_VERSION := 4.2.1-1 +$(PKG)_x86_64_CS := dae4a025e8befb7808dffb47288ad7c15da1753e +$(PKG)_i686_CS := 1ba49bb401d6bed8ae0b6fd9bb07fd13d3ce5d4c $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-ncurses.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-ncurses.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-ncurses $(PKG)_NAME := ncurses $(PKG)_IGNORE := -$(PKG)_VERSION := 6.3-3 -$(PKG)_x86_64_CS := 8cf7c2a24d38edfd707e58c58a030be9705cbe1b -$(PKG)_i686_CS := 47e329b3c52879e0ace48a5c2d16535dd639f59f +$(PKG)_VERSION := 6.4-2 +$(PKG)_x86_64_CS := 33e089e41760255f4cba49ea3d209d378c25dca9 +$(PKG)_i686_CS := dd244a842c1d0c75e91a8023cfb0d1ebfed72bae $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-openssl.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-openssl.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-openssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.7-2 -$(PKG)_x86_64_CS := 3e9c9ee6d40b3f967308a050ac4cf628c467e2df -$(PKG)_i686_CS := 599097cb7f655440c39db87fa59c8a318ed04af2 +$(PKG)_VERSION := 3.1.2-1 +$(PKG)_x86_64_CS := 960eda9354e686c612e8bc455e91113a4b3d0a1b +$(PKG)_i686_CS := e466e374a7b4e3933eff18851d5c06e4e38f326a $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-p11-kit.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-p11-kit.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-p11-kit $(PKG)_NAME := p11-kit $(PKG)_IGNORE := -$(PKG)_VERSION := 0.24.1-4 -$(PKG)_x86_64_CS := f9b76f58892531c02213c46fdcbf8811dfca27fe -$(PKG)_i686_CS := e2032ad8f4512186f535a88c64a89c1f1584b040 +$(PKG)_VERSION := 0.25.0-1 +$(PKG)_x86_64_CS := b999db07c25d71be5bf3a7d989b25eb1c75d5c6a +$(PKG)_i686_CS := a3230c895d4f45451fd46d57f3fb92e033f683a1 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-pacman.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-pacman.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-pacman $(PKG)_NAME := pacman $(PKG)_IGNORE := -$(PKG)_VERSION := 6.0.1-28 -$(PKG)_x86_64_CS := 440a43fa7ee14e2ecc8413f2fe834f7d214cde70 -$(PKG)_i686_CS := bf312fd49cadab9efa4b922e7a73332cfd800e7d +$(PKG)_VERSION := 6.0.2-9 +$(PKG)_x86_64_CS := a2d89b7164cff3dc90a4e832950832b8ff70937f +$(PKG)_i686_CS := cf197b59593b33a4e56354be15449876e01d998d $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-perl.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-perl.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-perl $(PKG)_NAME := perl $(PKG)_IGNORE := -$(PKG)_VERSION := 5.36.0-1 -$(PKG)_x86_64_CS := 0e27cbb79a06e00c5f09e384e8456df36de53b89 -$(PKG)_i686_CS := ea5d431936f9cdc3215ac530af3752358df0354c +$(PKG)_VERSION := 5.36.1-2 +$(PKG)_x86_64_CS := a85485cb83b441ac78221ae3a8a3eaef6f55edfc +$(PKG)_i686_CS := 284b9ff843f84d41a0be7cafc544d149d2ea45f7 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-python.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-python.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-python $(PKG)_NAME := python $(PKG)_IGNORE := -$(PKG)_VERSION := 3.10.9-2 -$(PKG)_x86_64_CS := 409f3da8098d8c31bc184d1922de3bc889e1a6f4 -$(PKG)_i686_CS := a0026f4572fb5bbf336947f1134e07ff0aa47dac +$(PKG)_VERSION := 3.11.5-1 +$(PKG)_x86_64_CS := 3edd05adb63ba18e0c05f8c76f2aa03a1274e87a +$(PKG)_i686_CS := fb28eed7b4bd3710fcd647f273a1ef821e0e1aa7 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-wget.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-wget.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-wget $(PKG)_NAME := wget $(PKG)_IGNORE := -$(PKG)_VERSION := 1.21.3-2 -$(PKG)_x86_64_CS := fe4bbfe505407ae96b7fe80f1d5a777bba8e3d4e -$(PKG)_i686_CS := e525a541b0d41ac38a55400b21f878a021e1275e +$(PKG)_VERSION := 1.21.4-1 +$(PKG)_x86_64_CS := 932458ed5f5646ad9df3151ca107748c8d4a35af +$(PKG)_i686_CS := 67502dc3a867b9a2113cb53c313ca6bd6ffa26da $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-zlib.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/msys2-zlib.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := msys2-zlib $(PKG)_NAME := zlib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.13-1 -$(PKG)_x86_64_CS := 0928ccf489476ab2d5118f068eb81e563856ea8a -$(PKG)_i686_CS := 3bbb51d12d4df57818ed09400b1d9fdc807ca64c +$(PKG)_VERSION := 1.3-1 +$(PKG)_x86_64_CS := 021390c3fb8c338358535e8a59d7cf5a60e9f291 +$(PKG)_i686_CS := 130e436a31c1f4bb73c3056726d5679509e6a4a0 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/native-binutils.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/native-binutils.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := native-binutils $(PKG)_IGNORE := -$(PKG)_VERSION := 2.39 -$(PKG)_CHECKSUM := f17653e7b1d1fa5242a408919845da23e8cc5141 +$(PKG)_VERSION := 2.40 +$(PKG)_CHECKSUM := fee4fbef9d632afc1988dd631d7f75d4394b7f8d $(PKG)_SUBDIR := binutils-$($(PKG)_VERSION) $(PKG)_FILE := binutils-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE) @@ -30,6 +30,7 @@ --with-gnu-ld \ --with-gnu-as \ --disable-nls \ + --without-zstd \ $(ENABLE_SHARED_OR_STATIC) \ --disable-werror $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/native-gcc.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/native-gcc.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := native-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 12.2.0 -$(PKG)_CHECKSUM := 5dce6dc0091b8049b530d1587513a07201691760 +$(PKG)_VERSION := 13.2.0 +$(PKG)_CHECKSUM := 5f95b6d042fb37d45c6cbebfc91decfbc4fb493c $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/nettle.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/nettle.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := nettle $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.1 -$(PKG)_CHECKSUM := 1be40366f8db2d5bb65e45883d6d76a96b39eb73 +$(PKG)_VERSION := 3.9.1 +$(PKG)_CHECKSUM := f129cd7b0c5aa52649957221bb93dd1feef12a2c $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE) @@ -24,9 +24,9 @@ cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - CCAS=gcc \ - --disable-shared \ - --disable-documentation \ + CCAS=gcc \ + --disable-shared \ + --disable-documentation \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o @@ -50,8 +50,9 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ - --disable-documentation \ - --prefix='$(HOST_PREFIX)' + --disable-documentation \ + --prefix='$(HOST_PREFIX)' \ + --libdir='$(HOST_PREFIX)/lib' $(MAKE) -C '$(1)' -j '$(JOBS)' SUBDIRS= $(MAKE) -C '$(1)' -j 1 SUBDIRS= install DESTDIR='$(3)' endef
--- a/src/npp.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/npp.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := npp $(PKG)_IGNORE := -$(PKG)_VERSION := 8.4.8 -$(PKG)_CHECKSUM := 9faf275fc941dff4223b75a7d960b697f922c3bd +$(PKG)_VERSION := 8.5.7 +$(PKG)_CHECKSUM := aca51aec0cd6176012f66e0001767a5256116e06 $(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/nsis.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/nsis.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,11 +3,11 @@ PKG := nsis $(PKG)_IGNORE := -$(PKG)_VERSION := 3.08 -$(PKG)_CHECKSUM := 784061fd42bf5e838e40e9f4504fd3e696d5d9a1 -$(PKG)_SUBDIR := nsis-$($(PKG)_VERSION)-src -$(PKG)_FILE := nsis-$($(PKG)_VERSION)-src.tar.bz2 -$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 3/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_VERSION := 7336-1 +$(PKG)_CHECKSUM := 1ab627713f2da6bc061601cce1427e3b5ae0f629 +$(PKG)_SUBDIR := nsis-code-$($(PKG)_VERSION)-NSIS-trunk +$(PKG)_FILE := nsis-code-$($(PKG)_VERSION)-NSIS-trunk.zip +$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/nsisbi/nsisbi3.08.1/$($(PKG)_FILE) $(PKG)_DEPS := build-scons build-setuptools define $(PKG)_UPDATE
--- a/src/openblas.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/openblas.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := openblas $(PKG)_IGNORE := -$(PKG)_VERSION := 0.3.21 -$(PKG)_CHECKSUM := b052d196ad694b29302e074b3eb8cc66745f6e2f +$(PKG)_VERSION := 0.3.24 +$(PKG)_CHECKSUM := 86dbb39e6fe0a7fa64e7ba0922f08c6250916a27 $(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/opengl_switch.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/opengl_switch.mk Thu Oct 12 20:31:13 2023 +0200 @@ -10,10 +10,14 @@ $(PKG)_URL := https://github.com/lostbard/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz -ifeq ($(ENABLE_QT5),yes) +ifeq ($(ENABLE_QT),4) + $(PKG)_DEPS := qt +endif +ifeq ($(ENABLE_QT),5) $(PKG)_DEPS := qt5 -else - $(PKG)_DEPS := qt +endif +ifeq ($(ENABLE_QT),6) + $(PKG)_DEPS := qt6 endif ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) @@ -26,12 +30,19 @@ $(call GITHUB_PKG_UPDATE,lostbard,opengl_switch,v) endef +$(PKG)_QMAKE_FLAGS := ifneq ($(MXE_NATIVE_BUILD),yes) ifeq ($(MXE_SYSTEM),mingw) - ifeq ($(ENABLE_QT5),yes) + ifeq ($(ENABLE_QT),4) + $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++' + endif + ifeq ($(ENABLE_QT),5) $(PKG)_QMAKE_SPEC_OPTION := -spec '$(BUILD_TOOLS_PREFIX)/mkspecs/win32-g++' - else - $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++' + $(PKG)_QMAKE_FLAGS += QMAKE_CXXFLAGS='-std=c++11' + endif + ifeq ($(ENABLE_QT),6) + $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/qt6/mkspecs/win32-g++' + $(PKG)_QMAKE_FLAGS += QMAKE_CXXFLAGS='-std=c++17' endif endif ifeq ($(MXE_SYSTEM),msvc) @@ -44,16 +55,16 @@ cd '$(1)' && \ '$(MXE_QMAKE)' -makefile \ $($(PKG)_QMAKE_SPEC_OPTION) \ + $($(PKG)_QMAKE_FLAGS) \ QMAKE_UIC='$(MXE_UIC)' \ QMAKE_MOC='$(MXE_MOC)' \ - QMAKE_LFLAGS=$(MXE_LDFLAGS) \ - QMAKE_CXXFLAGS='-std=c++11' + QMAKE_LFLAGS=$(MXE_LDFLAGS) $(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'; \ + mv '$(HOST_PREFIX)/qt$(ENABLE_QT)/bin/opengl_switch.exe' '$(HOST_BINDIR)/opengl_switch.exe'; \ fi endef
--- a/src/postgresql.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/postgresql.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := postgresql $(PKG)_IGNORE := -$(PKG)_VERSION := 14.6 -$(PKG)_CHECKSUM := 5bcf9de68a664abf11c2b7291b1c1948abbb4dd3 +$(PKG)_VERSION := 14.9 +$(PKG)_CHECKSUM := 9ecf4d8cf7c59e8b4a6d69398d67973408af7151 $(PKG)_SUBDIR := postgresql-$($(PKG)_VERSION) $(PKG)_FILE := postgresql-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.postgresql.org/pub/source/v$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/proj.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/proj.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,14 +3,16 @@ PKG := proj $(PKG)_IGNORE := -$(PKG)_VERSION := 8.1.1 -$(PKG)_CHECKSUM := 69f11aad0b434cf7171a96889ad699817a5b8407 +$(PKG)_VERSION := 9.3.0 +$(PKG)_CHECKSUM := 4d0d57bf4b4d14097a2209fd8a79ae96b58eaf7f $(PKG)_SUBDIR := proj-$($(PKG)_VERSION) $(PKG)_FILE := proj-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/proj/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.remotesensing.org/proj/$($(PKG)_FILE) $(PKG)_DEPS := curl sqlite tiff +$(PKG)_CMAKE_FLAGS := + define $(PKG)_UPDATE $(WGET) -q -O- 'http://proj.org/download.html' | \ $(SED) -n 's,.*proj-\([0-9][^>]*\)\.tar.*,\1,p' | \ @@ -18,18 +20,14 @@ endef define $(PKG)_BUILD - if [ $(MXE_SYSTEM) = msvc ]; then \ - mkdir '$(1)/m4'; \ - cd '$(1)' && autoreconf -f -i -v; \ - fi - cd '$(1)' && ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(HOST_PREFIX)' \ - --with-mutex \ - && $(CONFIGURE_POST_HOOK) - $(MAKE) -C '$(1)' -j '$(JOBS)' - # remove header which is not installed since 4.8.0 - rm -f '$(HOST_INCDIR)/projects.h' - $(MAKE) -C '$(1)' -j 1 install + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + -DBUILD_TESTING=no \ + $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + . + + $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)' -j '1' VERBOSE=1 DESTDIR='$(3)' install endef
--- a/src/qdbm.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/qdbm.mk Thu Oct 12 20:31:13 2023 +0200 @@ -7,11 +7,11 @@ $(PKG)_CHECKSUM := 8c2ab938c2dad8067c29b0aa93efc6389f0e7076 $(PKG)_SUBDIR := qdbm-$($(PKG)_VERSION) $(PKG)_FILE := qdbm-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://fallabs.com/qdbm/qdbm-1.8.78.tar.gz +$(PKG)_URL := https://dbmx.net/qdbm/qdbm-1.8.78.tar.gz $(PKG)_DEPS := bzip2 libiconv lzo zlib define $(PKG)_UPDATE - wget -q -O- 'http://fallabs.com/qdbm/' | \ + wget -q -O- 'https://dbmx.net/qdbm/' | \ grep 'qdbm-' | \ $(SED) -n 's,.*qdbm-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1
--- a/src/qscintilla.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/qscintilla.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,23 +3,21 @@ PKG := qscintilla $(PKG)_IGNORE := -$(PKG)_VERSION := 2.13.3 -$(PKG)_CHECKSUM := 336c069d56dc9573ac2c68fd5690b2dffe02daaa +$(PKG)_VERSION := 2.14.1 +$(PKG)_CHECKSUM := 433cc4cb7da65c25a11ea3efbc5a7db31c6d7e3c $(PKG)_SUBDIR := QScintilla_src-$($(PKG)_VERSION) $(PKG)_FILE := QScintilla_src-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.riverbankcomputing.com/static/Downloads/QScintilla/$($(PKG)_VERSION)/$($(PKG)_FILE) -ifeq ($(ENABLE_QT5),yes) - $(PKG)_DEPS := qt5 -else +ifeq ($(ENABLE_QT),4) $(PKG)_DEPS := qt endif - -ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) - $(PKG)_INSTALL_ROOT := -else - $(PKG)_INSTALL_ROOT := $(3) +ifeq ($(ENABLE_QT),5) + $(PKG)_DEPS := qt5 +endif +ifeq ($(ENABLE_QT),6) + $(PKG)_DEPS := qt6 endif define $(PKG)_UPDATE @@ -30,10 +28,14 @@ ifneq ($(MXE_NATIVE_BUILD),yes) ifeq ($(MXE_SYSTEM),mingw) - ifeq ($(ENABLE_QT5),yes) + ifeq ($(ENABLE_QT),4) + $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++' + endif + ifeq ($(ENABLE_QT),5) $(PKG)_QMAKE_SPEC_OPTION := -spec '$(BUILD_TOOLS_PREFIX)/mkspecs/win32-g++' - else - $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++' + endif + ifeq ($(ENABLE_QT),6) + $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/qt6/mkspecs/win32-g++' endif endif ifeq ($(MXE_SYSTEM),msvc) @@ -43,13 +45,16 @@ endif define $(PKG)_BUILD + if [ "$(MXE_NATIVE_BUILD)" = "no" ]; then \ + '$(MXE_QMAKE)' -set CROSS_COMPILE $(MXE_TOOL_PREFIX); \ + fi cd '$(1)/src' && \ - '$(MXE_QMAKE)' -makefile \ + '$(MXE_QMAKE)' -makefile \ $($(PKG)_QMAKE_SPEC_OPTION) \ QMAKE_UIC='$(MXE_UIC)' \ QMAKE_MOC='$(MXE_MOC)' \ QMAKE_LFLAGS=$(MXE_LDFLAGS) \ - QMAKE_CXXFLAGS='-std=c++11' + QT_MAJOR_VERSION=$(ENABLE_QT) if [ $(MXE_SYSTEM) = msvc ]; then \ mkdir -p '$(3)' && \ @@ -59,15 +64,17 @@ INSTALL_ROOT=`cd $(3) && pwd -W | sed -e 's,^[a-zA-Z]:,,' -e 's,/,\\\\,g'` install; \ else \ $(MAKE) -C '$(1)/src' -j '$(JOBS)' && \ - $(MAKE) -C '$(1)/src' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \ + $(MAKE) -C '$(1)/src' -j 1 install INSTALL_ROOT='$(3)'; \ fi if [ $(MXE_SYSTEM) = mingw ]; then \ - $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \ - if [ $(ENABLE_QT5) = yes ]; then \ - mv '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/qscintilla2_qt5.dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \ + $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \ + if [ "$(ENABLE_QT)" = "5" ]; then \ + mv '$(3)$(HOST_PREFIX)/qt5/lib/qscintilla2_qt5.dll' '$(3)$(HOST_BINDIR)'; \ + elif [ "$(ENABLE_QT)" = "6" ]; then \ + mv '$(3)$(HOST_PREFIX)/qt6/lib/qscintilla2_qt6.dll' '$(3)$(HOST_BINDIR)'; \ else \ - mv '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/qscintilla2_qt4.dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)/'; \ + mv '$(3)$(HOST_LIBDIR)/qscintilla2_qt4.dll' '$(3)$(HOST_BINDIR)/'; \ fi; \ fi @@ -75,9 +82,9 @@ # DESTDIR usage (or equivalent), the real Win32 directory hierarchy # is recreated under DESTDIR, not the MSYS hierarchy. if [ $(MXE_SYSTEM) = msvc ]; then \ - $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/bin'; \ - $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/bin/'; \ - rm -f '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ + $(INSTALL) -d '$(3)$(CMAKE_HOST_PREFIX)/bin'; \ + $(INSTALL) -m755 '$(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$(3)$(CMAKE_HOST_PREFIX)/bin/'; \ + rm -f '$(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ fi +endef -endef
--- a/src/qt5.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/qt5.mk Thu Oct 12 20:31:13 2023 +0200 @@ -5,7 +5,7 @@ $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_DEPS := $(patsubst $(TOP_DIR)/src/%.mk,%,\ $(shell grep -l 'qtbase_VERSION' \ - $(TOP_DIR)/src/qt*.mk \ + $(TOP_DIR)/src/qt[^6]*.mk \ --exclude '$(TOP_DIR)/src/qt5.mk')) $(PKG)_FILE = $(PKG)_URL =
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt6-qt5compat.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qt6-qt5compat +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qt6-qtbase_VERSION) +$(PKG)_CHECKSUM := bdeeaea9c8ba569728e3e117e3041b6f5deeac96 +$(PKG)_SUBDIR = $(subst qtbase,qt5compat,$(qt6-qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qt5compat,$(qt6-qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qt5compat,$(qt6-qtbase_URL)) +$(PKG)_DEPS := qt6-qtbase + +define $(PKG)_UPDATE + echo $(qt6-qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(HOST_PREFIX)/qt6/bin/qt-cmake-private' -DCMAKE_INSTALL_PREFIX='$(HOST_PREFIX)/qt6' + cmake --build $(1) -j '$(JOBS)' + cmake --install $(1) + if [ $(MXE_WINDOWS_BUILD) = yes ]; then \ + $(INSTALL) -d '$(HOST_BINDIR)'; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6Core5Compat.dll '$(HOST_BINDIR)'/Qt6Core5Compat.dll; \ + fi +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt6-qtbase-1-fixes.patch Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,97 @@ +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 <tonyt@logyst.com> +Date: Mon, 14 Dec 2020 15:09:00 +1100 +Subject: [PATCH 1/2] optionally build docs + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,7 +173,9 @@ if(NOT QT_BUILD_STANDALONE_TESTS) + qt_internal_set_up_config_optimizations_like_in_qmake() + + ## Setup documentation +- add_subdirectory(doc) ++ if(QT_BUILD_DOCS) ++ add_subdirectory(doc) ++ endif() + + ## Visit all the directories: + add_subdirectory(src) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 3 Apr 2023 13:12:47 +0200 +Subject: [PATCH 2/2] add missing oleaut32 dependency for networklistmanager + +Required for symbols VariantInit and VariantClear. + +diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt +index 1111111..2222222 100644 +--- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt ++++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt +@@ -14,6 +14,11 @@ qt_internal_add_plugin(QNLMNIPlugin + Qt::NetworkPrivate + ) + ++qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 ++ LIBRARIES ++ oleaut32 ++) ++ + qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 AND MSVC AND NOT CLANG + LIBRARIES + runtimeobject +diff -ur qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/minimal/qminimalintegration.cpp qtbase-everywhere-src-6.5.2/src/plugins/platforms/minimal/qminimalintegration.cpp +--- qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/minimal/qminimalintegration.cpp 2023-08-24 09:11:53.760448450 -0400 ++++ qtbase-everywhere-src-6.5.2/src/plugins/platforms/minimal/qminimalintegration.cpp 2023-08-24 09:34:11.612449868 -0400 +@@ -125,7 +125,11 @@ + + if (!m_fontDatabase) { + #if QT_CONFIG(fontconfig) ++# ifdef Q_OS_WIN ++ m_fontDatabase = new QFreeTypeFontDatabase; ++# else + m_fontDatabase = new QGenericUnixFontDatabase; ++# endif + #else + m_fontDatabase = QPlatformIntegration::fontDatabase(); + #endif +diff -ur qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/windows/qwindowsglcontext.cpp qtbase-everywhere-src-6.5.2/src/plugins/platforms/windows/qwindowsglcontext.cpp +--- qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/windows/qwindowsglcontext.cpp 2023-08-24 09:11:53.769448973 -0400 ++++ qtbase-everywhere-src-6.5.2/src/plugins/platforms/windows/qwindowsglcontext.cpp 2023-08-24 09:17:12.428980606 -0400 +@@ -142,7 +142,7 @@ + qCDebug(lcQpaGl) << "Qt: Using WGL and OpenGL from" << openglDll; + + if (useSystemLib) +- m_lib = QSystemLibrary::load((wchar_t*)(QString::fromLatin1(openglDll).utf16())); ++ m_lib = QSystemLibrary::load((wchar_t*)(QString::fromLatin1(openglDll).utf16()), false); + else + m_lib = LoadLibraryA(openglDll.constData()); + if (!m_lib) { +@@ -154,7 +154,7 @@ + // Load opengl32.dll always. GDI functions like ChoosePixelFormat do + // GetModuleHandle for opengl32.dll and behave differently (and call back into + // opengl32) when the module is present. This is fine for dummy contexts and windows. +- QSystemLibrary::load(L"opengl32"); ++ QSystemLibrary::load(L"opengl32", false); + } + + wglCreateContext = reinterpret_cast<HGLRC (WINAPI *)(HDC)>(resolve("wglCreateContext")); +diff -ur qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/windows/qwindowsopengltester.cpp qtbase-everywhere-src-6.5.2/src/plugins/platforms/windows/qwindowsopengltester.cpp +--- qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/windows/qwindowsopengltester.cpp 2023-08-24 09:11:53.770449031 -0400 ++++ qtbase-everywhere-src-6.5.2/src/plugins/platforms/windows/qwindowsopengltester.cpp 2023-08-24 09:18:13.593537630 -0400 +@@ -317,7 +317,7 @@ + + // Test #1: Load opengl32.dll and try to resolve an OpenGL 2 function. + // This will typically fail on systems that do not have a real OpenGL driver. +- lib = QSystemLibrary::load(L"opengl32"); ++ lib = QSystemLibrary::load(L"opengl32", false); + if (lib) { + CreateContext = reinterpret_cast<CreateContextType>( + reinterpret_cast<QFunctionPointer>(::GetProcAddress(lib, "wglCreateContext")));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt6-qtbase.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,135 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qt6-qtbase +$(PKG)_IGNORE := +$(PKG)_VERSION := 6.5.3 +$(PKG)_CHECKSUM := 0287ec91079e5d12349aa91c1389661967a73c97 +$(PKG)_SUBDIR := qtbase-everywhere-src-$($(PKG)_VERSION) +$(PKG)_FILE := qtbase-everywhere-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := https://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +ifeq ($(USE_SYSTEM_FONTCONFIG),no) + $(PKG)_FONTCONFIG := fontconfig +endif +$(PKG)_DEPS := dbus double-conversion freetds freetype $($(PKG)_FONTCONFIG) icu4c jpeg libjbig libpng libproxy pcre2 postgresql sqlite zlib zstd + +$(PKG)_CMAKE_OPTS := +$(PKG)_CONFIGURE_ENV := +$(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH) + +ifeq ($(USE_SYSTEM_OPENGL),no) + $(PKG)_DEPS += mesa + $(PKG)_CMAKE_OPTS += -DFEATURE_egl=OFF +endif +ifeq ($(MXE_WINDOWS_BUILD),yes) + $(PKG)_DEPS += uuid + $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32" + $(PKG)_CMAKE_OPTS += \ + -DFEATURE_sql_mysql=OFF \ + -DFEATURE_sql_odbc=ON \ + -DFEATURE_opengl_dynamic=ON \ + -DFEATURE_sql_psql=ON \ + -DFEATURE_sql_sqlite=ON \ + -DFEATURE_system_sqlite=ON + + ifeq ($(ENABLE_WINDOWS_64),yes) + $(PKG)_DEPS += icu4c + $(PKG)_CMAKE_OPTS += -DFEATURE_icu=ON + else + $(PKG)_CMAKE_OPTS += -DFEATURE_icu=OFF + endif +else + $(PKG)_DEPS += icu4c + $(PKG)_CMAKE_OPTS += -DFEATURE_icu=ON + $(PKG)_CMAKE_OPTS += \ + -DFEATURE_system_sqlite=ON + + ifeq ($(USE_SYSTEM_X11_LIBS),no) + $(PKG)_DEPS += xdamage xdmcp xext xfixes xi xrender xt xxf86vm x11 xcb xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xkbcommon + endif +endif + +define $(PKG)_UPDATE + $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/ | \ + $(SED) -n 's,.*href="\(6\.[0-9]\+\.[^/]*\)/".*,\1,p' | \ + grep -iv -- '-rc' | \ + sort | + tail -1 +endef + +ifeq ($(MXE_NATIVE_BUILD),no) + $(PKG)_CMAKE_OPTS += -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE=$(MXE_TOOL_PREFIX) + $(PKG)_CMAKE_OPTS += -DQT_HOST_PATH='$(BUILD_TOOLS_PREFIX)/qt6' + ifeq ($(MXE_WINDOWS_BUILD),yes) + $(PKG)_CMAKE_OPTS += -DQT_QMAKE_TARGET_MKSPEC=win32-g++ + endif +endif + +$(PKG)_CONFIGURE_ENV += \ + PKG_CONFIG="$(MXE_PKG_CONFIG)" \ + PKG_CONFIG_SYSROOT_DIR="/" \ + PKG_CONFIG_LIBDIR=$($(PKG)_PKG_CONFIG_PATH) + +define $(PKG)_BUILD + if [ "$(MXE_NATIVE_BUILD)" = "no" ]; then \ + mkdir '$(1).native'; \ + cmake -S '$(1)' -B '$(1).native' \ + -DCMAKE_INSTALL_PREFIX='$(BUILD_TOOLS_PREFIX)/qt6' \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)' \ + -DQT_BUILD_{TESTS,EXAMPLES,DOCS}=OFF \ + -DBUILD_WITH_PCH=OFF \ + -DFEATURE_pcre2=ON \ + -DFEATURE_{pkg_config,eventfd,glib,gui,icu,openssl,zstd,thread,system_pcre2,sql,xml,testlib,backtrace}=OFF; \ + cmake --build '$(1).native' -j '$(JOBS)'; \ + cmake --install '$(1).native'; \ + fi + + mkdir '$(1).build' + $($(PKG)_CONFIGURE_ENV) \ + 'cmake' -S '$(1)' -B '$(1).build' \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_INSTALL_PREFIX='$(HOST_PREFIX)/qt6' \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF \ + -DBUILD_WITH_PCH=OFF \ + -DFEATURE_accessibility=ON \ + -DFEATURE_dbus=OFF \ + -DFEATURE_fontconfig=OFF \ + -DFEATURE_system_freetype=ON \ + -DFEATURE_glib=OFF \ + -DFEATURE_system_harfbuzz=OFF \ + -DFEATURE_openssl=OFF \ + -DFEATURE_system_pcre2=ON \ + -DFEATURE_pkg_config=ON \ + -DFEATURE_system_zlib=ON \ + -DFEATURE_use_gold_linker_alias=OFF \ + $($(PKG)_CMAKE_OPTS) + + 'cmake' --build '$(1).build' -j '$(JOBS)' + 'cmake' --install '$(1).build' + + if [ "$(MXE_WINDOWS_BUILD)" = yes ]; then \ + $(INSTALL) -d '$(HOST_BINDIR)'; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6Concurrent.dll '$(HOST_BINDIR)'/Qt6Concurrent.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6Core.dll '$(HOST_BINDIR)'/Qt6Core.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6Gui.dll '$(HOST_BINDIR)'/Qt6Gui.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6Network.dll '$(HOST_BINDIR)'/Qt6Network.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6OpenGL.dll '$(HOST_BINDIR)'/Qt6OpenGL.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6OpenGLWidgets.dll '$(HOST_BINDIR)'/Qt6OpenGLWidgets.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6PrintSupport.dll '$(HOST_BINDIR)'/Qt6PrintSupport.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6Sql.dll '$(HOST_BINDIR)'/Qt6Sql.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt5Test.dll '$(HOST_BINDIR)'/Qt6Test.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6Widgets.dll '$(HOST_BINDIR)'/Qt6Widgets.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6Xml.dll '$(HOST_BINDIR)'/Qt6Xml.dll; \ + fi + + if [ "$(MXE_NATIVE_BUILD)" = "no" ]; then \ + ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/bin/qmake6' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qmake-qt6; \ + ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/libexec/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'moc; \ + ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/libexec/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'uic; \ + ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/libexec/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'rcc; \ + else \ + ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/bin/qt-cmake' '$(HOST_PREFIX)/qt6/bin/qt-cmake-private'; \ + fi +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt6-qtimageformats.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,24 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qt6-qtimageformats +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qt6-qtbase_VERSION) +$(PKG)_CHECKSUM := c862791790460a092869e646742bababd12e5df4 +$(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qt6-qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtimageformats,$(qt6-qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtimageformats,$(qt6-qtbase_URL)) +$(PKG)_DEPS := jasper libmng qt6-qtbase tiff + +define $(PKG)_UPDATE + echo $(qt6-qtbase_VERSION) +endef + +define $(PKG)_BUILD + mkdir '$(1).build' + cd '$(1)' && '$(HOST_PREFIX)/qt6/bin/qt-cmake-private' \ + -S '$(1)' -B '$(1).build' \ + -DCMAKE_INSTALL_PREFIX='$(HOST_PREFIX)/qt6' + cmake --build $(1).build -j '$(JOBS)' + cmake --install $(1).build +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt6-qtsvg.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,26 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qt6-qtsvg +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qt6-qtbase_VERSION) +$(PKG)_CHECKSUM := ff6e2e33add6c3254322b581a7141591a9b6941d +$(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qt6-qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtsvg,$(qt6-qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtsvg,$(qt6-qtbase_URL)) +$(PKG)_DEPS := qt6-qtbase + +define $(PKG)_UPDATE + echo $(qt6-qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(HOST_PREFIX)/qt6/bin/qt-cmake-private' -DCMAKE_INSTALL_PREFIX='$(HOST_PREFIX)/qt6' + cmake --build $(1) -j '$(JOBS)' + cmake --install $(1) + if [ $(MXE_WINDOWS_BUILD) = yes ]; then \ + $(INSTALL) -d '$(HOST_BINDIR)'; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6Svg.dll '$(HOST_BINDIR)'/Qt6Svg.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6SvgWidgets.dll '$(HOST_BINDIR)'/Qt6SvgWidgets.dll; \ + fi +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt6-qttools-1-libclang.patch Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,15 @@ +Don't check for libclang when building without it. + +diff -urN qttools-everywhere-src-6.5.2/configure.cmake qttools-everywhere-src-6.5.2/configure.cmake.orig +--- qttools-everywhere-src-6.5.2/configure.cmake.orig 2023-07-07 14:29:26.000000000 +0200 ++++ qttools-everywhere-src-6.5.2/configure.cmake 2023-09-29 10:39:40.324294579 +0200 +@@ -17,7 +17,9 @@ + # Presumably because 6.0 ClangConfig.cmake files are not good enough? + # In any case explicitly request a minimum version of 8.x for now, otherwise + # building with CMake will fail at compilation time. ++if (QT_FEATURE_clang) + qt_find_package(WrapLibClang 8 PROVIDED_TARGETS WrapLibClang::WrapLibClang) ++endif() + # special case end + + if(TARGET WrapLibClang::WrapLibClang)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt6-qttools.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,61 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qt6-qttools +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qt6-qtbase_VERSION) +$(PKG)_CHECKSUM := 28e11218a7b8bfa49b9d11b4f32b914f12d2ef22 +$(PKG)_SUBDIR = $(subst qtbase,qttools,$(qt6-qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qttools,$(qt6-qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qttools,$(qt6-qtbase_URL)) +$(PKG)_DEPS := qt6-qtbase + +define $(PKG)_UPDATE + echo $(qt6-qtbase_VERSION) +endef + +define $(PKG)_BUILD + # native tools + mkdir '$(1).tools' && cd '$(1).tools' && \ + '$(BUILD_TOOLS_PREFIX)/qt6/bin/qt-cmake' -S '$(1)' \ + -DCMAKE_INSTALL_PREFIX='$(BUILD_TOOLS_PREFIX)/qt6' \ + -DFEATURE_clang=OFF \ + -DFEATURE_clangcpp=OFF \ + -DFEATURE_linguist=ON \ + -DFEATURE_designer=OFF + + cmake --build $(1).tools -j '$(JOBS)' + cmake --install '$(1).tools' + + if [ "$(MXE_NATIVE_BUILD)" = "no" ]; then \ + ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/bin/lconvert' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'lconvert; \ + ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/bin/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'lrelease; \ + echo -e "#!/bin/sh\necho $$0 $$*" > '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qhelpgenerator && chmod a+rx '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qhelpgenerator; \ + echo -e "#!/bin/sh\necho $$0 $$*" > '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qcollectiongenerator && chmod a+rx '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qcollectiongenerator; \ + fi + + mkdir '$(1).build' && cd '$(1).build' && \ + '$(HOST_PREFIX)/qt6/bin/qt-cmake-private' -S '$(1)' \ + -DCMAKE_INSTALL_PREFIX='$(HOST_PREFIX)/qt6' \ + -DFEATURE_clang=OFF \ + -DFEATURE_clangcpp=OFF \ + -DQT_FORCE_BUILD_TOOLS=ON + + + # not built for some reason. make dummy so install won't fail + if [ "$(MXE_WINDOWS_BUILD)" = yes ]; then \ + touch '$(1).build/bin/qhelpgenerator.exe'; \ + fi + + cmake --build $(1).build -j '$(JOBS)' + cmake --install '$(1).build' + + if [ "$(MXE_WINDOWS_BUILD)" = yes ]; then \ + $(INSTALL) -d '$(HOST_BINDIR)'; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6UiTools.dll '$(HOST_BINDIR)'/Qt6UiTools.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6Help.dll '$(HOST_BINDIR)'/Qt6Help.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6Designer.dll '$(HOST_BINDIR)'/Qt6Designer.dll; \ + cp '$(HOST_PREFIX)'/qt6/bin/Qt6DesignerComponents.dll '$(HOST_BINDIR)'/Qt6DesignerComponents.dll; \ + fi +endef +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt6-qttranslations.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,21 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qt6-qttranslations +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qt6-qtbase_VERSION) +$(PKG)_CHECKSUM := 1ecc96a37d4ec9eb05f89ddfb7323df6b1c2801c +$(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qt6-qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qttranslations,$(qt6-qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qttranslations,$(qt6-qtbase_URL)) +$(PKG)_DEPS := qt6-qtbase qt6-qttools + +define $(PKG)_UPDATE + echo $(qt6-qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(HOST_PREFIX)/qt6/bin/qt-cmake-private' -DCMAKE_INSTALL_PREFIX='$(HOST_PREFIX)/qt6' -DQT_HOST_PATH='$(BUILD_TOOLS_PREFIX)/qt6' + cmake --build $(1) -j '$(JOBS)' + cmake --install $(1) +endef +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt6.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,14 @@ +PKG := qt6 +$(PKG)_VERSION = $(qt6-qtbase_VERSION) +$(PKG)_DEPS := $(patsubst $(TOP_DIR)/src/%.mk,%,\ + $(shell grep -l 'qt6-qtbase_VERSION' \ + $(TOP_DIR)/src/qt6-*.mk)) +$(PKG)_FILE = +$(PKG)_URL = +$(PKG)_CHECKSUM := #No checksum + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; + echo $($(PKG)_VERSION) +endef +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qtbase-2-fixes.patch Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,35 @@ +diff -ur qtbase-everywhere-src-5.15.9.new/src/plugins/platforms/windows/qwindowsglcontext.cpp qtbase-everywhere-src-5.15.9/src/plugins/platforms/windows/qwindowsglcontext.cpp +--- qtbase-everywhere-src-5.15.9.new/src/plugins/platforms/windows/qwindowsglcontext.cpp 2023-04-18 08:53:03.907016122 -0400 ++++ qtbase-everywhere-src-5.15.9/src/plugins/platforms/windows/qwindowsglcontext.cpp 2023-04-18 12:05:50.420715889 -0400 +@@ -179,7 +179,7 @@ + qCDebug(lcQpaGl) << "Qt: Using WGL and OpenGL from" << openglDll; + + if (useSystemLib) +- m_lib = QSystemLibrary::load((wchar_t*)(QString::fromLatin1(openglDll).utf16())); ++ m_lib = QSystemLibrary::load((wchar_t*)(QString::fromLatin1(openglDll).utf16()), false); + else + m_lib = LoadLibraryA(openglDll.constData()); + if (!m_lib) { +@@ -191,7 +191,7 @@ + // Load opengl32.dll always. GDI functions like ChoosePixelFormat do + // GetModuleHandle for opengl32.dll and behave differently (and call back into + // opengl32) when the module is present. This is fine for dummy contexts and windows. +- QSystemLibrary::load(L"opengl32"); ++ QSystemLibrary::load(L"opengl32", false); + } + + wglCreateContext = reinterpret_cast<HGLRC (WINAPI *)(HDC)>(resolve("wglCreateContext")); +Only in qtbase-everywhere-src-5.15.9/src/plugins/platforms/windows: .qwindowsglcontext.cpp.swp +diff -ur qtbase-everywhere-src-5.15.9.new/src/plugins/platforms/windows/qwindowsopengltester.cpp qtbase-everywhere-src-5.15.9/src/plugins/platforms/windows/qwindowsopengltester.cpp +--- qtbase-everywhere-src-5.15.9.new/src/plugins/platforms/windows/qwindowsopengltester.cpp 2023-04-18 08:53:03.908016176 -0400 ++++ qtbase-everywhere-src-5.15.9/src/plugins/platforms/windows/qwindowsopengltester.cpp 2023-04-18 12:02:48.957638686 -0400 +@@ -397,7 +397,7 @@ + + // Test #1: Load opengl32.dll and try to resolve an OpenGL 2 function. + // This will typically fail on systems that do not have a real OpenGL driver. +- lib = QSystemLibrary::load(L"opengl32"); ++ lib = QSystemLibrary::load(L"opengl32", false); + if (lib) { + CreateContext = reinterpret_cast<CreateContextType>( + reinterpret_cast<QFunctionPointer>(::GetProcAddress(lib, "wglCreateContext"))); +Binary files qtbase-everywhere-src-5.15.9.new/src/plugins/platforms/windows/.qwindowsopengltester.cpp.swp and qtbase-everywhere-src-5.15.9/src/plugins/platforms/windows/.qwindowsopengltester.cpp.swp differ
--- a/src/qtbase.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/qtbase.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.15.8 -$(PKG)_CHECKSUM := da6b4c7b39baf3b2659ec46ef9a6ea81485fa62f +$(PKG)_VERSION := 5.15.11 +$(PKG)_CHECKSUM := 16ad151614f7e629149a35b199c14d436c1c5fbd $(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) @@ -43,10 +43,10 @@ endif define $(PKG)_UPDATE - $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/ | \ + $(WGET) -q -O- http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/ | \ $(SED) -n 's,.*href="\(5\.[0-9]\+\.[^/]*\)/".*,\1,p' | \ grep -iv -- '-rc' | \ - sort | + sort -V | tail -1 endef
--- a/src/qtimageformats.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/qtimageformats.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 20123da62eb387fefb100b78ecb2eecb9be2be12 +$(PKG)_CHECKSUM := 5da2e591f99c7c5d5acda946ac7228f63f1c923d $(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 Mon Oct 09 11:28:54 2023 -0400 +++ b/src/qtsvg.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := df1dc97f78b04705354f14896d6d4474274ffb6c +$(PKG)_CHECKSUM := 0c253e570b630ad45026a77ff8296d56fb7330a1 $(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 Mon Oct 09 11:28:54 2023 -0400 +++ b/src/qttools.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a8684f602124f9d66a0028f2c048a32c1a467d00 +$(PKG)_CHECKSUM := 16261f5ea7d361f59fbd87c04adae09d837624d9 $(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 Mon Oct 09 11:28:54 2023 -0400 +++ b/src/qttranslations.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := d8a8f43838c5e953005c714c9b822408cd38d478 +$(PKG)_CHECKSUM := 05ceb59e69b2dd97167f764c204e16ee917c7667 $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/randrproto.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,28 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := randrproto +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.5.0 +$(PKG)_CHECKSUM := bc420745dc4af011988e9dcabdadf8829cbc2374 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 + +$(PKG)_URL := http://www.x.org/archive/individual/proto/$($(PKG)_FILE) +$(PKG)_DEPS := + +ifeq ($(MXE_WINDOWS_BUILD),yes) + define $(PKG)_BUILD + endef +else + define $(PKG)_BUILD + mkdir '$(1)/.build' + cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + --prefix='$(HOST_PREFIX)' \ + && $(CONFIGURE_POST_HOOK) + + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' + endef +endif
--- a/src/release-octave.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/release-octave.mk Thu Oct 12 20:31:13 2023 +0200 @@ -12,7 +12,7 @@ ## --enable-octave=release ## --enable-binary-packages ## --enable-devel-tools -## --enable-qt5 +## --enable-qt=5 ## --disable-system-opengl ## ## and one of the following @@ -44,10 +44,14 @@ endif $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qhull qrupdate qscintilla rapidjson readline sundials-ida suitesparse texinfo zlib -ifeq ($(ENABLE_QT5),yes) +ifeq ($(ENABLE_QT),4) + $(PKG)_DEPS += qt +endif +ifeq ($(ENABLE_QT),5) $(PKG)_DEPS += qt5 -else - $(PKG)_DEPS += qt +endif +ifeq ($(ENABLE_QT),6) + $(PKG)_DEPS += qt6 endif ifeq ($(USE_SYSTEM_OPENGL),no) @@ -95,17 +99,23 @@ RCC_QTVER=$(MXE_RCC) \ LRELEASE_QTVER=$(MXE_LRELEASE) -ifeq ($(ENABLE_QT5),yes) +ifeq ($(ENABLE_QT),4) + $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" + $(PKG)_QTDIR := $(HOST_PREFIX) + $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt4" +endif +ifeq ($(ENABLE_QT),5) #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" $(PKG)_QTDIR := $(HOST_PREFIX)/qt5 $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt5" -else - $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" - $(PKG)_QTDIR := $(HOST_PREFIX) - $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt4" endif - +ifeq ($(ENABLE_QT),6) + #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" + $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt6/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" + $(PKG)_QTDIR := $(HOST_PREFIX)/qt6 + $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt6" +endif ifneq ($(ENABLE_DOCS),yes) $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
--- a/src/rtmidi.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/rtmidi.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := rtmidi $(PKG)_IGNORE := -$(PKG)_VERSION := 5.0.0 -$(PKG)_CHECKSUM := e208da4f468b44ab64d0e842e703f5a2e312d03e +$(PKG)_VERSION := 6.0.0 +$(PKG)_CHECKSUM := baca7e388062ec406cbcfe3ea7a2697541428a1e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/thestk/$(PKG)/archive/$($(PKG)_VERSION).tar.gz
--- a/src/sdl2.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/sdl2.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := sdl2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.26.2 -$(PKG)_CHECKSUM := 2a1415a201ac07c353c6d8e4daaa11c8910fb879 +$(PKG)_VERSION := 2.28.4 +$(PKG)_CHECKSUM := 13e5beb7696799b606e86dc743ee57f4346eb393 $(PKG)_SUBDIR := SDL2-$($(PKG)_VERSION) $(PKG)_FILE := SDL2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libsdl.org/release/$($(PKG)_FILE)
--- a/src/sdl2_image.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/sdl2_image.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := sdl2_image $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6.2 -$(PKG)_CHECKSUM := 955e0a8ee89f22829f4a72e1774e6e3f9225712c +$(PKG)_VERSION := 2.6.3 +$(PKG)_CHECKSUM := f4f616ccbba2f3b41383edb47b449439aa51d443 $(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 Mon Oct 09 11:28:54 2023 -0400 +++ b/src/sdl2_mixer.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := sdl2_mixer $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6.2 -$(PKG)_CHECKSUM := 036fc7839a6b8dc1af3dbfed4e2531224bbacdd7 +$(PKG)_VERSION := 2.6.3 +$(PKG)_CHECKSUM := a6913b7684a3ab17f640a33ce56552fc8b3a6d0e $(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 Mon Oct 09 11:28:54 2023 -0400 +++ b/src/sdl2_ttf.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := sdl2_ttf $(PKG)_IGNORE := -$(PKG)_VERSION := 2.20.1 -$(PKG)_CHECKSUM := f774ff407915ae4afa3d03e5a9395283d9090f28 +$(PKG)_VERSION := 2.20.2 +$(PKG)_CHECKSUM := 2326e02810b20f3221d71a0bc76dc06acdc23f6e $(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 Mon Oct 09 11:28:54 2023 -0400 +++ b/src/sqlite.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,11 +3,11 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3400100 -$(PKG)_CHECKSUM := b8c2d4bc0094f5c0ce985dc0e237dfcbaa1f6275 +$(PKG)_VERSION := 3430100 +$(PKG)_CHECKSUM := 194f57642f191939a16399208a10b5e0a827b916 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.sqlite.org/2022/$($(PKG)_FILE) +$(PKG)_URL := http://www.sqlite.org/2023/$($(PKG)_FILE) $(PKG)_DEPS := readline zlib ifeq ($(MXE_SYSTEM),mingw)
--- a/src/src-msys2-bash.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-bash.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-bash $(PKG)_NAME := bash $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.009-1 -$(PKG)_CHECKSUM := ddc98b4ec3073bd895f1c7882f0984f661d69348 +$(PKG)_VERSION := 5.2.015-2 +$(PKG)_CHECKSUM := 89db9d84a68343ac3d07c9e75e07583e05f57801 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-ca-certificates.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-ca-certificates.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-ca-certificates $(PKG)_NAME := ca-certificates $(PKG)_IGNORE := -$(PKG)_VERSION := 20211016-2 -$(PKG)_CHECKSUM := 1cf7b39efd7e605d690c1749b369333661ef23a0 +$(PKG)_VERSION := 20230311-1 +$(PKG)_CHECKSUM := e0e190f0486ff664d5714f1a65b0ba102b638fec $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-diffutils.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-diffutils.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-diffutils $(PKG)_NAME := diffutils $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8-4 -$(PKG)_CHECKSUM := 178afff8e1b53dcfc9cb844d797cce671ba47319 +$(PKG)_VERSION := 3.10-1 +$(PKG)_CHECKSUM := b938fd792dc0bcd16a65f470a09d58556d5109df $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-dos2unix.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-dos2unix.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-dos2unix $(PKG)_NAME := dos2unix $(PKG)_IGNORE := -$(PKG)_VERSION := 7.4.3-1 -$(PKG)_CHECKSUM := ea3ddac0ee38304ae4bc530ab613043e2fc4cc6f +$(PKG)_VERSION := 7.5.1-1 +$(PKG)_CHECKSUM := ee87d112ebbc5895ded18a20a96387bad3bcf6d3 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-filesystem.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-filesystem.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-filesystem $(PKG)_NAME := filesystem $(PKG)_IGNORE := -$(PKG)_VERSION := 2022.01-7 -$(PKG)_CHECKSUM := 0ec7a7227e5e258c5268820cef07818fc5baf8d9 +$(PKG)_VERSION := 2023.02.07-1 +$(PKG)_CHECKSUM := db3fbd128e070ffc73ce0e64aaf94fdf664120a9 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-gawk.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-gawk.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-gawk $(PKG)_NAME := gawk $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.1-2 -$(PKG)_CHECKSUM := e7093cca4ba20036c329d1ac9f6b2cd09a18c1a9 +$(PKG)_VERSION := 5.2.2-1 +$(PKG)_CHECKSUM := bdd1b2c341b468ed4d92d701827e55efc6bf0fb9 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-gcc-libs.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-gcc-libs.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-gcc-libs $(PKG)_NAME := gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 11.3.0-2 -$(PKG)_CHECKSUM := 1e5ae0316535398bee7bca5e0fdd4080e0391b1c +$(PKG)_VERSION := 13.2.0-2 +$(PKG)_CHECKSUM := 1d9e1ecc84f1dfdb9416987eae9a451084683b6f $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-glib2.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-glib2.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-glib2 $(PKG)_NAME := glib2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.74.4-1 -$(PKG)_CHECKSUM := a3ec5b68732a1f65f030e55503db940f033d3a41 +$(PKG)_VERSION := 2.76.5-1 +$(PKG)_CHECKSUM := 63907edd3f12a890bf40cd10974da522058c2f01 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-gmp.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-gmp.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-gmp $(PKG)_NAME := gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2.1-2 -$(PKG)_CHECKSUM := 21eaefd397b9501abcb2c0337d98691adaa09483 +$(PKG)_VERSION := 6.3.0-1 +$(PKG)_CHECKSUM := b0ffe04d0f93d0e82d55ddae752e15306a260bd1 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-gnupg.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-gnupg.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-gnupg $(PKG)_NAME := gnupg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.40-1 -$(PKG)_CHECKSUM := 54756aa27874ec173e7da6fec11625214fd2e0a1 +$(PKG)_VERSION := 2.2.41-1 +$(PKG)_CHECKSUM := 94a250febe56fe1568c5c5d932c71959ebaccd1e $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-grep.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-grep.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,10 +4,10 @@ PKG := src-msys2-grep $(PKG)_NAME := grep $(PKG)_IGNORE := -$(PKG)_VERSION := 3.6-1 -$(PKG)_CHECKSUM := f34fb6fb773e4c624913f3cbcb909e10115c60df +$(PKG)_VERSION := 1~3.0-6 +$(PKG)_CHECKSUM := 40f04069fbe2058693fcb23b3b247e367c43dc2a $(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-gzip.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-gzip.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-gzip $(PKG)_NAME := gzip $(PKG)_IGNORE := -$(PKG)_VERSION := 1.12-2 -$(PKG)_CHECKSUM := f83bc7df61d3e243d9d152c29e00635f366d4c6d +$(PKG)_VERSION := 1.13-1 +$(PKG)_CHECKSUM := 5c534330d54d49e6b26a5447000bd0c3c6307a4b $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-icu.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-icu.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-icu $(PKG)_NAME := icu $(PKG)_IGNORE := -$(PKG)_VERSION := 71.1-2 -$(PKG)_CHECKSUM := 53c88a1f5a9994e6b49e6e0917f6150fb187b761 +$(PKG)_VERSION := 73.2-2 +$(PKG)_CHECKSUM := d7140dd715d108a23c1b4691049d5ac13113ea7f $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-info.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-info.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-info $(PKG)_NAME := texinfo $(PKG)_IGNORE := -$(PKG)_VERSION := 7.0.1-1 -$(PKG)_CHECKSUM := 32d0c598b91257fbc70227a8b67d4bf330110231 +$(PKG)_VERSION := 7.0.3-3 +$(PKG)_CHECKSUM := 8bb87e7f09745a55d100db4e246fedf46440e21c $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-keyring.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-keyring.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-keyring $(PKG)_NAME := msys2-keyring $(PKG)_IGNORE := -$(PKG)_VERSION := 1~20221024-1 -$(PKG)_CHECKSUM := a6ea41ae7aff8c41b43673c612dc893442736120 +$(PKG)_VERSION := 1~20230703-1 +$(PKG)_CHECKSUM := 7a285e4a3256ebce0d0aca225723284b137fcbcc $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-less.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-less.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-less $(PKG)_NAME := less $(PKG)_IGNORE := -$(PKG)_VERSION := 608-2 -$(PKG)_CHECKSUM := 0ef364cd3b2c25580dafe4c995731dc15e7bab2e +$(PKG)_VERSION := 643-1 +$(PKG)_CHECKSUM := d12daaff07e8709484c11ff73572b46d1820a52b $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libassuan.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libassuan.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libassuan $(PKG)_NAME := libassuan $(PKG)_IGNORE := -$(PKG)_VERSION := 2.5.5-2 -$(PKG)_CHECKSUM := 31be8f746eddf218efcac1c155a964516609f9a5 +$(PKG)_VERSION := 2.5.6-1 +$(PKG)_CHECKSUM := f349530c6ace9c29edc8a58dd9c2714d583ce000 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libcrypt.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libcrypt.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libcrypt $(PKG)_NAME := libcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1-4 -$(PKG)_CHECKSUM := 64e2e2d09f8be857dea75a49680f6f4b44939102 +$(PKG)_VERSION := 2.1-5 +$(PKG)_CHECKSUM := 05b6ce200f5c93525850bd0f2033408e43272895 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libgcrypt.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libgcrypt.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libgcrypt $(PKG)_NAME := libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10.1-5 -$(PKG)_CHECKSUM := 8bcc3d372a608b90b85946685511fdb9ffb6cb7b +$(PKG)_VERSION := 1.10.2-1 +$(PKG)_CHECKSUM := be49ffff9493444719c5830b9bafcb9234fd16f5 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libgnutls.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libgnutls.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libgnutls $(PKG)_NAME := gnutls $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.8-2 -$(PKG)_CHECKSUM := cc647c48a61db5fb030ee8fc53684a822137f221 +$(PKG)_VERSION := 3.8.1-2 +$(PKG)_CHECKSUM := 25da484f343925aeced5371ba7bd0088e10eb156 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libgpg-error.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libgpg-error.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libgpg-error $(PKG)_NAME := libgpg-error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.46-2 -$(PKG)_CHECKSUM := cd1b88fdbd36651d747388e7480690ea2e79df0a +$(PKG)_VERSION := 1.47-1 +$(PKG)_CHECKSUM := 16c589613d6925f695e7d0ce9070e50dad8a9d1b $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libgpgme.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libgpgme.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libgpgme $(PKG)_NAME := gpgme $(PKG)_IGNORE := -$(PKG)_VERSION := 1.18.0-1 -$(PKG)_CHECKSUM := d0b87db985c697d0402e608da24fe55d8beaf8b2 +$(PKG)_VERSION := 1.22.0-2 +$(PKG)_CHECKSUM := ae4719b87874c768ae8b1e379a8ec45ac92ced52 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libhogweed.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libhogweed.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libhogweed $(PKG)_NAME := nettle $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.1-1 -$(PKG)_CHECKSUM := cf15540413967bb3e2d10d9b46adcea893dc6403 +$(PKG)_VERSION := 3.9.1-1 +$(PKG)_CHECKSUM := e05e1592871941b9a1401f3ca9996b7e1233d683 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libintl.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libintl.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libintl $(PKG)_NAME := gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21-2 -$(PKG)_CHECKSUM := 3eeff5b551951146daeb8d1d7dd68379940d4a58 +$(PKG)_VERSION := 0.22-2 +$(PKG)_CHECKSUM := 00854be190ff5c3a6b8c8b9914478b758787acbc $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libksba.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libksba.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libksba $(PKG)_NAME := libksba $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.3-1 -$(PKG)_CHECKSUM := 05dafb08e05107d98f728c5f980e4c99b77aae9f +$(PKG)_VERSION := 1.6.4-1 +$(PKG)_CHECKSUM := ab67f815ddd05efc4d21f2613a02a3b0f6e1bf68 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-liblzma.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-liblzma.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-liblzma $(PKG)_NAME := xz $(PKG)_IGNORE := -$(PKG)_VERSION := 5.4.0-1 -$(PKG)_CHECKSUM := 4ff47b25f88f6540cd55fc9d52daa2bfb6941d41 +$(PKG)_VERSION := 5.4.4-1 +$(PKG)_CHECKSUM := 97a5a6b16852843178115e659e5870c42f72d146 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libnettle.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libnettle.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libnettle $(PKG)_NAME := nettle $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.1-1 -$(PKG)_CHECKSUM := cf15540413967bb3e2d10d9b46adcea893dc6403 +$(PKG)_VERSION := 3.9.1-1 +$(PKG)_CHECKSUM := e05e1592871941b9a1401f3ca9996b7e1233d683 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libopenssl.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libopenssl.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libopenssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.7-2 -$(PKG)_CHECKSUM := 45735dd4323009a6cb60c10bfe6191ad48a1e01d +$(PKG)_VERSION := 3.1.2-1 +$(PKG)_CHECKSUM := 32af2e450d159854074fea58304fe94909a7d439 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libp11-kit.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libp11-kit.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libp11-kit $(PKG)_NAME := p11-kit $(PKG)_IGNORE := -$(PKG)_VERSION := 0.24.1-4 -$(PKG)_CHECKSUM := 1e5c0177c046c5d66088c063723c5df9a36cd7db +$(PKG)_VERSION := 0.25.0-1 +$(PKG)_CHECKSUM := d0c50449e4573d459ff001fbf91af0ced6a33117 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libpcre.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libpcre.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libpcre $(PKG)_NAME := pcre $(PKG)_IGNORE := -$(PKG)_VERSION := 8.45-3 -$(PKG)_CHECKSUM := a51c3ab0780515ed42078db69e8e5cecbec71710 +$(PKG)_VERSION := 8.45-4 +$(PKG)_CHECKSUM := 8c868c9ab0bdcac5b44829b57ba12c38d23a5497 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libreadline.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libreadline.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libreadline $(PKG)_NAME := readline $(PKG)_IGNORE := -$(PKG)_VERSION := 8.2.001-1 -$(PKG)_CHECKSUM := 3e0255936341f2a9610f979c6f7669258863905f +$(PKG)_VERSION := 8.2.001-3 +$(PKG)_CHECKSUM := 76fc4896b9c2572696139d458e895574e781fc56 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libsqlite.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libsqlite.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libsqlite $(PKG)_NAME := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3.40.1-1 -$(PKG)_CHECKSUM := 1391f6f117e4e9151187af3da8efd120080df08a +$(PKG)_VERSION := 3.42.0-2 +$(PKG)_CHECKSUM := 41333ba77869ffefd12ed5115459de50be36584e $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libutil-linux.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libutil-linux.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libutil-linux $(PKG)_NAME := util-linux $(PKG)_IGNORE := -$(PKG)_VERSION := 2.35.2-3 -$(PKG)_CHECKSUM := 83a4e943497f6c0b781d89f6d0903e035aa8d439 +$(PKG)_VERSION := 2.35.2-4 +$(PKG)_CHECKSUM := b4e85a8402d0d60a80905d895ce323d6f198a25f $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/src-msys2-libxcrypt.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,22 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := src-msys2-libxcrypt +$(PKG)_NAME := libxcrypt +$(PKG)_IGNORE := +$(PKG)_VERSION := 4.4.36-1 +$(PKG)_CHECKSUM := 28bf05a8a8c57d6bfb200dfb5e6f6335139927b8 +$(PKG)_SUBDIR := +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst +$(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) + +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(WGET) -q -O- '$(MSYS2_BASE_URL)/' | \ + $(SED) -n 's,.*title="$($(PKG)_NAME)-\([0-9][^"]*\)".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD +endef
--- a/src/src-msys2-libxml2.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libxml2.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libxml2 $(PKG)_NAME := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.10.3-2 -$(PKG)_CHECKSUM := a10d2d6838d783f5c82a5085de2f05c817f5f10d +$(PKG)_VERSION := 2.11.5-1 +$(PKG)_CHECKSUM := 8aa88bd665cb2d73a8eed6fdf7488f5c9e318b5d $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-libxslt.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-libxslt.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-libxslt $(PKG)_NAME := libxslt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.37-1 -$(PKG)_CHECKSUM := 8bf383550a1731426fbd374f3f752610a6ba0225 +$(PKG)_VERSION := 1.1.38-1 +$(PKG)_CHECKSUM := 5cd669967f701fbe33ef99a555d07c5f304394fe $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-make.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-make.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-make $(PKG)_NAME := make $(PKG)_IGNORE := -$(PKG)_VERSION := 4.4-1 -$(PKG)_CHECKSUM := b71fc4b2bd48a4488b7dce5355efe55cf7d45ad8 +$(PKG)_VERSION := 4.4.1-1 +$(PKG)_CHECKSUM := 7ce68f81851ecc215e8912dc91998fc3a9934898 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-mintty.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-mintty.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,9 +4,9 @@ PKG := src-msys2-mintty $(PKG)_NAME := mintty $(PKG)_IGNORE := -$(PKG)_VERSION := 1~3.6.3-1 +$(PKG)_VERSION := 1~3.6.5-1 $(PKG)_FILTER := mintty-1~ -$(PKG)_CHECKSUM := 3cab0151201f862e5bc1797b65b1d87eeb3113f9 +$(PKG)_CHECKSUM := 9b83abd519e814311768ad197b39e64d7b5e59ab $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-mpdecimal.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-mpdecimal.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,10 +4,10 @@ PKG := src-msys2-mpdecimal $(PKG)_NAME := mpdecimal $(PKG)_IGNORE := -$(PKG)_VERSION := 2.5.0-1 -$(PKG)_CHECKSUM := 5469641967af008773a08d3532ae3303cc7162ec +$(PKG)_VERSION := 2.5.1-2 +$(PKG)_CHECKSUM := ecae02a4b19ad5be64f7a876bde58c46a506f4b2 $(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-mpfr.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-mpfr.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-mpfr $(PKG)_NAME := mpfr $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.1.p1-1 -$(PKG)_CHECKSUM := d3cbb6198cf3ebfa7e8c60930c54b7f209f43cf7 +$(PKG)_VERSION := 4.2.1-1 +$(PKG)_CHECKSUM := adeb96251b3432257de84b23236907c8f63a92aa $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-ncurses.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-ncurses.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-ncurses $(PKG)_NAME := ncurses $(PKG)_IGNORE := -$(PKG)_VERSION := 6.3-3 -$(PKG)_CHECKSUM := 0f73498b362ef15c5928cf2e1a143a815f9b3779 +$(PKG)_VERSION := 6.4-2 +$(PKG)_CHECKSUM := 4968af741b124b7ad600993fda5f36a8ab7cc2f9 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-openssl.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-openssl.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-openssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.7-2 -$(PKG)_CHECKSUM := 45735dd4323009a6cb60c10bfe6191ad48a1e01d +$(PKG)_VERSION := 3.1.2-1 +$(PKG)_CHECKSUM := 32af2e450d159854074fea58304fe94909a7d439 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-p11-kit.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-p11-kit.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-p11-kit $(PKG)_NAME := p11-kit $(PKG)_IGNORE := -$(PKG)_VERSION := 0.24.1-4 -$(PKG)_CHECKSUM := 1e5c0177c046c5d66088c063723c5df9a36cd7db +$(PKG)_VERSION := 0.25.0-1 +$(PKG)_CHECKSUM := d0c50449e4573d459ff001fbf91af0ced6a33117 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-pacman.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-pacman.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-pacman $(PKG)_NAME := pacman $(PKG)_IGNORE := -$(PKG)_VERSION := 6.0.1-28 -$(PKG)_CHECKSUM := b55152d05fc29a9feb6aae5ad91fc290d0029e2b +$(PKG)_VERSION := 6.0.2-9 +$(PKG)_CHECKSUM := c646d517dc4798f5c45b2788ebe8f703a086d8f2 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-perl.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-perl.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-perl $(PKG)_NAME := perl $(PKG)_IGNORE := -$(PKG)_VERSION := 5.36.0-1 -$(PKG)_CHECKSUM := 02fa285847f4e266db3bb7d9a25cce09171bcfb8 +$(PKG)_VERSION := 5.36.1-2 +$(PKG)_CHECKSUM := c09b7a8c0386e309ac30deb42cdaf3a8c91a3b0d $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-python.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-python.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-python $(PKG)_NAME := python $(PKG)_IGNORE := -$(PKG)_VERSION := 3.10.9-2 -$(PKG)_CHECKSUM := 15e2989c5df009b2e4cb8985bfe26dd40ad26ab7 +$(PKG)_VERSION := 3.11.5-1 +$(PKG)_CHECKSUM := deb61459de019b33cbbcdbef68598baf32a4f3f3 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-wget.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-wget.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-wget $(PKG)_NAME := wget $(PKG)_IGNORE := -$(PKG)_VERSION := 1.21.3-2 -$(PKG)_CHECKSUM := 71774bbedcd6df0deae160e8d3a747f26bbe0a8a +$(PKG)_VERSION := 1.21.4-1 +$(PKG)_CHECKSUM := c43faa8514eb3b9b3b2d0aa31a38f10e7880f336 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-zlib.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/src-msys2-zlib.mk Thu Oct 12 20:31:13 2023 +0200 @@ -4,8 +4,8 @@ PKG := src-msys2-zlib $(PKG)_NAME := zlib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.13-1 -$(PKG)_CHECKSUM := 0b05136843017be4d81bef217f463f5c264700c7 +$(PKG)_VERSION := 1.3-1 +$(PKG)_CHECKSUM := 663aa0fc7bd98d1436aeeed818be9cb3773f3834 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/stable-octave.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/stable-octave.mk Thu Oct 12 20:31:13 2023 +0200 @@ -23,10 +23,14 @@ endif $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qhull qrupdate qscintilla rapidjson readline sundials-ida suitesparse texinfo zlib -ifeq ($(ENABLE_QT5),yes) +ifeq ($(ENABLE_QT),4) + $(PKG)_DEPS += qt +endif +ifeq ($(ENABLE_QT),5) $(PKG)_DEPS += qt5 -else - $(PKG)_DEPS += qt +endif +ifeq ($(ENABLE_QT),6) + $(PKG)_DEPS += qt6 endif ifeq ($(USE_SYSTEM_OPENGL),no) @@ -74,17 +78,23 @@ RCC_QTVER=$(MXE_RCC) \ LRELEASE_QTVER=$(MXE_LRELEASE) -ifeq ($(ENABLE_QT5),yes) +ifeq ($(ENABLE_QT),4) + $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" + $(PKG)_QTDIR := $(HOST_PREFIX) + $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt4" +endif +ifeq ($(ENABLE_QT),5) #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" $(PKG)_QTDIR := $(HOST_PREFIX)/qt5 $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt5" -else - $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" - $(PKG)_QTDIR := $(HOST_PREFIX) - $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt4" endif - +ifeq ($(ENABLE_QT),6) + #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" + $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt6/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" + $(PKG)_QTDIR := $(HOST_PREFIX)/qt6 + $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt6" +endif ifneq ($(ENABLE_DOCS),yes) $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
--- a/src/suitesparse-1-fixes.patch Mon Oct 09 11:28:54 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,814 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore <tonyt@logyst.com> -Date: Tue, 21 Nov 2017 00:39:21 +1100 -Subject: [PATCH 1/3] mingw-w64-Use-a-not-lib-as-AR_TARGET-extension - -taken from: -https://github.com/Alexpux/MINGW-packages/blob/6d1afc34842f2faf6c50c04e5904cdb8b7f20e3b/mingw-w64-suitesparse/0001-mingw-w64-Use-a-not-lib-as-AR_TARGET-extension.patch - -diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk -index 1111111..2222222 100644 ---- a/SuiteSparse_config/SuiteSparse_config.mk -+++ b/SuiteSparse_config/SuiteSparse_config.mk -@@ -440,7 +441,7 @@ SO_OPTS = $(LDFLAGS) - - ifeq ($(UNAME),Windows) - # Cygwin Make on Windows -- AR_TARGET = $(LIBRARY).lib -+ AR_TARGET = $(LIBRARY).a - SO_TARGET = $(LIBRARY).dll - # The following two links are just garbage copies of the real target - # they aren't actually supported by this OS - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore <tonyt@logyst.com> -Date: Tue, 21 Nov 2017 00:41:07 +1100 -Subject: [PATCH 2/3] - mingw-w64-Set-SO_OPTS--shared-move-dlls-create-import-libs - -taken from: -https://github.com/Alexpux/MINGW-packages/blob/6d1afc34842f2faf6c50c04e5904cdb8b7f20e3b/mingw-w64-suitesparse/0002-mingw-w64-Set-SO_OPTS--shared-move-dlls-create-import-libs.patch - -diff --git a/AMD/Lib/Makefile b/AMD/Lib/Makefile -index 1111111..2222222 100644 ---- a/AMD/Lib/Makefile -+++ b/AMD/Lib/Makefile -@@ -81,28 +81,24 @@ libamdf77.a: $(AMDF77) - #------------------------------------------------------------------------------- - - # install AMD --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/amd.h $(INSTALL_INCLUDE) - $(CP) ../Doc/AMD_UserGuide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/AMD_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/amd.h - chmod 644 $(INSTALL_DOC)/AMD_UserGuide.pdf - chmod 644 $(INSTALL_DOC)/AMD_README.txt - - # uninstall AMD - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/amd.h - $(RM) $(INSTALL_DOC)/AMD_UserGuide.pdf - $(RM) $(INSTALL_DOC)/AMD_README.txt -diff --git a/BTF/Lib/Makefile b/BTF/Lib/Makefile -index 1111111..2222222 100644 ---- a/BTF/Lib/Makefile -+++ b/BTF/Lib/Makefile -@@ -66,25 +66,21 @@ btf_l_strongcomp.o: ../Source/btf_strongcomp.c - #------------------------------------------------------------------------------- - - # install BTF --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/btf.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/BTF_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/btf.h - chmod 644 $(INSTALL_DOC)/BTF_README.txt - - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/btf.h - $(RM) $(INSTALL_DOC)/BTF_README.txt - -diff --git a/CAMD/Lib/Makefile b/CAMD/Lib/Makefile -index 1111111..2222222 100644 ---- a/CAMD/Lib/Makefile -+++ b/CAMD/Lib/Makefile -@@ -62,28 +62,24 @@ $(AR_TARGET): $(OBJ) - #------------------------------------------------------------------------------- - - # install CAMD --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/camd.h $(INSTALL_INCLUDE) - $(CP) ../Doc/CAMD_UserGuide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/CAMD_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/camd.h - chmod 644 $(INSTALL_DOC)/CAMD_UserGuide.pdf - chmod 644 $(INSTALL_DOC)/CAMD_README.txt - - # uninstall CAMD - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/camd.h - $(RM) $(INSTALL_DOC)/CAMD_UserGuide.pdf - $(RM) $(INSTALL_DOC)/CAMD_README.txt -diff --git a/CCOLAMD/Lib/Makefile b/CCOLAMD/Lib/Makefile -index 1111111..2222222 100644 ---- a/CCOLAMD/Lib/Makefile -+++ b/CCOLAMD/Lib/Makefile -@@ -49,25 +49,21 @@ distclean: clean - - $(RM) -r $(PURGE) - - # install CCOLAMD --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/ccolamd.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/CCOLAMD_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/ccolamd.h - chmod 644 $(INSTALL_DOC)/CCOLAMD_README.txt - - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/ccolamd.h - $(RM) $(INSTALL_DOC)/CCOLAMD_README.txt - -diff --git a/CHOLMOD/Lib/Makefile b/CHOLMOD/Lib/Makefile -index 1111111..2222222 100644 ---- a/CHOLMOD/Lib/Makefile -+++ b/CHOLMOD/Lib/Makefile -@@ -535,29 +535,25 @@ cholmod_l_gpu.o: ../GPU/cholmod_gpu.c - #------------------------------------------------------------------------------- - - # install CHOLMOD --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CXX) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/cholmod*.h $(INSTALL_INCLUDE) - $(RM) $(INSTALL_INCLUDE)/cholmod_internal.h - $(CP) ../Doc/CHOLMOD_UserGuide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/CHOLMOD_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/cholmod*.h - chmod 644 $(INSTALL_DOC)/CHOLMOD_UserGuide.pdf - chmod 644 $(INSTALL_DOC)/CHOLMOD_README.txt - - # uninstall CHOLMOD - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/cholmod*.h - $(RM) $(INSTALL_DOC)/CHOLMOD_UserGuide.pdf - $(RM) $(INSTALL_DOC)/CHOLMOD_README.txt -diff --git a/COLAMD/Lib/Makefile b/COLAMD/Lib/Makefile -index 1111111..2222222 100644 ---- a/COLAMD/Lib/Makefile -+++ b/COLAMD/Lib/Makefile -@@ -49,25 +49,21 @@ distclean: clean - - $(RM) -r $(PURGE) - - # install COLAMD --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/colamd.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/COLAMD_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/colamd.h - chmod 644 $(INSTALL_DOC)/COLAMD_README.txt - - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/colamd.h - $(RM) $(INSTALL_DOC)/COLAMD_README.txt - -diff --git a/CXSparse/Lib/Makefile b/CXSparse/Lib/Makefile -index 1111111..2222222 100644 ---- a/CXSparse/Lib/Makefile -+++ b/CXSparse/Lib/Makefile -@@ -113,26 +113,22 @@ distclean: clean - - $(RM) -r $(PURGE) - - # install CXSparse --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(CS) -+$(INSTALL_SO)/$(SO_TARGET): $(CS) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/cs.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/CXSPARSE_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/cs.h - chmod 644 $(INSTALL_DOC)/CXSPARSE_README.txt - - # uninstall CXSparse - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/cs.h - $(RM) $(INSTALL_DOC)/CXSPARSE_README.txt - -diff --git a/CXSparse_newfiles/Lib/Makefile b/CXSparse_newfiles/Lib/Makefile -index 1111111..2222222 100644 ---- a/CXSparse_newfiles/Lib/Makefile -+++ b/CXSparse_newfiles/Lib/Makefile -@@ -113,26 +113,22 @@ distclean: clean - - $(RM) -r $(PURGE) - - # install CXSparse --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(CS) -+$(INSTALL_SO)/$(SO_TARGET): $(CS) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/cs.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/CXSPARSE_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/cs.h - chmod 644 $(INSTALL_DOC)/CXSPARSE_README.txt - - # uninstall CXSparse - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/cs.h - $(RM) $(INSTALL_DOC)/CXSPARSE_README.txt - -diff --git a/GPUQREngine/Lib/Makefile b/GPUQREngine/Lib/Makefile -index 1111111..2222222 100644 ---- a/GPUQREngine/Lib/Makefile -+++ b/GPUQREngine/Lib/Makefile -@@ -129,24 +129,20 @@ $(AR_TARGET): $(OBJS) - #------------------------------------------------------------------------------- - - # install GPUQREngine. Note that the include files are not installed. --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJS) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJS) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CXX) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../README.txt $(INSTALL_DOC)/GPUQRENGINE_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_DOC)/GPUQRENGINE_README.txt - - # uninstall GPUQREngine - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_DOC)/GPUQRENGINE_README.txt - - #------------------------------------------------------------------------------- -diff --git a/KLU/Lib/Makefile b/KLU/Lib/Makefile -index 1111111..2222222 100644 ---- a/KLU/Lib/Makefile -+++ b/KLU/Lib/Makefile -@@ -263,28 +263,24 @@ klu_l_memory.o: ../Source/klu_memory.c - #------------------------------------------------------------------------------- - - # install KLU --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/klu.h $(INSTALL_INCLUDE) - $(CP) ../Doc/KLU_UserGuide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/KLU_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/klu.h - chmod 644 $(INSTALL_DOC)/KLU_UserGuide.pdf - chmod 644 $(INSTALL_DOC)/KLU_README.txt - - # uninstall KLU - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/klu.h - $(RM) $(INSTALL_DOC)/KLU_UserGuide.pdf - $(RM) $(INSTALL_DOC)/KLU_README.txt -diff --git a/LDL/Lib/Makefile b/LDL/Lib/Makefile -index 1111111..2222222 100644 ---- a/LDL/Lib/Makefile -+++ b/LDL/Lib/Makefile -@@ -46,28 +46,24 @@ clean: - - $(RM) -r $(CLEAN) - - # install LDL --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/ldl.h $(INSTALL_INCLUDE) - $(CP) ../Doc/ldl_userguide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/LDL_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/ldl.h - chmod 644 $(INSTALL_DOC)/ldl_userguide.pdf - chmod 644 $(INSTALL_DOC)/LDL_README.txt - - # uninstall LDL - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/ldl.h - $(RM) $(INSTALL_DOC)/ldl_userguide.pdf - $(RM) $(INSTALL_DOC)/LDL_README.txt -diff --git a/Makefile b/Makefile -index 1111111..2222222 100644 ---- a/Makefile -+++ b/Makefile -@@ -63,13 +63,13 @@ ifeq (,$(MY_METIS_LIB)) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) -- - $(CP) lib/libmetis.* $(INSTALL_LIB) -+ - $(CP) lib/libmetis.* $(INSTALL_SO) - - $(CP) metis-5.1.0/manual/manual.pdf $(INSTALL_DOC)/METIS_manual.pdf - - $(CP) metis-5.1.0/README.txt $(INSTALL_DOC)/METIS_README.txt - # the following is needed only on the Mac, so *.dylib is hardcoded: - $(SO_INSTALL_NAME) $(INSTALL_LIB)/libmetis.dylib $(INSTALL_LIB)/libmetis.dylib - - $(CP) include/metis.h $(INSTALL_INCLUDE) -- chmod 755 $(INSTALL_LIB)/libmetis.* -+ chmod 755 $(INSTALL_SO)/libmetis.* - chmod 644 $(INSTALL_INCLUDE)/metis.h - chmod 644 $(INSTALL_DOC)/METIS_manual.pdf - chmod 644 $(INSTALL_DOC)/METIS_README.txt -diff --git a/RBio/Lib/Makefile b/RBio/Lib/Makefile -index 1111111..2222222 100644 ---- a/RBio/Lib/Makefile -+++ b/RBio/Lib/Makefile -@@ -60,25 +60,21 @@ RBio_i.o: ../Source/RBio.c - #------------------------------------------------------------------------------- - - # install RBio --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/RBio.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/RBIO_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/RBio.h - chmod 644 $(INSTALL_DOC)/RBIO_README.txt - - # uninstall RBio - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/RBio.h - $(RM) $(INSTALL_DOC)/RBIO_README.txt -diff --git a/SPQR/Lib/Makefile b/SPQR/Lib/Makefile -index 1111111..2222222 100644 ---- a/SPQR/Lib/Makefile -+++ b/SPQR/Lib/Makefile -@@ -242,22 +242,20 @@ spqrgpu_computeFrontStaging.o: ../SPQRGPU/spqrgpu_computeFrontStaging.cpp - #------------------------------------------------------------------------------- - - # install SPQR --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CXX) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/SuiteSparseQR.hpp $(INSTALL_INCLUDE) - $(CP) ../Include/SuiteSparseQR_C.h $(INSTALL_INCLUDE) - $(CP) ../Include/SuiteSparseQR_definitions.h $(INSTALL_INCLUDE) - $(CP) ../Include/spqr.hpp $(INSTALL_INCLUDE) - $(CP) ../Doc/spqr_user_guide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/SPQR_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/SuiteSparseQR.hpp - chmod 644 $(INSTALL_INCLUDE)/SuiteSparseQR_C.h - chmod 644 $(INSTALL_INCLUDE)/SuiteSparseQR_definitions.h -@@ -267,9 +265,7 @@ $(INSTALL_LIB)/$(SO_TARGET): $(OBJ) - - # uninstall SPQR - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/SuiteSparseQR.hpp - $(RM) $(INSTALL_INCLUDE)/SuiteSparseQR_C.h - $(RM) $(INSTALL_INCLUDE)/SuiteSparseQR_definitions.h -diff --git a/SuiteSparse_GPURuntime/Lib/Makefile b/SuiteSparse_GPURuntime/Lib/Makefile -index 1111111..2222222 100644 ---- a/SuiteSparse_GPURuntime/Lib/Makefile -+++ b/SuiteSparse_GPURuntime/Lib/Makefile -@@ -70,23 +70,19 @@ SuiteSparseGPU_Workspace_transfer.o: ../Source/SuiteSparseGPU_Workspace_transfer - #------------------------------------------------------------------------------- - - # install SuiteSparse_GPURuntime (just the library, not the include files) --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJS) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJS) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CXX) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../README.txt $(INSTALL_DOC)/GPURUNTIME_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_DOC)/GPURUNTIME_README.txt - - # uninstall SuiteSparse_GPURuntime - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_DOC)/GPURUNTIME_README.txt - -diff --git a/SuiteSparse_config/Makefile b/SuiteSparse_config/Makefile -index 1111111..2222222 100644 ---- a/SuiteSparse_config/Makefile -+++ b/SuiteSparse_config/Makefile -@@ -44,27 +44,22 @@ clean: - - $(RM) -r $(CLEAN) - - # install SuiteSparse_config --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) SuiteSparse_config.h $(INSTALL_INCLUDE) - $(CP) README.txt $(INSTALL_DOC)/SUITESPARSECONFIG_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -- chmod 755 $(INSTALL_LIB)/$(SO_PLAIN) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/SuiteSparse_config.h - chmod 644 $(INSTALL_DOC)/SUITESPARSECONFIG_README.txt - - # uninstall SuiteSparse_config - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/SuiteSparse_config.h - $(RM) $(INSTALL_DOC)/SUITESPARSECONFIG_README.txt - ( cd xerbla ; $(MAKE) uninstall ) -diff -urN SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk ---- SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig 2022-03-15 00:33:19.000000000 +0100 -+++ SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk 2022-03-20 13:25:30.876107144 +0100 -@@ -73,6 +73,7 @@ - # and documentation in /solo/mydox. - INSTALL ?= $(SUITESPARSE) - INSTALL_LIB ?= $(INSTALL)/lib -+ INSTALL_SO ?= $(INSTALL)/lib - INSTALL_INCLUDE ?= $(INSTALL)/include - INSTALL_DOC ?= $(INSTALL)/share/doc/suitesparse-$(SUITESPARSE_VERSION) - -@@ -349,7 +350,7 @@ - ifeq ($(UNAME),Linux) - # add the posix realtime extensions library: librt - LDLIBS += -lrt -- LDFLAGS += -Wl,-rpath=$(INSTALL_LIB) -+ LDFLAGS += -Wl,-rpath=$(INSTALL_SO) - endif - - #--------------------------------------------------------------------------- -@@ -365,7 +366,7 @@ - LAPACK ?= -framework Accelerate - # OpenMP is not yet supported by default in clang - CFOPENMP = -- LDLIBS += -rpath $(INSTALL_LIB) -+ LDLIBS += -rpath $(INSTALL_SO) - endif - - #--------------------------------------------------------------------------- -@@ -446,7 +447,8 @@ - # they aren't actually supported by this OS - SO_MAIN = $(LIBRARY).$(SO_VERSION).dll - SO_PLAIN = $(LIBRARY).$(VERSION).dll -- SO_OPTS += -shared -+ SO_OPTS += -shared -Wl,--out-implib,$(INSTALL_LIB)/$(LIBRARY).dll.a -+ INSTALL_SO = $(INSTALL)/bin - SO_INSTALL_NAME = echo - else - # Mac or Linux/Unix -@@ -568,6 +570,7 @@ - @echo 'System: UNAME= ' '$(UNAME)' - @echo 'Install directory: INSTALL= ' '$(INSTALL)' - @echo 'Install libraries in: INSTALL_LIB= ' '$(INSTALL_LIB)' -+ @echo 'Install shared libs in: INSTALL_SO= ' '$(INSTALL_SO)' - @echo 'Install include files in: INSTALL_INCLUDE=' '$(INSTALL_INCLUDE)' - @echo 'Install documentation in: INSTALL_DOC= ' '$(INSTALL_DOC)' - @echo 'Optimization level: OPTIMIZATION= ' '$(OPTIMIZATION)' -diff --git a/SuiteSparse_config/xerbla/Makefile b/SuiteSparse_config/xerbla/Makefile -index 1111111..2222222 100644 ---- a/SuiteSparse_config/xerbla/Makefile -+++ b/SuiteSparse_config/xerbla/Makefile -@@ -53,16 +53,13 @@ $(INSTALL_LIB)/$(SO_TARGET): $(DEPENDS) - $(COMPILE) - $(CC) $(SO_OPTS) xerbla.o -o $@ - - $(RM) xerbla.o -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) xerbla.h $(INSTALL_INCLUDE) -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/xerbla.h - - # uninstall libcerbla / libxerbla - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/xerbla.h - - distclean: purge -diff --git a/UMFPACK/Lib/Makefile b/UMFPACK/Lib/Makefile -index 1111111..2222222 100644 ---- a/UMFPACK/Lib/Makefile -+++ b/UMFPACK/Lib/Makefile -@@ -288,20 +288,18 @@ clean: - - #------------------------------------------------------------------------------- - # install UMFPACK --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/umfpack*.h $(INSTALL_INCLUDE) - $(CP) ../Doc/UMFPACK_UserGuide.pdf $(INSTALL_DOC) - $(CP) ../Doc/UMFPACK_QuickStart.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/UMFPACK_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/umfpack*.h - chmod 644 $(INSTALL_DOC)/UMFPACK_UserGuide.pdf - chmod 644 $(INSTALL_DOC)/UMFPACK_QuickStart.pdf -@@ -309,9 +307,7 @@ $(INSTALL_LIB)/$(SO_TARGET): $(OBJ) - - # uninstall UMFPACK - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/umfpack*.h - $(RM) $(INSTALL_DOC)/UMFPACK_UserGuide.pdf - $(RM) $(INSTALL_DOC)/UMFPACK_QuickStart.pdf -diff -urN SuiteSparse-5.11.0/Makefile.orig SuiteSparse-5.11.0/Makefile ---- SuiteSparse-5.11.0/Makefile.orig 2022-03-15 00:33:19.000000000 +0100 -+++ SuiteSparse-5.11.0/Makefile 2022-03-20 13:51:19.924606309 +0100 -@@ -16,7 +16,6 @@ - # installs all libraries SuiteSparse/lib. - go: metis - ( cd SuiteSparse_config && $(MAKE) ) -- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) - ( cd AMD && $(MAKE) ) - ( cd BTF && $(MAKE) ) - ( cd CAMD && $(MAKE) ) -@@ -34,7 +33,6 @@ - ( cd GPUQREngine && $(MAKE) ) - endif - ( cd SPQR && $(MAKE) ) -- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) - ( cd SLIP_LU && $(MAKE) ) - # ( cd PIRO_BAND && $(MAKE) ) - # ( cd SKYLINE_SVD && $(MAKE) ) -@@ -44,9 +42,8 @@ - # sudo make install INSTALL=/usr/local - # See SuiteSparse/README.md for more details. - # (note that CSparse is not installed; CXSparse is installed instead) --install: metisinstall gbinstall moninstall -+install: metisinstall - ( cd SuiteSparse_config && $(MAKE) install ) -- # ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) - ( cd AMD && $(MAKE) install ) - ( cd BTF && $(MAKE) install ) - ( cd CAMD && $(MAKE) install ) -@@ -63,7 +60,6 @@ - ( cd GPUQREngine && $(MAKE) install ) - endif - ( cd SPQR && $(MAKE) install ) -- # ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) - # ( cd PIRO_BAND && $(MAKE) install ) - # ( cd SKYLINE_SVD && $(MAKE) install ) - ( cd SLIP_LU && $(MAKE) install ) -@@ -76,7 +72,7 @@ - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) -- - $(CP) lib/libmetis.* $(INSTALL_SO) -+ - $(CP) lib/libmetis.* $(INSTALL_SO) - - $(CP) metis-5.1.0/manual/manual.pdf $(INSTALL_DOC)/METIS_manual.pdf - - $(CP) metis-5.1.0/README.txt $(INSTALL_DOC)/METIS_README.txt - # the following is needed only on the Mac, so *.dylib is hardcoded: -@@ -93,8 +89,6 @@ - $(RM) $(INSTALL_DOC)/SuiteSparse_README.md - ( cd SuiteSparse_config && $(MAKE) uninstall ) - - ( cd metis-5.1.0 && $(MAKE) uninstall ) -- - ( cd GraphBLAS && $(MAKE) uninstall ) -- - ( cd Mongoose && $(MAKE) uninstall ) - ( cd AMD && $(MAKE) uninstall ) - ( cd CAMD && $(MAKE) uninstall ) - ( cd COLAMD && $(MAKE) uninstall ) -@@ -126,7 +120,6 @@ - # the static library - library: metis - ( cd SuiteSparse_config && $(MAKE) ) -- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) - ( cd AMD && $(MAKE) library ) - ( cd BTF && $(MAKE) library ) - ( cd CAMD && $(MAKE) library ) -@@ -144,7 +137,6 @@ - ( cd GPUQREngine && $(MAKE) library ) - endif - ( cd SPQR && $(MAKE) library ) -- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) - ( cd SLIP_LU && $(MAKE) library ) - # ( cd PIRO_BAND && $(MAKE) library ) - # ( cd SKYLINE_SVD && $(MAKE) library ) -@@ -154,7 +146,6 @@ - # both the dynamic and static libraries. - static: metis - ( cd SuiteSparse_config && $(MAKE) static ) -- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static ) - ( cd AMD && $(MAKE) static ) - ( cd BTF && $(MAKE) static ) - ( cd CAMD && $(MAKE) static ) -@@ -172,7 +163,6 @@ - ( cd GPUQREngine && $(MAKE) static ) - endif - ( cd SPQR && $(MAKE) static ) -- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static ) - ( cd SLIP_LU && $(MAKE) static ) - # ( cd PIRO_BAND && $(MAKE) static ) - # ( cd SKYLINE_SVD && $(MAKE) static ) -@@ -182,8 +172,6 @@ - - ( cd SuiteSparse_config && $(MAKE) purge ) - - ( cd metis-5.1.0 && $(MAKE) distclean ) - - ( cd AMD && $(MAKE) purge ) -- - ( cd GraphBLAS && $(MAKE) purge ) -- - ( cd Mongoose && $(MAKE) purge ) - - ( cd CAMD && $(MAKE) purge ) - - ( cd COLAMD && $(MAKE) purge ) - - ( cd BTF && $(MAKE) purge ) -@@ -210,8 +198,6 @@ - clean: - - ( cd SuiteSparse_config && $(MAKE) clean ) - - ( cd metis-5.1.0 && $(MAKE) clean ) -- - ( cd GraphBLAS && $(MAKE) clean ) -- - ( cd Mongoose && $(MAKE) clean ) - - ( cd AMD && $(MAKE) clean ) - - ( cd CAMD && $(MAKE) clean ) - - ( cd COLAMD && $(MAKE) clean ) -@@ -233,8 +219,6 @@ - - # Create the PDF documentation - docs: -- ( cd GraphBLAS && $(MAKE) docs ) -- ( cd Mongoose && $(MAKE) docs ) - ( cd AMD && $(MAKE) docs ) - ( cd CAMD && $(MAKE) docs ) - ( cd KLU && $(MAKE) docs )
--- a/src/suitesparse-2-metis.patch Mon Oct 09 11:28:54 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,85 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore <tonyt@logyst.com> -Date: Mon, 20 Nov 2017 22:54:25 +1100 -Subject: [PATCH 1/3] mingw-w64-does-not-have-sys-resource-h - -taken from: -https://github.com/Alexpux/MINGW-packages/blob/484b873e8a1967b7809127682635888b7329417f/mingw-w64-metis/0001-mingw-w64-does-not-have-sys-resource-h.patch - -diff --git a/metis-5.1.0/GKlib/gk_arch.h b/metis-5.1.0/GKlib/gk_arch.h -index 1111111..2222222 100644 ---- a/metis-5.1.0/GKlib/gk_arch.h -+++ b/metis-5.1.0/GKlib/gk_arch.h -@@ -41,7 +41,9 @@ - #endif - #include <inttypes.h> - #include <sys/types.h> -- #include <sys/resource.h> -+ #ifndef __MINGW32__ -+ #include <sys/resource.h> -+ #endif - #include <sys/time.h> - #endif - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore <tonyt@logyst.com> -Date: Mon, 20 Nov 2017 22:55:34 +1100 -Subject: [PATCH 2/3] mingw-w64-do-not-use-reserved-double-underscored-names - -taken from: -https://github.com/Alexpux/MINGW-packages/blob/484b873e8a1967b7809127682635888b7329417f/mingw-w64-metis/0002-mingw-w64-do-not-use-reserved-double-underscored-names.patch - -diff --git a/metis-5.1.0/GKlib/gk_getopt.h b/metis-5.1.0/GKlib/gk_getopt.h -index 1111111..2222222 100644 ---- a/metis-5.1.0/GKlib/gk_getopt.h -+++ b/metis-5.1.0/GKlib/gk_getopt.h -@@ -52,10 +52,10 @@ struct gk_option { - - - /* Function prototypes */ --extern int gk_getopt(int __argc, char **__argv, char *__shortopts); --extern int gk_getopt_long(int __argc, char **__argv, char *__shortopts, -+extern int gk_getopt(int gk_argc, char **gk_argv, char *__shortopts); -+extern int gk_getopt_long(int gk_argc, char **gk_argv, char *__shortopts, - struct gk_option *__longopts, int *__longind); --extern int gk_getopt_long_only (int __argc, char **__argv, -+extern int gk_getopt_long_only (int gk_argc, char **gk_argv, - char *__shortopts, struct gk_option *__longopts, int *__longind); - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore <tonyt@logyst.com> -Date: Mon, 20 Nov 2017 22:58:20 +1100 -Subject: [PATCH 3/3] WIN32-Install-RUNTIME-to-bin - -taken from: -https://github.com/Alexpux/MINGW-packages/blob/484b873e8a1967b7809127682635888b7329417f/mingw-w64-metis/0003-WIN32-Install-RUNTIME-to-bin.patch - -diff --git a/metis-5.1.0/libmetis/CMakeLists.txt b/metis-5.1.0/libmetis/CMakeLists.txt -index 1111111..2222222 100644 ---- a/metis-5.1.0/libmetis/CMakeLists.txt -+++ b/metis-5.1.0/libmetis/CMakeLists.txt -@@ -8,9 +8,15 @@ if(UNIX) - target_link_libraries(metis m) - endif() - -+if(WIN32) -+ set(RT_DEST bin) -+else() -+ set(RT_DEST lib) -+endif() -+ - if(METIS_INSTALL) - install(TARGETS metis - LIBRARY DESTINATION lib -- RUNTIME DESTINATION lib -+ RUNTIME DESTINATION ${RT_DEST} - ARCHIVE DESTINATION lib) - endif() -
--- a/src/suitesparse.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/suitesparse.mk Thu Oct 12 20:31:13 2023 +0200 @@ -2,14 +2,14 @@ # See index.html for further information. PKG := suitesparse -$(PKG)_VERSION := 5.13.0 -$(PKG)_CHECKSUM := 71963dec82e46226eb329432069a916144fa4d98 +$(PKG)_VERSION := 7.2.0 +$(PKG)_CHECKSUM := cb79ed80422b1808b4a5aba27f5878ef84c82f56 $(PKG)_SUBDIR := SuiteSparse-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$($(PKG)_VERSION).tar.gz -$(PKG)_DEPS := blas lapack +$(PKG)_DEPS := blas lapack mpfr ifeq ($(USE_SYSTEM_GCC),no) - $(PKG)_DEPS += libgomp mpfr + $(PKG)_DEPS += libgomp endif ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) @@ -23,97 +23,41 @@ endef -$(PKG)_CPPFLAGS := -DNTIMER +ifeq ($(ENABLE_FORTRAN_INT64),yes) + $(PKG)_CMAKE_FLAGS += -DALLOW_64BIT_BLAS=ON +endif -ifeq ($(ENABLE_FORTRAN_INT64),yes) +ifneq ($(MXE_NATIVE_BUILD),yes) ifeq ($(MXE_WINDOWS_BUILD),yes) - $(PKG)_CPPFLAGS += -DLONGBLAS='long long' + # The corresponding test (in GraphBLAS) succeeds on Windows (MinGW-w64). + $(PKG)_CMAKE_CROSS_FLAGS += -DHAVE_GETENV_HOME=ON else - $(PKG)_CPPFLAGS += -DLONGBLAS='long' + # Use fallback for other targets. + $(PKG)_CMAKE_CROSS_FLAGS += -DHAVE_GETENV_HOME=OFF endif endif -ifeq ($(USE_CCACHE),yes) - $(PKG)_COMPILER_OPTS := CC='$(CCACHE) $(MXE_CC)' \ - CXX='$(CCACHE) $(MXE_CXX)' \ - CPLUSPLUS='$(CCACHE) $(MXE_CXX)' \ - F77='$(CCACHE) $(MXE_F77)' -else - $(PKG)_COMPILER_OPTS := CC='$(MXE_CC)' \ - CXX='$(MXE_CXX)' \ - CPLUSPLUS='$(MXE_CXX)' \ - F77='$(MXE_F77)' -endif - $(PKG)_MAKE_OPTS = \ - CPPFLAGS="$($(PKG)_CPPFLAGS)" \ - $($(PKG)_COMPILER_OPTS) \ FFLAGS='$(MXE_FFLAGS)' \ CFLAGS='$(MXE_CFLAGS)' \ CXXFLAGS='$(MXE_CXXFLAGS)' \ AR='$(MXE_AR)' \ RANLIB='$(MXE_RANLIB)' \ - BLAS="-lblas -lgfortran" \ - LAPACK='-llapack' \ - CHOLMOD_CONFIG='-DNPARTITION' \ - CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" $(CMAKE_CCACHE_FLAGS) $(CMAKE_BUILD_SHARED_OR_STATIC)' - -ifeq ($(MXE_WINDOWS_BUILD),yes) - $(PKG)_MAKE_OPTS += \ - UNAME=Windows - $(PKG)_SO_DIR := $($(PKG)_DESTDIR)$(HOST_BINDIR) -else - $(PKG)_SO_DIR := $($(PKG)_DESTDIR)$(HOST_LIBDIR) -endif - -$(PKG)_cputype = $(shell uname -m | sed "s/\\ /_/g") -$(PKG)_systype = $(shell uname -s) -$(PKG)_METIS_BUILDDIR = build/$($(PKG)_systype)-$($(PKG)_cputype) -$(PKG)_METIS_CONFIG_FLAGS = -DCMAKE_VERBOSE_MAKEFILE=1 \ - -DGKLIB_PATH=$(1)/metis-5.1.0/GKlib \ - -DCMAKE_INSTALL_PREFIX=$(1) \ - -DSHARED=1 + CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" \ + -DCOMPACT=ON -DNFORTRAN=ON \ + -DBLA_VENDOR="Generic" -DBLAS_LIBRARIES="-lblas -lgfortran" -DLAPACK_LIBRARIES="-llapack" \ + -DENABLE_CUDA=OFF \ + $($(PKG)_CMAKE_FLAGS) \ + $($(PKG)_CMAKE_CROSS_FLAGS) \ + $(CMAKE_CCACHE_FLAGS) $(CMAKE_BUILD_SHARED_OR_STATIC)' define $(PKG)_BUILD - # build metis - mkdir $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR) - cd $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR) && \ - cmake $(1)/metis-5.1.0 \ - $(CMAKE_CCACHE_FLAGS) \ - $(CMAKE_BUILD_SHARED_OR_STATIC) \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - $($(PKG)_METIS_CONFIG_FLAGS) - $(MAKE) -C '$(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR)' metis -j '$(JOBS)' - - # install metis - mkdir -p $($(PKG)_DESTDIR)$(HOST_LIBDIR) - mkdir -p $($(PKG)_SO_DIR) - mkdir -p $($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/ - cp $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR)/libmetis/libmetis.* $($(PKG)_SO_DIR) - cp $(1)/metis-5.1.0/include/metis.h $($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/ - chmod 755 $($(PKG)_SO_DIR)/libmetis.* - chmod 644 $($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/metis.h - # build all $(MAKE) -C '$(1)' -j '$(JOBS)' \ - $($(PKG)_MAKE_OPTS) \ - MY_METIS_LIB=$($(PKG)_SO_DIR) \ - library + $($(PKG)_MAKE_OPTS) # install libraries and headers $(MAKE) -C '$(1)' -j 1 install \ - $($(PKG)_MAKE_OPTS) \ - INSTALL_INCLUDE='$($(PKG)_DESTDIR)$(HOST_INCDIR)/suitesparse/' \ - INSTALL_LIB='$($(PKG)_DESTDIR)$(HOST_LIBDIR)' \ - INSTALL_SO='$($(PKG)_SO_DIR)' - - # some dependers (e.g. SUNDIALS IDA) won't find libraries with version suffix - if [ $(MXE_WINDOWS_BUILD) = no ]; then \ - cd '$($(PKG)_DESTDIR)$(HOST_LIBDIR)' && ln -sf libsuitesparseconfig.so.$($(PKG)_VERSION) libsuitesparseconfig.so; \ - cd '$($(PKG)_DESTDIR)$(HOST_LIBDIR)' && ln -sf libamd.so.2 libamd.so; \ - cd '$($(PKG)_DESTDIR)$(HOST_LIBDIR)' && ln -sf libbtf.so.1 libbtf.so; \ - cd '$($(PKG)_DESTDIR)$(HOST_LIBDIR)' && ln -sf libcolamd.so.2 libcolamd.so; \ - cd '$($(PKG)_DESTDIR)$(HOST_LIBDIR)' && ln -sf libklu.so.1 libklu.so; \ - fi + $($(PKG)_MAKE_OPTS) endef
--- a/src/sundials-ida.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/sundials-ida.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := sundials-ida $(PKG)_IGNORE := -$(PKG)_VERSION := 6.4.1 -$(PKG)_CHECKSUM := ce47e85aed90ddf95bf40b70842a29d1255666d2 +$(PKG)_VERSION := 6.6.1 +$(PKG)_CHECKSUM := 6cdd07acbea7c97b0d7b4d0baa9030f00f8846c5 $(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/src/texinfo.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/texinfo.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,22 +3,25 @@ PKG := texinfo $(PKG)_IGNORE := -$(PKG)_VERSION := 6.8 -$(PKG)_CHECKSUM := 37f5ff5f748fb11bcbd57b82f3fdb5c365e82d61 +$(PKG)_VERSION := 7.0.3 +$(PKG)_CHECKSUM := d9c7fb736aeb8965b12c32d24e1006e5ce6965f1 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE) $(PKG)_DEPS := # libgnurx -ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_DEPS += pcre - $(PKG)_LIBS += LIBS='-lpcre -lpcreposix -lpthread' +ifeq ($(MXE_NATIVE_BUILD),yes) + ifeq ($(USE_MSYS2),no) + $(PKG)_DEPS += pcre2 + $(PKG)_LIBS += LDFLAGS="`PKG_CONFIG_PATH="$(HOST_LIBDIR)/pkgconfig" $(MXE_PKG_CONFIG) --libs libpcre2-8`" + endif endif define $(PKG)_UPDATE $(WGET) -q -O- 'http://ftp.gnu.org/gnu/$(PKG)/?C=M;O=D' | \ $(SED) -n 's,.*<a href="$(PKG)-\([0-9][^"]*\)\.tar.*,\1,p' | \ - head -1 + $(SORT) -V | \ + tail -1 endef ifeq ($(MXE_NATIVE_BUILD),yes)
--- a/src/theora.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/theora.mk Thu Oct 12 20:31:13 2023 +0200 @@ -22,7 +22,7 @@ $(SED) -i 's,EXPORTS,,' '$(1)/win32/xmingw32/libtheoraenc-all.def'; \ fi - cd '$(1)' && ./configure \ + cd '$(1)' && HAVE_DOXYGEN=false ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \
--- a/src/tiff.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/tiff.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := tiff $(PKG)_IGNORE := -$(PKG)_VERSION := 4.5.0 -$(PKG)_CHECKSUM := c799eb7161b6495042223d4dee0d2b3bdb12660c +$(PKG)_VERSION := 4.6.0 +$(PKG)_CHECKSUM := 5eda840cc24e1c74c6a9d92faa86a0851f7de7d5 $(PKG)_SUBDIR := tiff-$($(PKG)_VERSION) $(PKG)_FILE := tiff-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/libtiff/$($(PKG)_FILE) @@ -27,6 +27,7 @@ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-jbig \ + --disable-docs \ --disable-libdeflate \ --without-x && $(CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) DESTDIR='$(3)'
--- a/src/transfig-1-fixes.patch Mon Oct 09 11:28:54 2023 -0400 +++ b/src/transfig-1-fixes.patch Thu Oct 12 20:31:13 2023 +0200 @@ -95,3 +95,42 @@ void init_stream(struct xfig_stream *restrict xf_stream) { +diff -ur fig2dev-3.2.9.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.9/fig2dev/dev/genbitmaps.c +--- fig2dev-3.2.9.orig/fig2dev/dev/genbitmaps.c 2023-08-28 14:23:23.409382069 -0400 ++++ fig2dev-3.2.9/fig2dev/dev/genbitmaps.c 2023-08-28 14:28:00.897893044 -0400 +@@ -36,7 +36,9 @@ + #include <stdlib.h> + #include <string.h> + #include <signal.h> ++#if ! defined (__WIN32__) || defined (__CYGWIN__) + #include <sys/wait.h> ++#endif + + #include "bool.h" + #include "fig2dev.h" /* includes bool.h and object.h */ +diff -ur fig2dev-3.2.9.orig/fig2dev/dev/readeps.c fig2dev-3.2.9/fig2dev/dev/readeps.c +--- fig2dev-3.2.9.orig/fig2dev/dev/readeps.c 2023-08-28 14:29:52.787550642 -0400 ++++ fig2dev-3.2.9/fig2dev/dev/readeps.c 2023-08-28 14:30:41.593454664 -0400 +@@ -29,7 +29,9 @@ + #include <stdlib.h> + #include <string.h> + #include <math.h> ++#if !defined (__WIN32__) || defined (__CYGWIN__) + #include <sys/wait.h> ++#endif + + #include "fig2dev.h" /* includes bool.h and object.h */ + //#include "object.h" +diff -ur fig2dev-3.2.9.orig/fig2dev/dev/readpics.c fig2dev-3.2.9/fig2dev/dev/readpics.c +--- fig2dev-3.2.9.orig/fig2dev/dev/readpics.c 2023-08-28 14:31:39.776916666 -0400 ++++ fig2dev-3.2.9/fig2dev/dev/readpics.c 2023-08-28 14:32:25.565641164 -0400 +@@ -31,7 +31,9 @@ + #include <string.h> + #include <unistd.h> + #include <sys/stat.h> ++#if !defined (__WIN32__) || defined (__CYGWIN__) + #include <sys/wait.h> ++#endif + + #include "messages.h" + #include "xtmpfile.h"
--- a/src/transfig.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/transfig.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := transfig $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.8b -$(PKG)_CHECKSUM := 9a85b37a0770d73915584f1e75e58375b093d9bd +$(PKG)_VERSION := 3.2.9 +$(PKG)_CHECKSUM := 3983ae7306e608b503ac840973b1f86e9d867abf $(PKG)_SUBDIR := fig2dev-$($(PKG)_VERSION) $(PKG)_FILE := fig2dev-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mcj/$($(PKG)_FILE)
--- a/src/wxwidgets.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/wxwidgets.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := wxwidgets $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.1 -$(PKG)_CHECKSUM := b5299275abddc7cb5fa92f75c17475ade3bc0532 +$(PKG)_VERSION := 3.2.2.1 +$(PKG)_CHECKSUM := d645cacbf2678cfc402ae163f2b0e0b05be5d239 $(PKG)_SUBDIR := wxWidgets-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 $(PKG)_URL := https://github.com/wxWidgets/wxWidgets/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/xkbcommon.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/xkbcommon.mk Thu Oct 12 20:31:13 2023 +0200 @@ -23,6 +23,8 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ --disable-selective-werror \ + --disable-docs \ + --disable-devel-docs \ && $(CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)' -j '$(JOBS)'
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/xrandr.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,27 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := xrandr +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.5.3 +$(PKG)_CHECKSUM := 7230e6ee8d25e9882618d770008dd3637e6e2171 +$(PKG)_SUBDIR := libXrandr-$($(PKG)_VERSION) +$(PKG)_FILE := libXrandr-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://www.x.org/archive/individual/lib/$($(PKG)_FILE) +$(PKG)_DEPS := randrproto xext xextproto xrender renderproto + +ifeq ($(MXE_WINDOWS_BUILD),yes) + define $(PKG)_BUILD + endef +else + define $(PKG)_BUILD + mkdir '$(1)/.build' + cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + --prefix='$(HOST_PREFIX)' \ + && $(CONFIGURE_POST_HOOK) + + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' + endef +endif
--- a/src/xz.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/xz.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := xz $(PKG)_IGNORE := -$(PKG)_VERSION := 5.4.0 -$(PKG)_CHECKSUM := 4ab7e2e8ec266f8ab3444dda27c3924aff351842 +$(PKG)_VERSION := 5.4.4 +$(PKG)_CHECKSUM := a7ba54953bafe4ba02936be56f32391f48806fed $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://tukaani.org/xz/$($(PKG)_FILE)
--- a/src/zlib.mk Mon Oct 09 11:28:54 2023 -0400 +++ b/src/zlib.mk Thu Oct 12 20:31:13 2023 +0200 @@ -3,8 +3,8 @@ PKG := zlib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.13 -$(PKG)_CHECKSUM := b459b42aa533968ae403c0002a255d62d3136954 +$(PKG)_VERSION := 1.3 +$(PKG)_CHECKSUM := 3631636d7166a7f1a3209a3feca45404e6c5f54b $(PKG)_SUBDIR := zlib-$($(PKG)_VERSION) $(PKG)_FILE := zlib-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://zlib.net/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/zstd.mk Thu Oct 12 20:31:13 2023 +0200 @@ -0,0 +1,35 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := zstd +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.5.5 +$(PKG)_CHECKSUM := 4479ecc74300d23391d99fbebf2fddd47aed9b28 +$(PKG)_SUBDIR := zstd-$($(PKG)_VERSION) +$(PKG)_FILE := zstd-$($(PKG)_VERSION).tar.lz +$(PKG)_URL := https://github.com/facebook/zstd/releases/download/v$($(PKG)_VERSION)/zstd-$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := build-cmake + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://github.com/facebook/zstd/tags' | \ + $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \ + tail -1 +endef + +ifeq ($(BUILD_SHARED),yes) +$(PKG)_CMAKE_FLAGS := -DZSTD_BUILD_SHARED=ON -DZSTD_BUILD_STATIC=OFF +else +$(PKG)_CMAKE_FLAGS := -DZSTD_BUILD_SHARED=OFF -DZSTD_BUILD_STATIC=ON +endif + +define $(PKG)_BUILD + mkdir '$(1)/.build' && cd '$(1)/.build' && cmake $(1)/build/cmake/ \ + $(CMAKE_CCACHE_FLAGS) \ + $($(PKG)_CMAKE_FLAGS) \ + -DZSTD_BUILD_PROGRAMS=OFF \ + -DZSTD_BUILD_TESTS=OFF \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + + cmake --build '$(1)/.build' -j '$(JOBS)' + cmake --install '$(1)/.build' +endef
--- a/tools/makeinst-script.sh.in Mon Oct 09 11:28:54 2023 -0400 +++ b/tools/makeinst-script.sh.in Thu Oct 12 20:31:13 2023 +0200 @@ -92,6 +92,7 @@ ###################################################################### SetCompressor /SOLID Lzma +OutFileMode aio Name "\${APP_NAME}" Caption "\${APP_NAME}" OutFile "\${INSTALLER_NAME}"