Mercurial > mxe-octave
changeset 5659:97873d6851fb
merge 6.1.90 release candidate changes with default
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 11 Feb 2021 09:43:33 -0500 |
| parents | cd5aefb0762d (diff) c724e30df2ba (current diff) |
| children | d90a0b8eea1a |
| files | |
| diffstat | 79 files changed, 1179 insertions(+), 719 deletions(-) [+] |
line wrap: on
line diff
--- a/binary-dist-rules.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/binary-dist-rules.mk Thu Feb 11 09:43:33 2021 -0500 @@ -118,11 +118,21 @@ cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/ cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/ cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/ + # This patch can be dropped as soon as those lines are removed from + # the startup scripts for all targets (including stable and release). + if [ "$(OCTAVE_TARGET)" = "default-octave" ]; then \ + (cd '$(OCTAVE_DIST_DIR)' && $(PATCH) -p1 -u) < $(TOP_DIR)/installer-files/octave-no-short-path.patch; \ + fi cp $(TOP_BUILD_DIR)/HG-ID $(OCTAVE_DIST_DIR)/ echo " updating octave .exe to script files..." rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.exe rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave-$($(OCTAVE_TARGET)_VERSION).exe cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.bat + # This patch can be dropped as soon as those lines are removed from + # "octave.bat" for all targets (including stable and release). + if [ "$(OCTAVE_TARGET)" = "default-octave" ]; then \ + (cd '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' && $(PATCH) -p1 -u) < $(TOP_DIR)/installer-files/octave-bat-no-short-path.patch; \ + fi cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave-$($(OCTAVE_TARGET)_VERSION).bat echo " updating libtool references..." find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/' -type f -name "*.la" \ @@ -132,6 +142,9 @@ -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ; if [ "$(ENABLE_DEVEL_TOOLS)" = "yes" ]; then \ cp $(TOP_DIR)/installer-files/cmdshell.bat $(OCTAVE_DIST_DIR)/; \ + if [ "$(OCTAVE_TARGET)" = "default-octave" ]; then \ + (cd '$(OCTAVE_DIST_DIR)' && $(PATCH) -p1 -u) < $(TOP_DIR)/installer-files/cmdshell-no-short-path.patch; \ + fi; \ fi echo " updating script tool references..." #find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' -type f ! -name "*.*" \
--- a/dist-files.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/dist-files.mk Thu Feb 11 09:43:33 2021 -0500 @@ -126,6 +126,7 @@ gdal.mk \ gdb.mk \ gdcm-1-nosecapi.patch \ + gdcm-2-getopt.patch \ gdcm.mk \ gdk-pixbuf-1-fixes.patch \ gdk-pixbuf.mk \ @@ -142,6 +143,7 @@ glew-test.c \ glew.mk \ glib-1-fixes.patch \ + glib-2-fixes.patch \ glib.mk \ glibmm.mk \ glpk-1-fixes.patch \ @@ -156,6 +158,7 @@ gnutls.mk \ graphicsmagick-1-fix-xml2-config.patch \ graphicsmagick-2-dynamicpath.patch \ + graphicsmagick-3-user32.patch \ graphicsmagick-test.cpp \ graphicsmagick.mk \ gsl-test.c \ @@ -214,7 +217,6 @@ lame.mk \ lapack-test.f \ lapack.mk \ - lcms-1-fixes.patch \ lcms.mk \ lcms1-1-fixes.patch \ lcms1.mk \ @@ -306,6 +308,7 @@ libsndfile.mk \ libssh2-test.c \ libssh2.mk \ + libsodium.mk \ libtasn1.mk \ libtool.mk \ libunistring.mk \ @@ -317,6 +320,7 @@ libxml2.mk \ libxshmfence.mk \ libxslt.mk \ + llvm-1-llvm-config.patch \ llvm.mk \ log4cxx-1-gcc.4.4.patch \ log4cxx-2-pkgconfig.patch \ @@ -342,7 +346,6 @@ mingw-lapack-1-xerbla.patch \ mingw-libgcrypt-1-fixes.patch \ mingw-libmng-1-noundefines.patch \ - mingw-llvm-1-config.patch \ mingw-openblas-1-xerbla.patch \ mingw-portaudio-1-pkgconfig.patch \ mingw-s2tc-1-fixes.patch \ @@ -350,6 +353,7 @@ mingw-utils-1-portability-fix.patch \ mingw-w64-1-float-h.patch \ mingw-w64.mk \ + mingw-zeromq-1-fixes.patch \ mingwrt.mk \ mman-win32-1-include_name_change.patch \ mman-win32.mk \ @@ -549,10 +553,12 @@ opencv-1-fixes.patch \ opencv.mk \ openexr.mk \ + openjpeg.mk \ openscenegraph-1-fixes.patch \ openscenegraph.mk \ openssl-1-fixes.patch \ openssl.mk \ + opus.mk \ pango-1-fixes.patch \ pango.mk \ pangomm.mk \ @@ -628,16 +634,11 @@ qwtplot3d.mk \ rapidjson-1-prettywriter.patch \ rapidjson.mk \ - readline-0-001.patch \ - readline-0-002.patch \ - readline-0-003.patch \ - readline-0-004.patch \ readline-1-display.patch \ readline-1-fixes.patch \ readline-1-input.patch \ readline-1-sigwinch.patch \ readline-2-event-hook.patch \ - readline-2-history.patch \ readline.mk \ release-octave-1-gnulib.patch \ release-octave.mk \ @@ -744,6 +745,7 @@ winpcap.mk \ wt-1-fixes.patch \ wt.mk \ + wxwidgets-1-fixes.patch \ wxwidgets-test.cpp \ wxwidgets.mk \ x11.mk \ @@ -1069,15 +1071,18 @@ INSTALL_FILES_1 := \ cmdshell.bat \ + cmdshell-no-short-path.patch \ post-install.bat \ fc_update.bat \ gpl-3.0.txt \ octave.bat \ octave.bmp \ octave.vbs \ + octave-bat-no-short-path.patch \ octave-firsttime.vbs \ octave-hdr.bmp \ octave-logo.ico \ + octave-no-short-path.patch \ post-install.bat \ README.html INSTALL_FILES := $(addprefix installer-files/, $(INSTALL_FILES_1))
--- a/index.html Wed Feb 10 14:29:01 2021 -0500 +++ b/index.html Thu Feb 11 09:43:33 2021 -0500 @@ -1714,6 +1714,10 @@ <td class="website"><a href="http://www.libssh2.org">libssh2</a></td> </tr> <tr> + <td class="package">libsodium</td> + <td class="website"><a href="https://doc.libsodium.org/">libsodium</a></td> + </tr> + <tr> <td class="package">libtasn1</td> <td class="website"><a href="https://www.gnu.org/software/libtasn1/">libtasn1</a></td> </tr> @@ -2446,6 +2450,10 @@ <td class="website"><a href="http://www.openexr.com/">OpenEXR</a></td> </tr> <tr> + <td class="package">openjpeg</td> + <td class="website"><a href="https://www.openjpeg.org/">OpenJPEG</a></td> + </tr> + <tr> <td class="package">openscenegraph</td> <td class="website"><a href="http://www.openscenegraph.org/">OpenSceneGraph</a></td> </tr> @@ -2454,6 +2462,10 @@ <td class="website"><a href="http://www.openssl.org/">openssl</a></td> </tr> <tr> + <td class="package">opus</td> + <td class="website"><a href="https://opus-codec.org/">opus</a></td> + </tr> + <tr> <td class="package">mesa</td> <td class="website"><a href="http://www.mesa3d.org/osmesa.html">Mesa</a></td> </tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/installer-files/cmdshell-no-short-path.patch Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,28 @@ +# HG changeset patch +# User Markus Mützel <markus.muetzel@gmx.de> +# Date 1612087592 -3600 +# Sun Jan 31 11:06:32 2021 +0100 +# Node ID f08191da8e416c32d950679a78fe194e2753372e +# Parent fea266f67443b890a67f80336aee03c40d3a1faa +Don't use short paths (bug #59923). + +diff -r fea266f67443 -r f08191da8e41 cmdshell.bat +--- a/cmdshell.bat Sun Jan 31 10:59:32 2021 +0100 ++++ b/cmdshell.bat Sun Jan 31 11:06:32 2021 +0100 +@@ -2,16 +2,11 @@ + + set OCTAVE_HOME=%~dp0 + Rem NOTE: OCTAVE_HOME has a end \ +-Rem convert to 8.3 format +-for %%I in ("%OCTAVE_HOME%") do set OCTAVE_HOME=%%~sI + + Rem set home if not already set + if "%HOME%"=="" set HOME=%USERPROFILE% + if "%HOME%"=="" set HOME=%HOMEDRIVE%%HOMEPATH% + +-Rem set HOME to 8.3 format +-for %%I in ("%HOME%") do set HOME=%%~sI +- + set MSYSDIR=%OCTAVE_HOME% + set MSYSTEM=MSYS +
--- a/installer-files/cmdshell.bat Wed Feb 10 14:29:01 2021 -0500 +++ b/installer-files/cmdshell.bat Thu Feb 11 09:43:33 2021 -0500 @@ -16,14 +16,14 @@ set MSYSTEM=MSYS Rem if no msys-1.0, must be msys2 -if NOT EXIST %OCTAVE_HOME%bin\msys-1.0.dll set MSYSDIR=%OCTAVE_HOME%usr +if NOT EXIST "%OCTAVE_HOME%bin\msys-1.0.dll" set MSYSDIR=%OCTAVE_HOME%usr Rem 32 or 64 bit -if EXIST %OCTAVE_HOME%mingw32\bin\octave-cli.exe set MSYSTEM=MINGW32 -if EXIST %OCTAVE_HOME%mingw64\bin\octave-cli.exe set MSYSTEM=MINGW64 +if EXIST "%OCTAVE_HOME%mingw32\bin\octave-cli.exe" set MSYSTEM=MINGW32 +if EXIST "%OCTAVE_HOME%mingw64\bin\octave-cli.exe" set MSYSTEM=MINGW64 -if EXIST %OCTAVE_HOME%mingw32\bin\octave-cli.exe set OCTAVE_HOME=%OCTAVE_HOME%mingw32\ -if EXIST %OCTAVE_HOME%mingw64\bin\octave-cli.exe set OCTAVE_HOME=%OCTAVE_HOME%mingw64\ +if EXIST "%OCTAVE_HOME%mingw32\bin\octave-cli.exe" set OCTAVE_HOME=%OCTAVE_HOME%mingw32\ +if EXIST "%OCTAVE_HOME%mingw64\bin\octave-cli.exe" set OCTAVE_HOME=%OCTAVE_HOME%mingw64\ Rem Set up PATH. Make sure the octave bin dir Rem comes first. @@ -35,5 +35,5 @@ Rem tell msys2 to use the paths we set here which matches what octave would do set MSYS2_PATH_TYPE=inherit -%MSYSDIR%\bin\bash.exe --login -i +"%MSYSDIR%\bin\bash.exe" --login -i
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/installer-files/octave-bat-no-short-path.patch Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,30 @@ +# HG changeset patch +# User Markus Mützel <markus.muetzel@gmx.de> +# Date 1612087592 -3600 +# Sun Jan 31 11:06:32 2021 +0100 +# Node ID f08191da8e416c32d950679a78fe194e2753372e +# Parent fea266f67443b890a67f80336aee03c40d3a1faa +Don't use short paths (bug #59923). + +diff -r fea266f67443 -r f08191da8e41 octave.bat +--- a/octave.bat Sun Jan 31 10:59:32 2021 +0100 ++++ b/octave.bat Sun Jan 31 11:06:32 2021 +0100 +@@ -8,9 +8,6 @@ + Rem Note: the result ends with a backslash. + set OCT_HOME=%~dp0\.\..\ + set ROOT_PATH=%~dp0\.\..\..\ +-Rem Convert to 8.3 format so we don't have to worry about spaces. +-for %%I in ("%OCT_HOME%") do set OCT_HOME=%%~sI +-for %%I in ("%ROOT_PATH%") do set ROOT_PATH=%%~sI + + set MSYSTEM=MSYS + set MSYSPATH=%OCT_HOME% +@@ -44,8 +41,6 @@ + Rem set home if not already set + if "%HOME%"=="" set HOME=%USERPROFILE% + if "%HOME%"=="" set HOME=%HOMEDRIVE%%HOMEPATH% +-Rem set HOME to 8.3 format +-for %%I in ("%HOME%") do set HOME=%%~sI + + Rem Check for args to determine if GUI (--gui, --force-gui) + Rem or CLI (--no-gui) should be started.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/installer-files/octave-no-short-path.patch Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,70 @@ +# HG changeset patch +# User Markus Mützel <markus.muetzel@gmx.de> +# Date 1612087592 -3600 +# Sun Jan 31 11:06:32 2021 +0100 +# Node ID f08191da8e416c32d950679a78fe194e2753372e +# Parent fea266f67443b890a67f80336aee03c40d3a1faa +Don't use short paths (bug #59923). + +diff -r fea266f67443 -r f08191da8e41 octave-firsttime.vbs +--- a/octave-firsttime.vbs Sun Jan 31 10:59:32 2021 +0100 ++++ b/octave-firsttime.vbs Sun Jan 31 11:06:32 2021 +0100 +@@ -21,11 +21,6 @@ + OctavePath = OctavePath & "\mingw32" + End If + +-' get path as a 8.3 path +-Set fo = fso.GetFolder(OctavePath) +-OctavePath = fo.ShortPath +-Set fo = Nothing +- + ' set up path to ensure octave bin comes first + Set wshSystemEnv = wshShell.Environment( "PROCESS" ) + if OctavePath <> MSysPath Then +@@ -42,9 +37,6 @@ + + If wshShell.ExpandEnvironmentStrings("%HOME%") = "%HOME%" Then + Home = wshSystemEnv("USERPROFILE") +- Set fo = fso.GetFolder(Home) +- wshSystemEnv("HOME") = fo.ShortPath +- Set fo = Nothing + End If + + ' set Qt plugin directory and path +diff -r fea266f67443 -r f08191da8e41 octave.vbs +--- a/octave.vbs Sun Jan 31 10:59:32 2021 +0100 ++++ b/octave.vbs Sun Jan 31 11:06:32 2021 +0100 +@@ -21,11 +21,6 @@ + OctavePath = OctavePath & "\mingw32" + End If + +-' get path as a 8.3 path +-Set fo = fso.GetFolder(OctavePath) +-OctavePath = fo.ShortPath +-Set fo = Nothing +- + ' set up path to ensure octave bin comes first + Set wshSystemEnv = wshShell.Environment( "PROCESS" ) + if OctavePath <> MSysPath Then +@@ -43,9 +38,6 @@ + + If wshShell.ExpandEnvironmentStrings("%HOME%") = "%HOME%" Then + Home = wshSystemEnv("USERPROFILE") +- Set fo = fso.GetFolder(Home) +- wshSystemEnv("HOME") = fo.ShortPath +- Set fo = Nothing + End If + + ' set Qt plugin directory and path +diff -r fea266f67443 -r 64ff1a717a28 post-install.bat +--- a/post-install.bat Sun Jan 31 10:59:32 2021 +0100 ++++ b/post-install.bat Sun Jan 31 11:16:33 2021 +0100 +@@ -1,8 +1,6 @@ + @echo off + Rem Run on initial install /update + set ROOT_DIR=%~dp0 +-Rem Convert to 8.3 format so we don't have to worry about spaces. +-for %%I in ("%ROOT_DIR%") do set ROOT_DIR=%%~sI + + set MSYSDIR=%ROOT_DIR% + set MSYSTEM=MSYS
--- a/installer-files/post-install.bat Wed Feb 10 14:29:01 2021 -0500 +++ b/installer-files/post-install.bat Thu Feb 11 09:43:33 2021 -0500 @@ -7,9 +7,9 @@ set MSYSDIR=%ROOT_DIR% set MSYSTEM=MSYS -if NOT EXIST %ROOT_DIR%\bin\msys-1.0.dll set MSYSDIR=%ROOT_DIR%\usr -if EXIST %ROOT_DIR%\mingw32\bin\octave.bat set MSYSTEM=MINGW32 -if EXIST %ROOT_DIR%\mingw64\bin\octave.bat set MSYSTEM=MINGW64 +if NOT EXIST "%ROOT_DIR%\bin\msys-1.0.dll" set MSYSDIR=%ROOT_DIR%\usr +if EXIST "%ROOT_DIR%\mingw32\bin\octave.bat" set MSYSTEM=MINGW32 +if EXIST "%ROOT_DIR%\mingw64\bin\octave.bat" set MSYSTEM=MINGW64 if %MSYSTEM%==MSYS ( set OCTAVE_HOME=%ROOT_DIR% @@ -29,15 +29,15 @@ Rem Create qt.conf set QT_CONF=%OCTAVE_HOME%\bin\qt.conf -echo [Paths] > %QT_CONF% -echo Prefix=%OCTAVE_HOME:\=/% >> %QT_CONF% -echo Documentation=%QT_SUBDIR%doc >> %QT_CONF% -echo Headers=%QT_SUBDIR%include >> %QT_CONF% -echo Libraries=%QT_SUBDIR%libs >> %QT_CONF% -echo Plugins=%QT_SUBDIR%plugins >> %QT_CONF% -echo Translations=%QT_SUBDIR%translations >> %QT_CONF% +echo [Paths] > "%QT_CONF%" +echo Prefix="%OCTAVE_HOME:\=/%" >> "%QT_CONF%" +echo Documentation=%QT_SUBDIR%doc >> "%QT_CONF%" +echo Headers=%QT_SUBDIR%include >> "%QT_CONF%" +echo Libraries=%QT_SUBDIR%libs >> "%QT_CONF%" +echo Plugins=%QT_SUBDIR%plugins >> "%QT_CONF%" +echo Translations=%QT_SUBDIR%translations >> "%QT_CONF%" -Rem run bash to to regitser the initial envorinment +Rem Run bash to register the initial environment echo "Setting up MSYS system ..." "%MSYSDIR%\bin\bash.exe" --login -c echo echo "Updating fc-cache (may take a while) ..."
--- a/src/build-gcc.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/build-gcc.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := build-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 9.3.0 -$(PKG)_CHECKSUM := b746688bf045a316fc92c3528138ad10d0822b6b +$(PKG)_VERSION := 10.2.0 +$(PKG)_CHECKSUM := 8de0aecd3a52bb92b43082df8a9256356d1f03be $(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 Wed Feb 10 14:29:01 2021 -0500 +++ b/src/build-meson.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := build-meson $(PKG)_IGNORE := -$(PKG)_VERSION := 0.54.3 -$(PKG)_CHECKSUM := 741e42a3c8237abe74eb9f189cd8978897ef144d +$(PKG)_VERSION := 0.55.3 +$(PKG)_CHECKSUM := a20e5112130d8fc8763323f5c2cc1011b44e27b1 $(PKG)_SUBDIR := meson-$($(PKG)_VERSION) $(PKG)_FILE := meson-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/mesonbuild/meson/archive/$($(PKG)_VERSION).tar.gz
--- a/src/curl.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/curl.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.73.0 -$(PKG)_CHECKSUM := 3afb9616ad14c0a84c016bbc1704dc6d883e7c17 +$(PKG)_VERSION := 7.75.0 +$(PKG)_CHECKSUM := ae65d2140104f441b65b60c5e1d541d11dab80c6 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE)
--- a/src/default-octave.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/default-octave.mk Thu Feb 11 09:43:33 2021 -0500 @@ -117,6 +117,21 @@ $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := ax_blas_f77_func_ok=yes ax_blas_integer_size=4 octave_cv_sizeof_fortran_integer=4 endif +ifeq ($(MXE_SYSTEM),mingw) + # This is very similar to CONFIGURE_CPPFLAGS and CONFIGURE_LDFLAGS but with + # double quoted paths. + $(PKG)_CONFIGURE_CPPFLAGS := CPPFLAGS='-I"$(HOST_PREFIX)/include"' + ifeq ($(MXE_USE_LIB64_DIRECTORY),yes) + $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib" -L"$(HOST_PREFIX)/lib64"' + else + $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib"' + endif +else + $(PKG)_CONFIGURE_CPPFLAGS := $(CONFIGURE_CPPFLAGS) + $(PKG)_CONFIGURE_LDFLAGS := $(CONFIGURE_LDFLAGS) +endif + + ifeq ($(MXE_SYSTEM),msvc) $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)' # - Enable atomic refcount (required for QtHandles) @@ -131,8 +146,13 @@ CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' else $(PKG)_PREFIX := '$(HOST_PREFIX)' - $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ - LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib' + ifeq ($(MXE_SYSTEM),mingw) + $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ + LDFLAGS='-Wl,-rpath-link,"$(HOST_LIBDIR)" -L"$(HOST_LIBDIR)" -L"$($(PKG)_QTDIR)/lib"' + else + $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ + LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib' + endif endif ifeq ($(MXE_SYSTEM),mingw) @@ -174,7 +194,8 @@ mkdir '$(1)/.build' cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $($(PKG)_CONFIGURE_CPPFLAGS) \ + $($(PKG)_CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$($(PKG)_PREFIX)' \ --disable-silent-rules \
--- a/src/eigen.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/eigen.mk Thu Feb 11 09:43:33 2021 -0500 @@ -12,8 +12,8 @@ define $(PKG)_UPDATE $(WGET) -q -O- 'https://eigen.tuxfamily.org/index.php?title=Main_Page#Download' | \ - $(GREP) 'eigen/get/' | \ - $(SED) -n 's,.*eigen/get/\(3[^>]*\)\.tar.*,\1,p' | \ + $(GREP) 'released!' | \ + $(SED) -n 's,.*>Eigen \([0-9.]*\) released!.*,\1,p' | \ head -1 endef
--- a/src/fftw.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/fftw.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := fftw $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.8 -$(PKG)_CHECKSUM := 59831bd4b2705381ee395e54aa6e0069b10c3626 +$(PKG)_VERSION := 3.3.9 +$(PKG)_CHECKSUM := bf17b485417f0f6a896b8514a3813439fda075fc $(PKG)_SUBDIR := fftw-$($(PKG)_VERSION) $(PKG)_FILE := fftw-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.fftw.org/$($(PKG)_FILE)
--- a/src/freetds.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/freetds.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.5 -$(PKG)_CHECKSUM := 50b326d67ca88269d95c129bac5ea5c6f11fee91 +$(PKG)_VERSION := 1.2.18 +$(PKG)_CHECKSUM := 60e726946086ed78620dcb5e6061bdb4f54ed8f2 $(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 Wed Feb 10 14:29:01 2021 -0500 +++ b/src/freetype.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := freetype $(PKG)_IGNORE := -$(PKG)_VERSION := 2.10.2 -$(PKG)_CHECKSUM := b074d5c34dc0e3cc150be6e7aa6b07c9ec4ed875 +$(PKG)_VERSION := 2.10.4 +$(PKG)_CHECKSUM := 0181862673f7216ad2b5074f95fc131209e30b27 $(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/gcc-gmp.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/gcc-gmp.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := gcc-gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2.0 -$(PKG)_CHECKSUM := 5e9341d3807bc7505376f9ed9f5c1c6c57050aa6 +$(PKG)_VERSION := 6.2.1 +$(PKG)_CHECKSUM := 2dcf34d4a432dbe6cce1475a835d20fe44f75822 $(PKG)_SUBDIR := gmp-$($(PKG)_VERSION) $(PKG)_FILE := gmp-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://gmplib.org/download/gmp/$($(PKG)_FILE)
--- a/src/gdb.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/gdb.mk Thu Feb 11 09:43:33 2021 -0500 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gdb -$(PKG)_VERSION := 9.2 -$(PKG)_CHECKSUM := 356ee474a24bfb2f133894730916557dfea9da2e +$(PKG)_VERSION := 10.1 +$(PKG)_CHECKSUM := c625efd87116525fb3bbeca7eaa1028ee62c0e7d $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) $(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gdcm-2-getopt.patch Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,16 @@ +--- gdcm-3.0.8/Utilities/getopt/getopt.h.orig 2020-10-13 09:40:48.964337600 +0300 ++++ gdcm-3.0.8/Utilities/getopt/getopt.h 2020-10-13 09:40:38.576190500 +0300 +@@ -67,13 +67,7 @@ + #define GETOPT_EXPORT + #endif /*defined(WIN32)*/ + +-#if defined(_WIN32) && defined(GETOPT_DLL) +- #if defined(gdcmgetopt_EXPORTS) +- #define GETOPT_EXTERN __declspec( dllexport ) +- #else +- #define GETOPT_EXTERN __declspec( dllimport ) +- #endif +-#else ++#if defined(_WIN32) + #define GETOPT_EXTERN extern + #endif /*defined(WIN32)*/
--- a/src/geos.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/geos.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := geos $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.1 -$(PKG)_CHECKSUM := dbd165752dd4c48d81a84aa51c99d04410d96c67 +$(PKG)_VERSION := 3.9.0 +$(PKG)_CHECKSUM := 96fbbd6c8a44c0c9230e4c2daf70547a2a86abc0 $(PKG)_SUBDIR := geos-$($(PKG)_VERSION) $(PKG)_FILE := geos-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://download.osgeo.org/geos/$($(PKG)_FILE)
--- a/src/ghostscript-1-fixes.patch Wed Feb 10 14:29:01 2021 -0500 +++ b/src/ghostscript-1-fixes.patch Thu Feb 11 09:43:33 2021 -0500 @@ -1,40 +1,20 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: darealshinji <djcj@gmx.de> -Date: Mon, 3 Dec 2018 21:05:41 +0100 -Subject: [PATCH 1/1] cross-build fixes, hide libgs symbols - - -diff --git a/Makefile.in b/Makefile.in -index 1111111..2222222 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -173,6 +173,9 @@ CAPOPT= @HAVE_MKSTEMP@ @HAVE_FILE64@ @HAVE_FSEEKO@ @HAVE_MKSTEMP64@ @HAVE_FONTCO +diff -ur ghostscript-9.50.orig/base/fapi_ft.c ghostscript-9.50/base/fapi_ft.c +--- ghostscript-9.50.orig/base/fapi_ft.c 2020-12-27 14:29:32.714236780 -0500 ++++ ghostscript-9.50/base/fapi_ft.c 2020-12-27 14:30:34.503600642 -0500 +@@ -125,6 +125,10 @@ + delete_inc_int_info(gs_fapi_server * a_server, + FT_IncrementalRec * a_inc_int_info); - GS=@GS@ - GS_SO_BASE=@GS@ -+GS_SONAME=@GS_SONAME@ -+GS_SONAME_MAJOR=@GS_SONAME_MAJOR@ -+GS_SONAME_MAJOR_MINOR=@GS_SONAME_MAJOR_MINOR@ - - PCL=@PCL@ - PCL_SO_BASE=@PCL@ -@@ -184,7 +187,7 @@ GPDL=@GPDL@ - GPDL_SO_BASE=@GPDL@ - - XE=@EXEEXT@ --XEAUX=@EXEEXT@ -+XEAUX=@AUXEXEEXT@ - - PCL_TARGET=@PCL_TARGET@ - XPS_TARGET=@XPS_TARGET@ -diff --git a/base/gp_unix.c b/base/gp_unix.c -index 1111111..2222222 100644 ---- a/base/gp_unix.c -+++ b/base/gp_unix.c ++#ifndef FT_CALLBACK_DEF ++ #define FT_CALLBACK_DEF(X) X ++#endif ++ + FT_CALLBACK_DEF(void *) + FF_alloc(FT_Memory memory, long size) + { +diff -ur ghostscript-9.50.orig/base/gp_unix.c ghostscript-9.50/base/gp_unix.c +--- ghostscript-9.50.orig/base/gp_unix.c 2020-12-27 14:29:32.703236181 -0500 ++++ ghostscript-9.50/base/gp_unix.c 2020-12-27 18:25:25.242079971 -0500 @@ -16,6 +16,9 @@ /* Unix-specific routines for Ghostscript */ @@ -45,7 +25,7 @@ #include "pipe_.h" #include "string_.h" #include "time_.h" -@@ -454,3 +457,54 @@ void gp_enumerate_fonts_free(void *enum_state) +@@ -466,3 +469,54 @@ } #endif } @@ -100,11 +80,11 @@ + return unicode[0]; +} +#endif /* __MINGW32__ */ -diff --git a/base/unix-aux.mak b/base/unix-aux.mak -index 1111111..2222222 100644 ---- a/base/unix-aux.mak -+++ b/base/unix-aux.mak -@@ -57,23 +57,29 @@ $(AUX)gp_stdia.$(OBJ): $(GLSRC)gp_stdia.c $(AK)\ +Only in ghostscript-9.50/base: gp_unix.c.orig +diff -ur ghostscript-9.50.orig/base/unix-aux.mak ghostscript-9.50/base/unix-aux.mak +--- ghostscript-9.50.orig/base/unix-aux.mak 2020-12-27 14:29:32.718236997 -0500 ++++ ghostscript-9.50/base/unix-aux.mak 2020-12-27 18:25:25.242079971 -0500 +@@ -57,23 +57,29 @@ # -------------------------- Auxiliary programs --------------------------- # $(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS) @@ -134,7 +114,7 @@ $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) # To get GS to use the system zlib, you remove/hide the gs/zlib directory -@@ -84,6 +90,7 @@ MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ +@@ -84,6 +90,7 @@ $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) $(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS) @@ -142,7 +122,7 @@ $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) # .... and one using the zlib library linked via the command line -@@ -93,9 +100,11 @@ MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \ +@@ -93,9 +100,11 @@ $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS) @@ -154,11 +134,10 @@ $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) # Query the environment to construct gconfig_.h. -diff --git a/base/unix-dll.mak b/base/unix-dll.mak -index 1111111..2222222 100644 ---- a/base/unix-dll.mak -+++ b/base/unix-dll.mak -@@ -66,9 +66,6 @@ GPDL_SONAME_BASE=lib$(GPDL_SO_BASE) +diff -ur ghostscript-9.50.orig/base/unix-dll.mak ghostscript-9.50/base/unix-dll.mak +--- ghostscript-9.50.orig/base/unix-dll.mak 2020-12-27 14:29:32.690235473 -0500 ++++ ghostscript-9.50/base/unix-dll.mak 2020-12-27 18:25:25.242079971 -0500 +@@ -66,9 +66,6 @@ GS_SOEXT=$(SO_LIB_EXT) GS_DLLEXT=$(DLL_EXT) @@ -168,11 +147,10 @@ PCL_SONAME=$(PCL_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT) PCL_SONAME_MAJOR=$(PCL_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT) -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -23,6 +23,7 @@ AC_INIT +diff -ur ghostscript-9.50.orig/configure.ac ghostscript-9.50/configure.ac +--- ghostscript-9.50.orig/configure.ac 2020-12-27 14:29:32.689235419 -0500 ++++ ghostscript-9.50/configure.ac 2020-12-27 18:25:25.243080026 -0500 +@@ -23,6 +23,7 @@ AC_PREREQ(2.63) AC_LANG(C) AC_CONFIG_SRCDIR(psi/gs.c) @@ -180,7 +158,7 @@ dnl Inherit compiler flags from the environment... CFLAGS="${CFLAGS:=}" -@@ -125,8 +126,11 @@ AUXEXTRALIBSTMP="\$(EXTRALIBS)" +@@ -125,8 +126,11 @@ # purposefully do not include "help" output for this AC_ARG_ENABLE([save_confaux]) @@ -193,7 +171,7 @@ # rerun configure for the AUX tools, disabling a load of tests not relevant for CCAUX olddir=`pwd` if test x"$enable_save_confaux" = x"yes"; then -@@ -146,9 +150,10 @@ if test x"$CCAUX" != x"" ; then +@@ -146,9 +150,10 @@ echo $AUXFLAGS_MAK_LINE06 >> $AUXFLAGS_MAK.in echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in @@ -206,7 +184,7 @@ if test $status -eq 0 ; then CCAUX=$(grep CCAUX $AUXFLAGS_MAK | sed "s/CCAUX=//g") GCFLAGSAUXTMP=$(grep GCFLAGSAUX $AUXFLAGS_MAK | sed "s/GCFLAGSAUX=//g") -@@ -204,7 +209,7 @@ AC_PATH_TOOL(PKGCONFIG, pkg-config) +@@ -204,7 +209,7 @@ # but if we are cross compiling, and there isn't a matching # pkconfig for the --host setting, then don't use the 'local' # pkconfig at all @@ -215,7 +193,7 @@ AC_PATH_PROG(BUILD_PKGCONFIG, pkg-config) if test x"$BUILD_PKGCONFIG" = x"$PKGCONFIG" ; then PKGCONFIG= -@@ -217,7 +222,7 @@ AC_PATH_TOOL(STRIP_XE, strip) +@@ -217,7 +222,7 @@ # but if we are cross compiling, and there isn't a matching # pkconfig for the --host setting, then don't use the 'local' # pkconfig at all @@ -224,7 +202,7 @@ AC_PATH_PROG(BUILD_STRIP_XE, strip) if test x"$BUILD_STRIP_XE" = x"$STRIP_XE" ; then STRIP_XE= -@@ -234,18 +239,14 @@ CONTRIBINCLUDE="include $srcdir/contrib/contrib.mak" +@@ -234,18 +239,14 @@ INSTALL_CONTRIB="install-contrib-extras" if test x"$enable_contrib" = x; then @@ -245,7 +223,7 @@ fi if test x"$enable_contrib" != x"no"; then -@@ -274,26 +275,27 @@ dnl -------------------------------------------------- +@@ -274,26 +275,27 @@ CC_OPT_FLAGS_TO_TRY="-O" SET_DT_SONAME="-soname=" @@ -283,7 +261,7 @@ if test $ac_cv_prog_gcc = yes; then CC_OPT_FLAGS_TO_TRY="-O2" CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0" -@@ -321,7 +323,6 @@ else +@@ -321,7 +323,6 @@ fi ;; esac @@ -291,7 +269,7 @@ AC_SUBST(SET_DT_SONAME) -@@ -368,18 +369,20 @@ AC_ARG_WITH([arch_h], AC_HELP_STRING([--with-arch_h=<arch.h to use>], +@@ -368,18 +369,20 @@ ARCH_CONF_HEADER= if test x"$with_arch_h" = x""; then @@ -318,7 +296,7 @@ else ARCH_CONF_HEADER=$with_arch_h fi -@@ -658,15 +661,7 @@ dnl Set options that we want to pass into all other +@@ -658,15 +661,7 @@ dnl configure scripts we might call dnl -------------------------------------------------- @@ -335,7 +313,7 @@ dnl -------------------------------------------------- dnl Check for libraries -@@ -996,7 +991,7 @@ if test x"$enable_fapi" != xno; then +@@ -996,7 +991,7 @@ if $PKGCONFIG --atleast-version=12.0.6 freetype2; then AC_MSG_RESULT(yes) FT_CFLAGS="$CFLAGS `$PKGCONFIG --cflags freetype2`" @@ -344,7 +322,7 @@ FT_BRIDGE=1 SHARE_FT=1 else -@@ -1047,6 +1042,14 @@ AC_SUBST(FTSRCDIR) +@@ -1047,6 +1042,14 @@ AC_SUBST(FT_CFLAGS) AC_SUBST(FT_LIBS) @@ -359,7 +337,7 @@ AC_MSG_CHECKING([for local jpeg library source]) dnl At present, we give the local source priority over the shared dnl build, so that the D_MAX_BLOCKS_IN_MCU patch will be applied. -@@ -1088,6 +1091,13 @@ else +@@ -1088,6 +1091,13 @@ [define if the libjpeg memory system prototypes aren't available]) fi @@ -373,7 +351,7 @@ AC_MSG_CHECKING([for local zlib source]) dnl zlib is needed for language level 3, and libpng # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) -@@ -1096,6 +1106,13 @@ ZLIBDIR=src +@@ -1096,6 +1106,13 @@ AUX_SHARED_ZLIB= ZLIBCFLAGS="" @@ -387,7 +365,7 @@ if test -d $srcdir/zlib; then AC_MSG_RESULT([yes]) SHARE_ZLIB=0 -@@ -1110,6 +1127,9 @@ else +@@ -1110,6 +1127,9 @@ AC_CHECK_HEADERS(zlib.h, [SHARE_ZLIB=1; AUX_SHARED_ZLIB="-l\$(ZLIB_NAME)"]) ]) fi @@ -397,7 +375,7 @@ if test -z "$SHARE_ZLIB"; then AC_MSG_ERROR([I did not find a copy of zlib on your system. Please either install it, or unpack a copy of the source in a -@@ -1136,6 +1156,11 @@ AC_SUBST(ZLIBDIR) +@@ -1136,6 +1156,11 @@ AC_SUBST(FT_SYS_ZLIB) dnl png for the png output device; it also requires zlib @@ -409,7 +387,7 @@ LIBPNGDIR=src PNGDEVS='' PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' -@@ -1157,12 +1182,21 @@ fi +@@ -1157,12 +1182,21 @@ if test -z "$PNGDEVS"; then AC_MSG_NOTICE([disabling png output devices]) fi @@ -431,7 +409,7 @@ AC_MSG_CHECKING([for local lcms2mt library source]) LCMS2DIR=src LCMS2MTDIR=src -@@ -1197,6 +1231,8 @@ else +@@ -1197,6 +1231,8 @@ fi fi @@ -440,7 +418,7 @@ AC_SUBST(SHARELCMS) AC_SUBST(WHICHLCMS) AC_SUBST(LCMS2DIR) -@@ -1349,7 +1385,7 @@ EXPATDIR=src +@@ -1349,7 +1385,7 @@ EXPAT_CFLAGS= EXPAT_LIBS= @@ -449,7 +427,7 @@ if test -f $srcdir/xps/xps.mak; then AC_MSG_CHECKING([for local expat library source]) if test -f $srcdir/expat/lib/expat.h ; then -@@ -1528,16 +1564,14 @@ dnl look for IJS implementation +@@ -1528,16 +1564,14 @@ AC_ARG_WITH([ijs], AC_HELP_STRING([--without-ijs], [disable IJS driver support])) @@ -468,7 +446,7 @@ dnl set safe defaults IJSDIR=src -@@ -1589,15 +1623,8 @@ if test x$with_luratech != xno; then +@@ -1589,15 +1623,8 @@ SHARE_JBIG2=0 JBIG2DIR=$srcdir/luratech/ldf_jb2 @@ -486,7 +464,7 @@ JBIG2_AUTOCONF_CFLAGS="-DUSE_LDF_JB2 -DMAC -DMAC_OS_X_BUILD -fsigned-char" ;; AIX) -@@ -1611,7 +1638,6 @@ if test x$with_luratech != xno; then +@@ -1611,7 +1638,6 @@ JBIG2_AUTOCONF_CFLAGS="-DUSE_LDF_JB2 -fsigned-char -DLINUX=1 -DFORTE" ;; esac @@ -494,7 +472,7 @@ JBIG2FILEDEVS='$(DD)gdevjbig2.dev' JBIG2DEVS='$(PSD)jbig2.dev' -@@ -1718,15 +1744,8 @@ if test x$with_luratech != xno; then +@@ -1734,15 +1760,8 @@ SHARE_JPX=0 JPXDIR=$srcdir/luratech/lwf_jp2 @@ -512,7 +490,7 @@ JPX_AUTOCONF_CFLAGS="-DUSE_LWF_JP2 -DMAC -DMAC_OS_X_BUILD" ;; AIX) -@@ -1740,7 +1759,6 @@ if test x$with_luratech != xno; then +@@ -1756,7 +1775,6 @@ JPX_AUTOCONF_CFLAGS="-DUSE_LWF_JP2 -DLINUX=1 -DFORTE" ;; esac @@ -520,7 +498,7 @@ JPXDEVS='$(PSD)jpx.dev' else AC_MSG_RESULT([no]) -@@ -2357,22 +2375,15 @@ SO_LIB_EXT=".so" +@@ -2506,22 +2524,15 @@ DLL_EXT="" SO_LIB_VERSION_SEPARATOR="." @@ -552,7 +530,7 @@ DYNAMIC_CFLAGS="-fPIC" GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR)" PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)" -@@ -2386,17 +2397,21 @@ else +@@ -2535,17 +2546,21 @@ fi SO_LIB_EXT=".so" ;; @@ -578,7 +556,7 @@ DYNAMIC_CFLAGS="-fPIC" GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR)" PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)" -@@ -2404,7 +2419,7 @@ else +@@ -2553,7 +2568,7 @@ DYNAMIC_LIBS="" SO_LIB_EXT=".so" ;; @@ -587,7 +565,7 @@ GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GS_SONAME_MAJOR_MINOR)" PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(PCL_SONAME_MAJOR_MINOR)" XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(XPS_SONAME_MAJOR_MINOR)" -@@ -2442,15 +2457,18 @@ else +@@ -2591,15 +2606,18 @@ fi SO_LIB_EXT=".so" ;; @@ -610,7 +588,7 @@ INSTALL_SHARED="install-shared" if test "x$X_DEVS" != x; then DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so" -@@ -2462,14 +2480,14 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING([--enable-dynamic], +@@ -2611,14 +2629,14 @@ OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS" DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS" ;; @@ -627,7 +605,7 @@ INSTALL_SHARED="install-shared" DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\"" X11_DEVS="" -@@ -2814,23 +2832,31 @@ AC_SUBST(AUXDIRPOSTFIX) +@@ -2963,23 +2981,31 @@ # usually empty on Unix-like systems # -------------------------------------------------- EXEEXT="" @@ -671,7 +649,7 @@ # -------------------------------------------------- # Check for disabling of versioned path option. -@@ -2885,7 +2911,7 @@ fi +@@ -3034,7 +3060,7 @@ AC_SUBST(CLUSTER_CFLAGS) @@ -680,7 +658,7 @@ ilog2() { -@@ -3025,7 +3051,7 @@ AC_SUBST(AUXEXTRALIBS) +@@ -3174,7 +3200,7 @@ CONFIG_FILES_LIST="$CONFIG_FILES_LIST $THEMAKEFILE" @@ -689,19 +667,27 @@ CONFIG_FILES_LIST="$CONFIG_FILES_LIST" fi -diff --git a/psi/iapi.h b/psi/iapi.h -index 1111111..2222222 100644 ---- a/psi/iapi.h -+++ b/psi/iapi.h -@@ -68,6 +68,11 @@ extern "C" { - # define GSDLLEXPORT - # endif - # endif -+# ifdef __MINGW32__ -+/* export stdcall functions as "name" instead of "_name@ordinal" */ -+# undef GSDLLAPI -+# define GSDLLAPI -+# endif - # ifndef GSDLLAPI - # define GSDLLAPI __stdcall -# endif +Only in ghostscript-9.50: configure.ac.orig +diff -ur ghostscript-9.50.orig/Makefile.in ghostscript-9.50/Makefile.in +--- ghostscript-9.50.orig/Makefile.in 2020-12-27 14:29:32.689235419 -0500 ++++ ghostscript-9.50/Makefile.in 2020-12-27 18:25:25.241079917 -0500 +@@ -172,6 +172,9 @@ + + GS=@GS@ + GS_SO_BASE=@GS@ ++GS_SONAME=@GS_SONAME@ ++GS_SONAME_MAJOR=@GS_SONAME_MAJOR@ ++GS_SONAME_MAJOR_MINOR=@GS_SONAME_MAJOR_MINOR@ + + PCL=@PCL@ + PCL_SO_BASE=@PCL@ +@@ -183,7 +186,7 @@ + GPDL_SO_BASE=@GPDL@ + + XE=@EXEEXT@ +-XEAUX=@EXEEXT@ ++XEAUX=@AUXEXEEXT@ + + PCL_TARGET=@PCL_TARGET@ + XPS_TARGET=@XPS_TARGET@ +Only in ghostscript-9.50: Makefile.in.orig
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glib-2-fixes.patch Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,24 @@ +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/gmp.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/gmp.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2.0 -$(PKG)_CHECKSUM := 5e9341d3807bc7505376f9ed9f5c1c6c57050aa6 +$(PKG)_VERSION := 6.2.1 +$(PKG)_CHECKSUM := 2dcf34d4a432dbe6cce1475a835d20fe44f75822 $(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/graphicsmagick-3-user32.patch Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,71 @@ +diff -ur GraphicsMagick-1.3.36.orig/configure.ac GraphicsMagick-1.3.36/configure.ac +--- GraphicsMagick-1.3.36.orig/configure.ac 2021-01-01 09:35:17.966994198 -0500 ++++ GraphicsMagick-1.3.36/configure.ac 2021-01-01 14:21:04.736125338 -0500 +@@ -2752,7 +2752,8 @@ + found_libgdi32=0 + AC_CHECK_HEADER([windows.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) + AC_CHECK_HEADER([wingdi.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[#include <windows.h>]) +- AC_CHECK_LIB([gdi32],[OpenClipboard],[found_libgdi32=`expr $found_libgdi32 + 1`],,) ++ AC_CHECK_LIB([user32],[OpenClipboard],[found_libuser32=`expr $found_libuser32 + 1`],[],[]) ++ AC_CHECK_LIB([gdi32],[CreateDIBSection],[found_libgdi32=`expr $found_libgdi32 + 1`],[],[]) + if test $found_libgdi32 -gt 0 + then + passed=`expr $passed + 1` +@@ -2767,7 +2768,7 @@ + AC_MSG_RESULT([no -- some components failed test]) + have_gdi32='no (failed tests)' + else +- LIB_GDI32='-lgdi32' ++ LIB_GDI32='-lgdi32 -luser32' + LIBS="$LIB_GDI32 $LIBS" + AC_DEFINE([HasWINGDI32],[1],[Define to use the Windows GDI32 library]) + AC_MSG_RESULT([yes]) +diff -ur GraphicsMagick-1.3.36.orig/magick/nt_feature.c GraphicsMagick-1.3.36/magick/nt_feature.c +--- GraphicsMagick-1.3.36.orig/magick/nt_feature.c 2021-01-01 09:35:18.045998572 -0500 ++++ GraphicsMagick-1.3.36/magick/nt_feature.c 2021-01-01 14:22:55.233205368 -0500 +@@ -78,6 +78,7 @@ + % + % + */ ++#if defined(HasWINGDI32) + MagickExport void *CropImageToHBITMAP(Image *image, + const RectangleInfo *geometry,ExceptionInfo *exception) + { +@@ -217,6 +218,7 @@ + + return (void *)bitmapH; + } ++#endif + + /* + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +@@ -612,6 +614,7 @@ + % + % + */ ++#if defined(HasWINGDI32) + MagickExport void *ImageToHBITMAP(Image* image) + { + unsigned long +@@ -696,5 +699,6 @@ + + return (void *)bitmapH; + } ++#endif + + #endif +diff -ur GraphicsMagick-1.3.36.orig/magick/nt_feature.h GraphicsMagick-1.3.36/magick/nt_feature.h +--- GraphicsMagick-1.3.36.orig/magick/nt_feature.h 2021-01-01 09:35:18.038998185 -0500 ++++ GraphicsMagick-1.3.36/magick/nt_feature.h 2021-01-01 14:23:42.008779169 -0500 +@@ -23,9 +23,11 @@ + extern MagickExport char + *NTRegistryKeyLookup(const char *key); + ++#if defined(HasWINGDI32) + extern MagickExport void + *CropImageToHBITMAP(Image *,const RectangleInfo *,ExceptionInfo *), + *ImageToHBITMAP(Image* image); ++#endif + + #if !defined(XS_VERSION) +
--- a/src/graphicsmagick.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/graphicsmagick.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := graphicsmagick $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.35 -$(PKG)_CHECKSUM := b0460d7fb8b2d542a44446322ea62c053bc54b0c +$(PKG)_VERSION := 1.3.36 +$(PKG)_CHECKSUM := df45052bf485407ad4fb7d3b9b305d3e5ebb14e5 $(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION) $(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/icu4c.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/icu4c.mk Thu Feb 11 09:43:33 2021 -0500 @@ -1,7 +1,7 @@ PKG := icu4c $(PKG)_IGNORE := -$(PKG)_VERSION := 67.1 -$(PKG)_CHECKSUM := 6822a4a94324d1ba591b3e8ef084e4491af253c1 +$(PKG)_VERSION := 68.2 +$(PKG)_CHECKSUM := 07c8fc9de703b7af3c6a9fe12433771d6c7d659f $(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)
--- a/src/lcms-1-fixes.patch Wed Feb 10 14:29:01 2021 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -diff -ur lcms2-2.9.orig/lcms2.pc.in lcms2-2.9/lcms2.pc.in ---- lcms2-2.9.orig/lcms2.pc.in 2017-12-04 16:39:09.491042791 -0500 -+++ lcms2-2.9/lcms2.pc.in 2017-12-04 16:40:58.941757920 -0500 -@@ -7,5 +7,6 @@ - Description: LCMS Color Management Library - Version: @VERSION@ - Libs: -L${libdir} -llcms2 --Libs.private: @LIB_MATH@ @LIB_THREAD@ -+Libs.private: -ljpeg @LIB_MATH@ @LIB_THREAD@ - Cflags: -I${includedir} -+Requires: libtiff-4
--- a/src/lcms.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/lcms.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := lcms $(PKG)_IGNORE := -$(PKG)_VERSION := 2.11 -$(PKG)_CHECKSUM := 7413047c74de29e20caa5c9afc1b12bf07bbf7a7 +$(PKG)_VERSION := 2.12 +$(PKG)_CHECKSUM := 3d0c0276fcd3930b80c424512ec0b1ed54ec1497 $(PKG)_SUBDIR := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)) $(PKG)_FILE := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(subst a,,$($(PKG)_VERSION))/$($(PKG)_FILE)
--- a/src/libgcrypt.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/libgcrypt.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.6 -$(PKG)_CHECKSUM := 406b02873833427898d16bcc8483bc5c91c73d4a +$(PKG)_VERSION := 1.9.1 +$(PKG)_CHECKSUM := a15ce7355b028f28a33428eaa0147154861b29d4 $(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 Wed Feb 10 14:29:01 2021 -0500 +++ b/src/libgpg_error.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := libgpg_error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.39 -$(PKG)_CHECKSUM := 991a7a53e778a3de5ba8aad711e0bc9453101f4b +$(PKG)_VERSION := 1.41 +$(PKG)_CHECKSUM := 66d6270511a48bac0bf347330e7a12c62f3a1ab4 $(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/libproxy.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/libproxy.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,11 +3,11 @@ PKG := libproxy $(PKG)_IGNORE := -$(PKG)_VERSION := 0.4.15 -$(PKG)_CHECKSUM := 5261bf6875feef15a706b34e7c010619f484e92f +$(PKG)_VERSION := 0.4.17 +$(PKG)_CHECKSUM := cded2be341aa15bb1dc4ba574c0687e2ba8d59b2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $($(PKG)_SUBDIR).tar.xz -$(PKG)_URL := https://github.com/libproxy/libproxy/releases/download/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/libproxy/libproxy/archive/$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := $(PKG)_CMAKE_FLAGS :=
--- a/src/libsndfile.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/libsndfile.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,38 +3,37 @@ PKG := libsndfile $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.28 -$(PKG)_CHECKSUM := 85aa967e19f6b9bf975601d79669025e5f8bc77d +$(PKG)_VERSION := 1.0.30 +$(PKG)_CHECKSUM := 494b427f814858d1e4092c1767ab5652080fcffe $(PKG)_SUBDIR := libsndfile-$($(PKG)_VERSION) $(PKG)_FILE := libsndfile-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.mega-nerd.com/libsndfile/files/$($(PKG)_FILE) -$(PKG)_DEPS := sqlite flac ogg vorbis +$(PKG)_URL := https://github.com/$(PKG)/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := sqlite flac ogg opus vorbis define $(PKG)_UPDATE - $(WGET) -q -O- 'http://www.mega-nerd.com/libsndfile/' | \ - grep '<META NAME="Version"' | \ - $(SED) -n 's,.*CONTENT="libsndfile-\([0-9][^"]*\)">.*,\1,p' | \ - head -1 + $(WGET) -q -O- 'https://github.com/libsndfile/libsndfile/tags' | \ + $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \ + tail -1 endef -$(PKG)_EXTRA_CONFIGURE_OPTIONS := -ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),) - $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-stack-smash-protection -endif +define $(PKG)_BUILD + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + -DBUILD_TESTING=no \ + -DBUILD_PROGRAMS=no \ + -DBUILD_EXAMPLES=no \ + -DINSTALL_MANPAGES=no \ + -DENABLE_EXTERNAL_LIBS=yes \ + $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + . -define $(PKG)_BUILD - cd '$(1)' && autoreconf -fi -IM4 - cd '$(1)' && ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(HOST_PREFIX)' \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --enable-sqlite \ - --enable-external-libs \ - --disable-octave \ - --disable-alsa \ - --disable-full-suite \ - $($(PKG)_EXTRA_CONFIGURE_OPTIONS) - $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) - $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' + $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)' -j '1' VERBOSE=1 DESTDIR='$(3)' install + + if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ + rm -rf '$(3)$(HOST_PREFIX)/share/doc/$(PKG)'; \ + fi + endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libsodium.mk Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,34 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libsodium +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.0.18 +$(PKG)_CHECKSUM := cd8a76b79aeb077e8d3eea478ea6241972593dfd +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/jedisct1/$(PKG)/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://github.com/jedisct1/libsodium/tags' | \ + $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | $(SORT) -V | \ + tail -1 +endef + +$(PKG)_EXTRA_CONFIGURE_OPTIONS := +ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),) + $(PKG)_EXTRA_CONFIGURE_OPTIONS += CFLAGS="-O2 -g -fstack-protector" +endif + +define $(PKG)_BUILD + cd '$(1)' && ./autogen.sh \ + cd '$(1)' && ./configure \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + --prefix='$(HOST_PREFIX)' \ + $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) + + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/llvm-1-llvm-config.patch Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,79 @@ +If `llvm-config` is build as native version on the build system with a +cross-compile target system (i.e. as a build-tool for other project that want +to cross-compile), expose the settings for the target of the cross-compiler. +Also use the file naming conventions for the target of the cross-compiler. + +diff --git "a/include/llvm/Config/llvm-config.h.cmake" "b/include/llvm/Config/llvm-config.h.cmake" +index 872a315..9ad3055 100644 +--- "a/include/llvm/Config/llvm-config.h.cmake" ++++ "b/include/llvm/Config/llvm-config.h.cmake" +@@ -65,6 +65,9 @@ + /* Define if we have the perf JIT-support library */ + #cmakedefine01 LLVM_USE_PERF + ++/* Define if this is a native build for a cross-compiler */ ++#cmakedefine LLVM_TARGET_IS_CROSSCOMPILE_HOST ${LLVM_TARGET_IS_CROSSCOMPILE_HOST} ++ + /* Major version of the LLVM API */ + #define LLVM_VERSION_MAJOR ${LLVM_VERSION_MAJOR} + +diff --git "a/tools/llvm-config/llvm-config.cpp" "b/tools/llvm-config/llvm-config.cpp" +index bec89fe..a1be375 100644 +--- "a/tools/llvm-config/llvm-config.cpp" ++++ "b/tools/llvm-config/llvm-config.cpp" +@@ -37,7 +37,12 @@ using namespace llvm; + + // Include the build time variables we can report to the user. This is generated + // at build time from the BuildVariables.inc.in file by the build system. +-#include "BuildVariables.inc" ++#if defined(LLVM_TARGET_IS_CROSSCOMPILE_HOST) ++// include the .inc file with the settings for the cross-compiler ++# include "../../../tools/llvm-config/BuildVariables.inc" ++#else ++# include "BuildVariables.inc" ++#endif + + // Include the component table. This creates an array of struct + // AvailableComponent entries, which record the component name, library name, +@@ -352,14 +352,16 @@ int main(int argc, char **argv) { + StringRef SharedExt, SharedVersionedExt, SharedDir, SharedPrefix, StaticExt, + StaticPrefix, StaticDir = "lib", DirSep = "/"; + const Triple HostTriple(Triple::normalize(LLVM_HOST_TRIPLE)); +- if (HostTriple.isOSWindows()) { ++ const Triple TargetTriple(Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE)); ++ if (TargetTriple.isOSWindows()) { + SharedExt = "dll"; + SharedVersionedExt = LLVM_DYLIB_VERSION ".dll"; +- if (HostTriple.isOSCygMing()) { ++ if (TargetTriple.isOSCygMing()) { + StaticExt = "a"; + StaticPrefix = "lib"; + } else { + StaticExt = "lib"; ++ if (HostTriple.isOSWindows()) { + DirSep = "\\"; + std::replace(ActiveObjRoot.begin(), ActiveObjRoot.end(), '/', '\\'); + std::replace(ActivePrefix.begin(), ActivePrefix.end(), '/', '\\'); +@@ -368,10 +370,11 @@ int main(int argc, char **argv) { + std::replace(ActiveCMakeDir.begin(), ActiveCMakeDir.end(), '/', '\\'); + std::replace(ActiveIncludeOption.begin(), ActiveIncludeOption.end(), '/', + '\\'); ++ } + } + SharedDir = ActiveBinDir; + StaticDir = ActiveLibDir; +- } else if (HostTriple.isOSDarwin()) { ++ } else if (TargetTriple.isOSDarwin()) { + SharedExt = "dylib"; + SharedVersionedExt = LLVM_DYLIB_VERSION ".dylib"; + StaticExt = "a"; +@@ -670,7 +673,7 @@ int main(int argc, char **argv) { + } else if (PrintLibs) { + // On Windows, output full path to library without parameters. + // Elsewhere, if this is a typical library name, include it using -l. +- if (HostTriple.isWindowsMSVCEnvironment()) { ++ if (TargetTriple.isWindowsMSVCEnvironment()) { + OS << GetComponentLibraryPath(Lib, Shared); + } else { + StringRef LibName; +
--- a/src/llvm.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/llvm.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,12 +3,12 @@ PKG := llvm $(PKG)_IGNORE := -$(PKG)_VERSION := 7.1.0 -$(PKG)_CHECKSUM := d43bfea58a35e058b93a6af36a728cfc64add33d +$(PKG)_VERSION := 11.0.1 +$(PKG)_CHECKSUM := 1a911295260d4e41116b72788eb602702b4bb252 $(PKG)_SUBDIR := llvm-$($(PKG)_VERSION).src $(PKG)_FILE := llvm-$($(PKG)_VERSION).src.tar.xz -$(PKG)_URL := https://releases.llvm.org/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := +$(PKG)_URL := https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := build-python3 define $(PKG)_UPDATE wget -q -O- 'http://releases.llvm.org/download.html?' | \ @@ -17,26 +17,32 @@ head -1 endef +$(PKG)_CMAKE_PYTHON_FLAGS := \ + -DPYTHON_EXECUTABLE:FILEPATH='$(ROOT_PREFIX)/bin/python3' + ifeq ($(MXE_NATIVE_BUILD),yes) ifeq ($(MXE_SYSTEM),gnu-linux) define $(PKG)_BUILD mkdir '$(1)/.build' && cd '$(1)/.build' && cmake .. \ $($(PKG)_CMAKE_FLAGS) \ $(CMAKE_CCACHE_FLAGS) \ + $($(PKG)_CMAKE_PYTHON_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DLLVM_BUILD_LLVM_DYLIB=On \ - -DLLVM_LINK_LLVM_DYLIB=On \ + -DLLVM_BUILD_LLVM_DYLIB=ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ -DLLVM_VERSION_SUFFIX= \ -DLLVM_TARGETS_TO_BUILD='X86' \ - -DLLVM_BUILD_EXAMPLES=Off \ - -DLLVM_INCLUDE_EXAMPLES=Off \ - -DLLVM_BUILD_TESTS=Off \ - -DLLVM_INCLUDE_TESTS=Off \ + -DLLVM_ENABLE_EH=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_BUILD_EXAMPLES=OFF \ + -DLLVM_INCLUDE_EXAMPLES=OFF \ + -DLLVM_BUILD_TESTS=OFF \ + -DLLVM_INCLUDE_TESTS=OFF \ -DLLVM_INCLUDE_GO_TESTS=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ -DLLVM_BUILD_DOCS=OFF \ -DLLVM_ENABLE_DOXYGEN=OFF \ - -DLLVM_ENABLE_BACKTRACES=Off + -DLLVM_ENABLE_BACKTRACES=OFF $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' endef @@ -48,18 +54,15 @@ endif else ifeq ($(ENABLE_WINDOWS_64),yes) - ## WTF, setting LLVM_TARGETS_TO_BUILD to X64_64 doesn't work here? $(PKG)_SYSDEP_CMAKE_OPTIONS += \ - -DLLVM_DEFAULT_TARGET_TRIPLE='x86_64-pc-win32' \ - -DLLVM_TARGETS_TO_BUILD='X86' + -DLLVM_DEFAULT_TARGET_TRIPLE='x86_64-pc-win32' else - $(PKG)_SYSDEP_CMAKE_OPTIONS += \ - -DLLVM_DEFAULT_TARGET_TRIPLE='x86-pc-win32' \ - -DLLVM_TARGETS_TO_BUILD='X86' + $(PKG)_SYSDEP_CMAKE_OPTIONS += \ + -DLLVM_DEFAULT_TARGET_TRIPLE='x86-pc-win32' endif ifeq ($(USE_CCACHE),yes) $(PKG)_CCACHE_OPTIONS += \ - -DLLVM_CCACHE_BUILD=On + -DLLVM_CCACHE_BUILD=ON endif define $(PKG)_BUILD @@ -67,19 +70,23 @@ cd '$(1)/.build' && 'cmake' .. \ $($(PKG)_CMAKE_FLAGS) \ $(CMAKE_CCACHE_FLAGS) \ + $($(PKG)_CMAKE_PYTHON_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DLLVM_BUILD_TOOLS=OFF \ - -DLLVM_BUILD_LLVM_DYLIB=On \ - -DLLVM_LINK_LLVM_DYLIB=On \ + -DLLVM_BUILD_LLVM_DYLIB=ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ -DLLVM_VERSION_SUFFIX= \ + -DLLVM_TARGETS_TO_BUILD='X86' \ $($(PKG)_SYSDEP_CMAKE_OPTIONS) \ -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)'" \ - -DLLVM_BUILD_EXAMPLES=Off \ - -DLLVM_INCLUDE_EXAMPLES=Off \ - -DLLVM_BUILD_TESTS=Off \ - -DLLVM_INCLUDE_TESTS=Off \ + -DLLVM_ENABLE_EH=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_BUILD_EXAMPLES=OFF \ + -DLLVM_INCLUDE_EXAMPLES=OFF \ + -DLLVM_BUILD_TESTS=OFF \ + -DLLVM_INCLUDE_TESTS=OFF \ -DLLVM_INCLUDE_GO_TESTS=OFF \ - -DLLVM_ENABLE_BACKTRACES=Off \ + -DLLVM_ENABLE_BACKTRACES=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ -DLLVM_BUILD_DOCS=OFF \ -DLLVM_ENABLE_DOXYGEN=OFF \ @@ -98,11 +105,9 @@ $(MAKE) -C '$(1)/.build' -j $(JOBS) install DESTDIR='$(3)' # create symlink for shared library so that llvm-config can find it - cd '$(3)/$(HOST_BINDIR)' && ln -s LLVM.dll LLVM-$(word 1,$(subst ., ,$($(PKG)_VERSION))).$(word 2,$(subst ., ,$($(PKG)_VERSION))).dll + cd '$(3)/$(HOST_BINDIR)' && ln -s LLVM.dll LLVM-$(word 1,$(subst ., ,$($(PKG)_VERSION))).dll # install native llvm-config in HOST_BINDIR because it won't find the libs otherwise - # FIXME: Some of the configuration flags are hard coded into llvm-config with a patch. - # If the configuration flags are changed, the patch might have to be adapted. $(INSTALL) -d '$(HOST_BINDIR)' $(INSTALL) -m755 '$(1)/.build/NATIVE/bin/llvm-config' '$(HOST_BINDIR)/$(MXE_TOOL_PREFIX)llvm-config' endef
--- a/src/lua.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/lua.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := lua $(PKG)_IGNORE := -$(PKG)_VERSION := 5.3.5 -$(PKG)_CHECKSUM := 112eb10ff04d1b4c9898e121d6bdf54a81482447 +$(PKG)_VERSION := 5.4.2 +$(PKG)_CHECKSUM := 96d4a21393c94bed286b8dc0568f4bdde8730b22 $(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 Wed Feb 10 14:29:01 2021 -0500 +++ b/src/mesa.mk Thu Feb 11 09:43:33 2021 -0500 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := mesa -$(PKG)_VERSION := 20.1.10 -$(PKG)_CHECKSUM := 151d5edff5caeead98f428698cf02ddb0cf66d4b +$(PKG)_VERSION := 20.2.6 +$(PKG)_CHECKSUM := fba97064824a3645c5b00bd55618098483f21678 $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE) @@ -26,6 +26,7 @@ else ifeq ($(USE_SYSTEM_X11_LIBS),no) $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext xfixes + $(PKG)_BUILD_X11_LIBS_FLAGS = -Dxlib-lease=disabled else $(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$(BUILD_PKG_CONFIG_PATH) endif @@ -36,7 +37,8 @@ $(PKG)_X11_FLAGS := -Dplatforms='x11' \ -Dglx=gallium-xlib \ - -Ddri-drivers='' + -Ddri-drivers='' \ + $($(PKG)_BUILD_X11_LIBS_FLAGS) endif define $(PKG)_BUILD @@ -52,6 +54,12 @@ -Dshared-llvm=true cd '$(1)/.build' && DESTDIR=$(3) ninja -j $(JOBS) install + + # install headers + for i in EGL GLES GLES2 GLES3 KHR; do \ + $(INSTALL) -d "$(HOST_INCDIR)/$$i"; \ + $(INSTALL) -m 644 "$(1)/include/$$i/"* "$(HOST_INCDIR)/$$i/"; \ + done # opengl32.dll.a shadows libopengl32.a from mingw. They export slightly # different symbols which causes problems for some packages. So don't install
--- a/src/mingw-libgcrypt-1-fixes.patch Wed Feb 10 14:29:01 2021 -0500 +++ b/src/mingw-libgcrypt-1-fixes.patch Thu Feb 11 09:43:33 2021 -0500 @@ -58,33 +58,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Saikrishna Arcot <saiarcot895@gmail.com> -Date: Fri, 12 Jun 2015 14:53:55 -0700 -Subject: [PATCH 2/3] Don't call git to determine the revision. - - -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [1]) - # processing is done by autoconf and not during the configure run. - m4_define(mym4_version, - [mym4_version_major.mym4_version_minor.mym4_version_micro]) --m4_define([mym4_revision], -- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) -+m4_define([mym4_revision], [4091]) - m4_define([mym4_revision_dec], - m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))])) --m4_define([mym4_betastring], -- m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ -- awk -F- '$3!=0{print"-beta"$3}'])) -+m4_define([mym4_betastring], []) - m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) - m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" <rjones@redhat.com> Date: Sun, 28 Jun 2015 17:17:25 +0200 Subject: [PATCH 3/3] configure.ac: no serial-tests if automake < 1.12
--- a/src/mingw-llvm-1-config.patch Wed Feb 10 14:29:01 2021 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -diff --git "a/tools/llvm-config/llvm-config.cpp" "b/tools/llvm-config/llvm-config.cpp" -index 08b096a..a35422e 100644 ---- "a/tools/llvm-config/llvm-config.cpp" -+++ "b/tools/llvm-config/llvm-config.cpp" -@@ -352,14 +352,16 @@ int main(int argc, char **argv) { - StringRef SharedExt, SharedVersionedExt, SharedDir, SharedPrefix, StaticExt, - StaticPrefix, StaticDir = "lib", DirSep = "/"; - const Triple HostTriple(Triple::normalize(LLVM_HOST_TRIPLE)); -- if (HostTriple.isOSWindows()) { -+ const Triple TargetTriple(Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE)); -+ if (TargetTriple.isOSWindows()) { - SharedExt = "dll"; - SharedVersionedExt = LLVM_DYLIB_VERSION ".dll"; -- if (HostTriple.isOSCygMing()) { -+ if (TargetTriple.isOSCygMing()) { - StaticExt = "a"; - StaticPrefix = "lib"; - } else { - StaticExt = "lib"; -+ if (HostTriple.isOSWindows()) { - DirSep = "\\"; - std::replace(ActiveObjRoot.begin(), ActiveObjRoot.end(), '/', '\\'); - std::replace(ActivePrefix.begin(), ActivePrefix.end(), '/', '\\'); -@@ -368,10 +370,11 @@ int main(int argc, char **argv) { - std::replace(ActiveCMakeDir.begin(), ActiveCMakeDir.end(), '/', '\\'); - std::replace(ActiveIncludeOption.begin(), ActiveIncludeOption.end(), '/', - '\\'); -+ } - } - SharedDir = ActiveBinDir; - StaticDir = ActiveLibDir; -- } else if (HostTriple.isOSDarwin()) { -+ } else if (TargetTriple.isOSDarwin()) { - SharedExt = "dylib"; - SharedVersionedExt = LLVM_DYLIB_VERSION ".dylib"; - StaticExt = "a"; -@@ -386,7 +389,7 @@ int main(int argc, char **argv) { - StaticPrefix = SharedPrefix = "lib"; - } - -- const bool BuiltDyLib = !!LLVM_ENABLE_DYLIB; -+ const bool BuiltDyLib = true; - - /// CMake style shared libs, ie each component is in a shared library. - const bool BuiltSharedLibs = !!LLVM_ENABLE_SHARED; -@@ -398,7 +401,7 @@ int main(int argc, char **argv) { - // If LLVM_LINK_DYLIB is ON, the single shared library will be returned - // for "--libs", etc, if they exist. This behaviour can be overridden with - // --link-static or --link-shared. -- bool LinkDyLib = !!LLVM_LINK_DYLIB; -+ bool LinkDyLib = true; - - if (BuiltDyLib) { - std::string path((SharedDir + DirSep + DyLibName).str()); -@@ -670,7 +673,7 @@ int main(int argc, char **argv) { - } else if (PrintLibs) { - // On Windows, output full path to library without parameters. - // Elsewhere, if this is a typical library name, include it using -l. -- if (HostTriple.isWindowsMSVCEnvironment()) { -+ if (TargetTriple.isWindowsMSVCEnvironment()) { - OS << GetComponentLibraryPath(Lib, Shared); - } else { - StringRef LibName; -
--- a/src/mingw-openblas-1-xerbla.patch Wed Feb 10 14:29:01 2021 -0500 +++ b/src/mingw-openblas-1-xerbla.patch Thu Feb 11 09:43:33 2021 -0500 @@ -1,6 +1,6 @@ -diff -ur OpenBLAS-0.3.8.orig/driver/others/Makefile OpenBLAS-0.3.8/driver/others/Makefile ---- OpenBLAS-0.3.8.orig/driver/others/Makefile 2020-02-14 10:39:58.164130459 -0500 -+++ OpenBLAS-0.3.8/driver/others/Makefile 2020-02-14 10:46:23.254020333 -0500 +diff -ur OpenBLAS-0.3.13.orig/driver/others/Makefile OpenBLAS-0.3.13/driver/others/Makefile +--- OpenBLAS-0.3.13.orig/driver/others/Makefile 2020-12-27 09:18:47.133825725 -0500 ++++ OpenBLAS-0.3.13/driver/others/Makefile 2020-12-27 09:22:06.676660536 -0500 @@ -1,7 +1,7 @@ TOPDIR = ../.. include ../../Makefile.system @@ -10,7 +10,7 @@ #COMMONOBJS += slamch.$(SUFFIX) slamc3.$(SUFFIX) dlamch.$(SUFFIX) dlamc3.$(SUFFIX) -@@ -84,25 +84,22 @@ +@@ -88,29 +88,26 @@ ifeq ($(DYNAMIC_ARCH), 1) ifeq ($(ARCH),arm64) @@ -25,11 +25,16 @@ -HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) dynamic_zarch.$(SUFFIX) +HPLOBJS = memory.$(SUFFIX) dynamic_zarch.$(SUFFIX) else + ifeq ($(ARCH),mips64) +-HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) dynamic_mips64.$(SUFFIX) ++HPLOBJS = memory.$(SUFFIX) dynamic_mips64.$(SUFFIX) + else -HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) dynamic.$(SUFFIX) +HPLOBJS = memory.$(SUFFIX) dynamic.$(SUFFIX) endif endif endif + endif else -HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) parameter.$(SUFFIX) +HPLOBJS = memory.$(SUFFIX) parameter.$(SUFFIX) @@ -41,7 +46,7 @@ dynamic.$(SUFFIX) : dynamic.c $(CC) $(CFLAGS) -c $< -o $(@F) -@@ -190,9 +187,6 @@ +@@ -198,9 +195,6 @@ mulx.$(SUFFIX) : $(ARCH)/mulx.c $(CC) $(CFLAGS) -c -DXDOUBLE -UCOMPLEX $< -o $(@F)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mingw-zeromq-1-fixes.patch Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,64 @@ +--- a/tests/testutil.cpp ++++ b/tests/testutil.cpp +@@ -382,7 +382,7 @@ fd_t connect_socket (const char *endpoint_, const int af_, const int protocol_) + protocol_ == IPPROTO_UDP + ? IPPROTO_UDP + : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0); +- TEST_ASSERT_NOT_EQUAL (-1, s_pre); ++ TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre); + + if (af_ == AF_INET || af_ == AF_INET6) { + const char *port = strrchr (endpoint_, ':') + 1; +@@ -439,7 +439,7 @@ fd_t bind_socket_resolve_port (const char *address_, + protocol_ == IPPROTO_UDP + ? IPPROTO_UDP + : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0); +- TEST_ASSERT_NOT_EQUAL (-1, s_pre); ++ TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre); + + if (af_ == AF_INET || af_ == AF_INET6) { + #ifdef ZMQ_HAVE_WINDOWS + +--- a/tests/testutil.hpp ++++ b/tests/testutil.hpp +@@ -102,7 +102,6 @@ const uint8_t zmtp_ready_sub[27] = { + #include <winsock2.h> + #include <ws2tcpip.h> + #include <stdexcept> +-#define close closesocket + typedef int socket_size_t; + inline const char *as_setsockopt_opt_t (const void *opt) + { + +--- a/tests/testutil.cpp ++++ b/tests/testutil.cpp +@@ -296,7 +296,7 @@ int is_ipv6_available () + ipv6 = 0; + } + #endif +- close (fd); ++ closesocket (fd); + } + + return ipv6; +@@ -484,7 +484,7 @@ fd_t bind_socket_resolve_port (const char *address_, + #else + int fd = mkstemp (buffer); + TEST_ASSERT_TRUE (fd != -1); +- close (fd); ++ closesocket (fd); + #endif + #endif + strcpy ((*(struct sockaddr_un *) &addr).sun_path, buffer); +diff -ur zeromq-4.3.3.orig/Makefile.in zeromq-4.3.3/Makefile.in +--- zeromq-4.3.3.orig/Makefile.in 2021-01-16 16:58:57.118548621 -0500 ++++ zeromq-4.3.3/Makefile.in 2021-01-16 17:07:39.885588121 -0500 +@@ -2881,7 +2881,7 @@ + $(am__append_29) $(am__append_30) $(am__append_31) \ + $(am__append_32) $(am__append_33) $(am__append_36) \ + $(am__append_37) $(am__append_38) $(am__append_39) +-UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT ++UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT -D__USE_MINGW_ANSI_STDIO=1 + UNITY_LIBS = $(top_builddir)/external/unity/libunity.a + external_unity_libunity_a_SOURCES = external/unity/unity.c \ + external/unity/unity.h \
--- a/src/native-gcc.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/native-gcc.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := native-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 9.3.0 -$(PKG)_CHECKSUM := b746688bf045a316fc92c3528138ad10d0822b6b +$(PKG)_VERSION := 10.2.0 +$(PKG)_CHECKSUM := 8de0aecd3a52bb92b43082df8a9256356d1f03be $(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/netcdf-1-fixes.patch Wed Feb 10 14:29:01 2021 -0500 +++ b/src/netcdf-1-fixes.patch Thu Feb 11 09:43:33 2021 -0500 @@ -1,14 +1,36 @@ -diff --git "a/netcdf/ncdump/ncvalidator.c" "b/netcdf/ncdump/ncvalidator.c" -index a0e4acb..2a7c5af 100644 ---- "a/ncdump/ncvalidator.c" -+++ "b/ncdump/ncvalidator.c" -@@ -76,7 +76,9 @@ THIS SOFTWARE. +diff -ur netcdf-c-4.7.4.orig/include/XGetopt.h netcdf-c-4.7.4/include/XGetopt.h +--- netcdf-c-4.7.4.orig/include/XGetopt.h 2020-12-02 07:32:11.168214023 -0500 ++++ netcdf-c-4.7.4/include/XGetopt.h 2020-12-02 07:33:54.920018162 -0500 +@@ -20,6 +20,7 @@ + #include <stdio.h> + #include <tchar.h> + ++#if !defined(HAVE_GETOPT_H) + #if defined(DLL_NETCDF) + # if defined(DLL_EXPORT) + # define GTOPT_EXTRA __declspec(dllexport) +@@ -36,5 +37,6 @@ + extern TCHAR *optarg; + + int getopt(int argc, TCHAR *argv[], TCHAR *optstring); ++#endif + + #endif //XGETOPT_H +diff -ur netcdf-c-4.7.4.orig/ncdump/ncvalidator.c netcdf-c-4.7.4/ncdump/ncvalidator.c +--- netcdf-c-4.7.4.orig/ncdump/ncvalidator.c 2020-12-02 07:32:11.204216037 -0500 ++++ netcdf-c-4.7.4/ncdump/ncvalidator.c 2020-12-02 07:41:06.753176006 -0500 +@@ -76,10 +76,14 @@ #ifdef _WIN32 #include <io.h> #define snprintf _snprintf +#ifndef HAVE_UNISTD_H #include "XGetopt.h" +#endif ++#if !defined(HAVE_GETOPT_H) int opterr; int optind; #endif ++#endif + + #define X_ALIGN 4 + #define X_INT_MAX 2147483647
--- a/src/nettle.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/nettle.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := nettle $(PKG)_IGNORE := -$(PKG)_VERSION := 3.6 -$(PKG)_CHECKSUM := 22e48a4d232ccd26ba8303709f2222b422a8827d +$(PKG)_VERSION := 3.7 +$(PKG)_CHECKSUM := 7b3fca06e91ed9fc7689748aca858a1dd166bd17 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE)
--- a/src/npp.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/npp.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,10 +3,10 @@ PKG := npp $(PKG)_IGNORE := -$(PKG)_VERSION := 7.8.9 -$(PKG)_CHECKSUM := 26297d8c55833a6c43d16f3b0fa842ecd5153e20 +$(PKG)_VERSION := 7.9.1 +$(PKG)_CHECKSUM := ee7ad4c6ba08796d5186230092882910b0986ea0 $(PKG)_SUBDIR := -$(PKG)_FILE := $(PKG).$($(PKG)_VERSION).bin.zip +$(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) $(PKG)_DEPS :=
--- a/src/of-ga.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/of-ga.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := of-ga $(PKG)_IGNORE := -$(PKG)_VERSION := 0.10.1 -$(PKG)_CHECKSUM := bfa862743f793747281004123411c2c7800b8a50 +$(PKG)_VERSION := 0.10.2 +$(PKG)_CHECKSUM := 619931e785848d3719a6fa520056273414997c2b $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := ga-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz
--- a/src/of-windows.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/of-windows.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := of-windows $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.0 -$(PKG)_CHECKSUM := c2323df04664626a30d837154f2a7ea3255b9182 +$(PKG)_VERSION := 1.6.0 +$(PKG)_CHECKSUM := c8431b49d86dd902904ea154551d27cfb908a7ce $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := windows-$($(PKG)_VERSION) $(PKG)_FILE := windows-$($(PKG)_VERSION).tar.gz
--- a/src/openblas.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/openblas.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := openblas $(PKG)_IGNORE := -$(PKG)_VERSION := 0.3.12 -$(PKG)_CHECKSUM := ae647fed597ae891a7f122b9ddc6b15d4b7e0656 +$(PKG)_VERSION := 0.3.13 +$(PKG)_CHECKSUM := 685537a821819ef4dae5901998a57f0eec5bddad $(PKG)_SUBDIR := OpenBLAS-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openjpeg.mk Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,33 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := openjpeg +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.4.0 +$(PKG)_CHECKSUM := bbbf4dc4d9ce95286843cd39ac2febd3fd516c9d +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/uclouvain/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := lcms libpng tiff zlib + +$(PKG)_CMAKE_FLAGS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://github.com/uclouvain/openjpeg/tags' | \ + $(SED) -n 's|.*releases/tag/v\([0-9][^"]*\).*|\1|p' | $(SORT) -V | \ + tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + -DBUILD_PKGCONFIG_FILES=ON \ + -DBUILD_TESTING=OFF \ + $(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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opus.mk Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,40 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := opus +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.3.1 +$(PKG)_CHECKSUM := ed226536537861c9f0f1ef7ca79dffc225bc181b +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://archive.mozilla.org/pub/$(PKG)/$($(PKG)_FILE) +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://archive.mozilla.org/pub/opus/?C=M;O=D' | \ + $(SED) -n 's,.*opus-\([0-9][^>]*\)\.tar.*,\1,p' | \ + grep -v 'alpha' | \ + grep -v 'beta' | \ + grep -v 'rc' | \ + $(SORT) -Vr | \ + head -1 +endef + +$(PKG)_EXTRA_CONFIGURE_OPTIONS := +ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),) + $(PKG)_EXTRA_CONFIGURE_OPTIONS += CFLAGS="-O2 -g -fstack-protector" +endif + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) \ + --prefix='$(HOST_PREFIX)' \ + && $(CONFIGURE_POST_HOOK) + $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) + $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' + #rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/opus_*.3 + #rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/opus.h.3 + #rm -rf '$(PREFIX)/$(TARGET)'/share/doc/opus/html +endef
--- a/src/pcre2.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/pcre2.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := pcre2 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.35 -$(PKG)_CHECKSUM := 2e5ee2dd397fa8c3ce9aed1a986e51d66a88bdb0 +$(PKG)_VERSION := 10.36 +$(PKG)_CHECKSUM := 65958cfc799c1474a272938f5690dff5f10db216 $(PKG)_SUBDIR := pcre2-$($(PKG)_VERSION) $(PKG)_FILE := pcre2-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/pcre/pcre2/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/portaudio.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/portaudio.mk Thu Feb 11 09:43:33 2021 -0500 @@ -19,7 +19,7 @@ endif define $(PKG)_UPDATE - $(WGET) -q -O- 'http://www.portaudio.com/download.html' | \ + $(WGET) -q -O- 'http://files.portaudio.com/download.html' | \ $(SED) -n 's,.*pa_stable_v\([0-9][^>]*\)\.tgz.*,\1,p' | \ head -1 endef
--- a/src/proj.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/proj.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := proj $(PKG)_IGNORE := -$(PKG)_VERSION := 7.1.1 -$(PKG)_CHECKSUM := 3e713e3f7bbd0e0211dda500bfc5b05364c45485 +$(PKG)_VERSION := 7.2.1 +$(PKG)_CHECKSUM := 593005f2e4e76575ebee5cf228c968be730f9fd3 $(PKG)_SUBDIR := proj-$($(PKG)_VERSION) $(PKG)_FILE := proj-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/proj/$($(PKG)_FILE)
--- a/src/qhull.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/qhull.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := qhull $(PKG)_IGNORE := -$(PKG)_VERSION := 2020.1 -$(PKG)_CHECKSUM := a938aa73a8964f81786a05fc4c98044878e09f07 +$(PKG)_VERSION := 2020.2 +$(PKG)_CHECKSUM := 739346b5d6b3fe3675243b156c7ffe55f60cc3c9 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := qhull-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/qhull/$(PKG)/archive/$($(PKG)_VERSION).tar.gz @@ -23,6 +23,9 @@ tail -1 endef +# FIXME: Building and installing the deprecated target "libqhull" can be +# removed when Octave switches to using "libqhull_r" (see bug #60016). + define $(PKG)_BUILD mkdir '$(1)/../.build' cd '$(1)/../.build' && cmake \ @@ -33,5 +36,12 @@ -DDOC_INSTALL_DIR='$(1)' \ ../$($(PKG)_SUBDIR) make -C $(1)/../.build -j $(JOBS) + make -C $(1)/../.build libqhull -j $(JOBS) make -C $(1)/../.build -j 1 install DESTDIR=$(3) + if [ x$(MXE_WINDOWS_BUILD) == xyes ]; then \ + $(INSTALL) '$(1)/../.build/libqhull.dll.a' '$(3)$(HOST_LIBDIR)/'; \ + $(INSTALL) '$(1)/../.build/libqhull.dll' '$(3)$(HOST_BINDIR)/'; \ + else \ + $(INSTALL) $(1)/../.build/libqhull.so* '$(3)$(HOST_LIBDIR)/'; \ + fi endef
--- a/src/qscintilla.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/qscintilla.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := qscintilla $(PKG)_IGNORE := -$(PKG)_VERSION := 2.11.5 -$(PKG)_CHECKSUM := 1719d557f21375e04c11bd4ecf09a4d2ef87d2d0 +$(PKG)_VERSION := 2.11.6 +$(PKG)_CHECKSUM := fe010886e59996b53e38811f67993262220c8ae5 $(PKG)_SUBDIR := QScintilla-$($(PKG)_VERSION) $(PKG)_FILE := QScintilla-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.riverbankcomputing.com/static/Downloads/QScintilla/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/qtbase-1-fixes.patch Wed Feb 10 14:29:01 2021 -0500 +++ b/src/qtbase-1-fixes.patch Thu Feb 11 09:43:33 2021 -0500 @@ -1,6 +1,6 @@ This file is part of MXE. See LICENSE.md for licensing information. -From 7c5ba14d5b42334edb6a70239cf231f847f508ef Mon Sep 17 00:00:00 2001 +From 2c59523387b10937ff7d085bc34ec3df68805fea Mon Sep 17 00:00:00 2001 From: Ray Donnelly <mingw.android@gmail.com> Date: Wed, 26 Aug 2015 12:45:43 +0100 Subject: [PATCH 1/2] cmake: Rearrange STATIC vs INTERFACE targets @@ -12,10 +12,10 @@ See also: https://github.com/mxe/mxe/issues/1185 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 364c23e750..c90dd302cf 100644 +index 309798a767..18156cac9e 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -343,6 +343,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -370,6 +370,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") !!ENDIF @@ -25,10 +25,10 @@ !!IF !isEmpty(CMAKE_STATIC_TYPE) if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) !!IF !isEmpty(CMAKE_DEBUG_TYPE) -@@ -380,9 +383,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - +@@ -411,9 +414,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") + !!ENDIF -!!ELSE -!!IF equals(TEMPLATE, aux) - add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) @@ -36,20 +36,33 @@ add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF -- -2.20.1 +2.25.1 + + +From c3fa97702a080eb1a931fd1f41f7a1dd5b775523 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sun, 11 Jun 2017 00:27:41 +0200 +Subject: [PATCH 2/2] use pkg-config for harfbuzz + +Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 -diff -ur qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf ---- qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf 2018-06-12 07:47:54.488874295 -0400 -+++ qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf 2018-06-12 07:48:46.550096817 -0400 -@@ -46,7 +46,7 @@ - QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC - QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC - QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC --QMAKE_CFLAGS_ISYSTEM = -isystem -+QMAKE_CFLAGS_ISYSTEM = -I - QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden - QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 5ebcdb99b5..2553cb5cf6 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -303,7 +303,8 @@ + }, + "headers": "harfbuzz/hb.h", + "sources": [ +- "-lharfbuzz" ++ { "type": "pkgConfig", "args": "harfbuzz" }, ++ "-lharfbuzz" + ] + }, + "imf": { +-- +2.25.1 + diff -ur qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp --- qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:24:11.167038403 -0400 +++ qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:31:33.734199370 -0400 @@ -65,3 +78,4 @@ #else m_fontDatabase = QPlatformIntegration::fontDatabase(); #endif +
--- a/src/qtbase.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/qtbase.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.14.2 -$(PKG)_CHECKSUM := 9de814d3b9005bf984a78e4b564fbb9413e043c4 +$(PKG)_VERSION := 5.15.2 +$(PKG)_CHECKSUM := b5ad67fc6381ad7fae0296944734198488d096a3 $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) @@ -56,8 +56,9 @@ ## there are a number of other places that will need to be adjusted. ## --jwe $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5' - $(PKG)_CONFIGURE_OPTS += -no-xcb + $(PKG)_CONFIGURE_OPTS += -no-xcb -opengl dynamic else + $(PKG)_CONFIGURE_OPTS += -opengl desktop $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)' $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2' ifeq ($(USE_SYSTEM_OPENGL),no) @@ -124,7 +125,6 @@ -shared \ $($(PKG)_CONFIGURE_PREFIX_OPTION) \ -hostprefix '$(BUILD_TOOLS_PREFIX)' \ - -opengl desktop \ -no-glib \ -accessibility \ -nomake examples \
--- a/src/qtimageformats.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/qtimageformats.mk Thu Feb 11 09:43:33 2021 -0500 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 012e05d4fc3ab480aa769ec71f66f241b6d1436a +$(PKG)_CHECKSUM := c17b57cec197d721b3c844ff1dd68ab9996f4603 $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))
--- a/src/qtsvg.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/qtsvg.mk Thu Feb 11 09:43:33 2021 -0500 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b298847fa6619aa50f8d74f6c146e75fd7c88a48 +$(PKG)_CHECKSUM := 08531b47924078cbde6dfbf56da83651d58f6a13 $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))
--- a/src/qttools.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/qttools.mk Thu Feb 11 09:43:33 2021 -0500 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 172794608668d772c9ad6cd289bb84e0b3336999 +$(PKG)_CHECKSUM := ae92f651b1b029bd6f55fc8888134d73d8ad19be $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))
--- a/src/qttranslations.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/qttranslations.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := cf5e6ebf5a2ef2786908c03cbe191b31efa927e0 +$(PKG)_CHECKSUM := 980350bcbf680697bb2903955e2568ee9b5b365f $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))
--- a/src/readline-0-001.patch Wed Feb 10 14:29:01 2021 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 8.0 -Patch-ID: readline80-001 - -Bug-Reported-by: chet.ramey@case.edu -Bug-Reference-ID: -Bug-Reference-URL: - -Bug-Description: - -The history file reading code doesn't close the file descriptor open to -the history file when it encounters a zero-length file. - -diff --git "a/histfile.c" "b/histfile.c" ---- a/histfile.c 2018-06-11 09:14:52.000000000 -0400 -+++ b/histfile.c 2019-05-16 15:55:57.000000000 -0400 -@@ -306,4 +306,5 @@ - { - free (input); -+ close (file); - return 0; /* don't waste time if we don't have to */ - } -diff --git "a/patchlevel" "b/patchlevel" ---- a/patchlevel 2013-11-15 08:11:11.000000000 -0500 -+++ b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --0 -+1
--- a/src/readline-0-002.patch Wed Feb 10 14:29:01 2021 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 8.0 -Patch-ID: readline80-002 - -Bug-Reported-by: lessbug@qq.com -Bug-Reference-ID: <tencent_6AA531D9A5CC4121D86BD5CDA2E0DA98C605@qq.com> -Bug-Reference-URL: - -Bug-Description: - -When using previous-history to go back beyond the beginning of the history list, -it's possible to move to an incorrect partial line. - -diff --git "a/misc.c" "b/misc.c" ---- a/misc.c 2017-07-07 17:30:12.000000000 -0400 -+++ b/misc.c 2019-05-16 11:43:46.000000000 -0400 -@@ -577,4 +577,5 @@ - { - HIST_ENTRY *old_temp, *temp; -+ int had_saved_line; - - if (count < 0) -@@ -589,4 +590,5 @@ - - /* If we don't have a line saved, then save this one. */ -+ had_saved_line = _rl_saved_line_for_history != 0; - rl_maybe_save_line (); - -@@ -612,5 +614,6 @@ - if (temp == 0) - { -- rl_maybe_unsave_line (); -+ if (had_saved_line == 0) -+ _rl_free_saved_history_line (); - rl_ding (); - } -diff --git "a/patchlevel" "b/patchlevel" ---- a/patchlevel 2013-11-15 08:11:11.000000000 -0500 -+++ b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --1 -+2
--- a/src/readline-0-003.patch Wed Feb 10 14:29:01 2021 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 8.0 -Patch-ID: readline80-003 - -Bug-Reported-by: HIROSE Masaaki <hirose31@gmail.com> -Bug-Reference-ID: <CAGSOfA-RqiTe=+GsXsDKyZrrMWH4bDbXgMVVegMa6OjqC5xbnQ@mail.gmail.com> -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html - -Bug-Description: - -Reading history entries with timestamps can result in history entries joined -by linefeeds. - -diff --git "a/histfile.c" "b/histfile.c" ---- a/histfile.c 2018-06-11 09:14:52.000000000 -0400 -+++ b/histfile.c 2019-05-16 15:55:57.000000000 -0400 -@@ -370,7 +370,9 @@ - - has_timestamps = HIST_TIMESTAMP_START (buffer); -- history_multiline_entries += has_timestamps && history_write_timestamps; -+ history_multiline_entries += has_timestamps && history_write_timestamps; - - /* Skip lines until we are at FROM. */ -+ if (has_timestamps) -+ last_ts = buffer; - for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++) - if (*line_end == '\n') -@@ -381,5 +383,16 @@ - if (HIST_TIMESTAMP_START(p) == 0) - current_line++; -+ else -+ last_ts = p; - line_start = p; -+ /* If we are at the last line (current_line == from) but we have -+ timestamps (has_timestamps), then line_start points to the -+ text of the last command, and we need to skip to its end. */ -+ if (current_line >= from && has_timestamps) -+ { -+ for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++) -+ ; -+ line_start = (*line_end == '\n') ? line_end + 1 : line_end; -+ } - } - -diff --git "a/patchlevel" "b/patchlevel" ---- a/patchlevel 2013-11-15 08:11:11.000000000 -0500 -+++ b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --2 -+3
--- a/src/readline-0-004.patch Wed Feb 10 14:29:01 2021 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 8.0 -Patch-ID: readline80-004 - -Bug-Reported-by: auroralanes@protonmail.ch -Bug-Reference-ID: <WikEDKluAyoha9IDLp83rbN7_Uinr2rrpvSV_z4wmt9qur9piN-FNOn17P0cAizEVah1Fvc9d641vIIWX_7SC6EUTz0CatnOH-C-UK3rPYc=@protonmail.ch> -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2020-01/msg00008.html - -Bug-Description: - -If writing the history file fails, and renaming the backup history file fails, -it's possible for readline's history code to return the wrong error to its -caller. - -diff --git "a/histfile.c" "b/histfile.c" ---- a/histfile.c 2019-11-19 10:31:58.000000000 -0500 -+++ b/histfile.c 2020-02-01 16:28:29.000000000 -0500 -@@ -621,4 +621,5 @@ - if (rv != 0) - { -+ rv = errno; - if (tempname) - unlink (tempname); -@@ -768,4 +769,5 @@ - if (rv != 0) - { -+ rv = errno; - if (tempname) - unlink (tempname); -diff --git "a/patchlevel" "b/patchlevel" ---- a/patchlevel 2013-11-15 08:11:11.000000000 -0500 -+++ b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --3 -+4
--- a/src/readline-1-display.patch Wed Feb 10 14:29:01 2021 -0500 +++ b/src/readline-1-display.patch Thu Feb 11 09:43:33 2021 -0500 @@ -1,6 +1,6 @@ -diff -ur readline-8.0.orig/display.c readline-8.0.disp/display.c ---- readline-8.0.orig/display.c 2019-03-20 07:41:37.573786782 -0400 -+++ readline-8.0.disp/display.c 2019-03-20 17:00:29.866659451 -0400 +diff -ur readline-8.1.orig/display.c readline-8.1/display.c +--- readline-8.1.orig/display.c 2020-12-19 07:41:44.122860975 -0500 ++++ readline-8.1/display.c 2020-12-19 07:52:09.009050414 -0500 @@ -59,6 +59,11 @@ #include "rlprivate.h" #include "xmalloc.h" @@ -13,7 +13,7 @@ #if !defined (strchr) && !defined (__STDC__) extern char *strchr (), *strrchr (); #endif /* !strchr && !__STDC__ */ -@@ -2367,6 +2372,20 @@ +@@ -2686,6 +2691,20 @@ int in_invisline; int mb_cur_max = MB_CUR_MAX; @@ -34,7 +34,7 @@ woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset); cpos = _rl_last_c_pos; -@@ -2519,6 +2538,20 @@ +@@ -2832,6 +2851,20 @@ { register int delta, i; @@ -55,7 +55,7 @@ if (_rl_last_v_pos == to || to > _rl_screenheight) return; -@@ -2848,6 +2881,17 @@ +@@ -3157,6 +3190,17 @@ void _rl_clear_to_eol (int count) { @@ -73,9 +73,9 @@ #ifndef __MSDOS__ if (_rl_term_clreol) tputs (_rl_term_clreol, 1, _rl_output_character_function); -@@ -2873,6 +2917,33 @@ +@@ -3182,6 +3226,33 @@ void - _rl_clear_screen (void) + _rl_clear_screen (int clrscr) { +#if defined (_WIN32) + COORD coordScreen = { 0, 0 };
--- a/src/readline-1-fixes.patch Wed Feb 10 14:29:01 2021 -0500 +++ b/src/readline-1-fixes.patch Thu Feb 11 09:43:33 2021 -0500 @@ -1,16 +1,7 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Timothy Gu <timothygu99@gmail.com> -Date: Tue, 30 Sep 2014 17:16:32 -0700 -Subject: [PATCH 1/1] Handle missing S_IS* macros more gracefully - - -diff --git a/colors.c b/colors.c -index 1111111..2222222 100644 ---- a/colors.c -+++ b/colors.c -@@ -200,8 +200,10 @@ _rl_print_color_indicator (const char *f) +diff -ur readline-8.1/colors.c readline-8.1.1/colors.c +--- readline-8.1/colors.c 2019-11-19 10:30:54.000000000 -0500 ++++ readline-8.1.1/colors.c 2020-12-19 07:54:28.888704198 -0500 +@@ -207,8 +207,10 @@ #endif if (is_colored (C_CAP) && 0) //f->has_capability) colored_filetype = C_CAP; @@ -21,7 +12,7 @@ else if ((1 < astat.st_nlink) && is_colored (C_MULTIHARDLINK)) colored_filetype = C_MULTIHARDLINK; } -@@ -215,8 +217,10 @@ _rl_print_color_indicator (const char *f) +@@ -222,8 +224,10 @@ colored_filetype = C_STICKY_OTHER_WRITABLE; else #endif @@ -32,11 +23,11 @@ #if defined (S_ISVTX) else if ((mode & S_ISVTX) != 0 && is_colored (C_STICKY)) colored_filetype = C_STICKY; -diff --git a/colors.h b/colors.h -index 1111111..2222222 100644 ---- a/colors.h -+++ b/colors.h -@@ -96,7 +96,7 @@ enum indicator_no +Only in readline-8.1.1: colors.c.orig +diff -ur readline-8.1/colors.h readline-8.1.1/colors.h +--- readline-8.1/colors.h 2016-01-25 10:38:11.000000000 -0500 ++++ readline-8.1.1/colors.h 2020-12-19 07:54:28.888704198 -0500 +@@ -96,7 +96,7 @@ }; @@ -45,10 +36,9 @@ # define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) #endif -diff --git a/posixstat.h b/posixstat.h -index 1111111..2222222 100644 ---- a/posixstat.h -+++ b/posixstat.h +diff -ur readline-8.1/posixstat.h readline-8.1.1/posixstat.h +--- readline-8.1/posixstat.h 2019-12-19 11:24:37.000000000 -0500 ++++ readline-8.1.1/posixstat.h 2020-12-19 07:54:28.888704198 -0500 @@ -78,30 +78,44 @@ #if defined (S_IFBLK) && !defined (S_ISBLK) @@ -94,7 +84,7 @@ #endif /* -@@ -137,6 +151,8 @@ +@@ -157,6 +171,8 @@ /* These are non-standard, but are used in builtins.c$symbolic_umask() */ #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) #define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) @@ -103,4 +93,3 @@ +#endif #endif /* _POSIXSTAT_H_ */ -
--- a/src/readline-1-input.patch Wed Feb 10 14:29:01 2021 -0500 +++ b/src/readline-1-input.patch Thu Feb 11 09:43:33 2021 -0500 @@ -1,7 +1,7 @@ -diff -ur readline-8.0.disp/input.c readline-8.0/input.c ---- readline-8.0.disp/input.c 2019-03-20 07:56:04.897036396 -0400 -+++ readline-8.0/input.c 2019-03-20 08:00:45.403401856 -0400 -@@ -519,7 +519,12 @@ +diff -ur readline-8.1.1/input.c readline-8.1.2/input.c +--- readline-8.1.1/input.c 2020-12-19 07:54:06.883500144 -0500 ++++ readline-8.1.2/input.c 2020-12-19 07:55:29.042995655 -0500 +@@ -538,7 +538,12 @@ #if defined (__MINGW32__) if (isatty (fileno (stream)))
--- a/src/readline-1-sigwinch.patch Wed Feb 10 14:29:01 2021 -0500 +++ b/src/readline-1-sigwinch.patch Thu Feb 11 09:43:33 2021 -0500 @@ -1,9 +1,7 @@ -Common subdirectories: readline-8.0.input/doc and readline-8.0/doc -Common subdirectories: readline-8.0.input/examples and readline-8.0/examples -diff -u readline-8.0.input/readline.c readline-8.0/readline.c ---- readline-8.0.input/readline.c 2019-03-20 08:02:03.533512025 -0400 -+++ readline-8.0/readline.c 2019-03-20 08:06:59.117185446 -0400 -@@ -1103,8 +1103,12 @@ +diff -ur readline-8.1.2/readline.c readline-8.1.3/readline.c +--- readline-8.1.2/readline.c 2020-12-19 07:55:06.477760951 -0500 ++++ readline-8.1.3/readline.c 2020-12-19 07:56:17.722659252 -0500 +@@ -1154,8 +1154,12 @@ RL_SETSTATE(RL_STATE_INITIALIZED); } else @@ -18,10 +16,10 @@ /* Initialize the current line information. */ _rl_init_line_state (); -Common subdirectories: readline-8.0.input/shlib and readline-8.0/shlib -diff -u readline-8.0.input/signals.c readline-8.0/signals.c ---- readline-8.0.input/signals.c 2019-03-20 08:02:03.529511918 -0400 -+++ readline-8.0/signals.c 2019-03-20 08:13:44.347195350 -0400 +Only in readline-8.1.3: readline.c.orig +diff -ur readline-8.1.2/signals.c readline-8.1.3/signals.c +--- readline-8.1.2/signals.c 2020-12-19 07:55:06.471760622 -0500 ++++ readline-8.1.3/signals.c 2020-12-19 08:19:50.548964783 -0500 @@ -46,6 +46,11 @@ #include "rlprivate.h" @@ -43,7 +41,18 @@ int rl_catch_sigwinch = 1; #else int rl_catch_sigwinch = 0; /* for the readline state struct in readline.c */ -@@ -495,6 +500,21 @@ +@@ -266,8 +271,10 @@ + case SIGQUIT: + #endif + ++#if defined (HAVE_POSIX_SIGNALS) + if (block_sig) + sigprocmask (SIG_BLOCK, &set, &oset); ++#endif + + rl_echo_signal_char (sig); + rl_cleanup_after_signal (); +@@ -532,6 +539,21 @@ } #endif /* SIGWINCH */ @@ -65,7 +74,7 @@ return 0; } -@@ -545,6 +565,20 @@ +@@ -582,6 +604,20 @@ sigwinch_set_flag = 0; } #endif @@ -86,4 +95,3 @@ return 0; } -Common subdirectories: readline-8.0.input/support and readline-8.0/support
--- a/src/readline-2-event-hook.patch Wed Feb 10 14:29:01 2021 -0500 +++ b/src/readline-2-event-hook.patch Thu Feb 11 09:43:33 2021 -0500 @@ -1,7 +1,7 @@ -diff -ur readline-8.0.sigwinch/input.c readline-8.0/input.c ---- readline-8.0.sigwinch/input.c 2019-03-20 08:15:55.450361377 -0400 -+++ readline-8.0/input.c 2019-03-20 08:30:58.059756179 -0400 -@@ -140,6 +140,11 @@ +diff -ur readline-8.1.3/input.c readline-8.1.4/input.c +--- readline-8.1.3/input.c 2020-12-19 07:56:01.572775578 -0500 ++++ readline-8.1.4/input.c 2020-12-19 07:57:24.608319024 -0500 +@@ -142,6 +142,11 @@ static unsigned char ibuffer[512]; static int ibuffer_len = sizeof (ibuffer) - 1; @@ -13,7 +13,7 @@ #define any_typein (push_index != pop_index) int -@@ -266,7 +271,7 @@ +@@ -268,7 +273,7 @@ #if defined (__MINGW32__) /* Use getch/_kbhit to check for available console input, in the same way that we read it normally. */ @@ -22,7 +22,7 @@ result = 0; #endif -@@ -501,6 +506,120 @@ +@@ -520,6 +525,120 @@ return (c); } @@ -143,7 +143,7 @@ int rl_getc (FILE *stream) { -@@ -520,9 +639,9 @@ +@@ -539,9 +658,9 @@ #if defined (__MINGW32__) if (isatty (fileno (stream))) {
--- a/src/readline-2-history.patch Wed Feb 10 14:29:01 2021 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -diff -ur readline-8.0.eventhook/histfile.c readline-8.0/histfile.c ---- readline-8.0.eventhook/histfile.c 2019-04-03 10:21:42.916563353 -0400 -+++ readline-8.0/histfile.c 2019-04-03 16:16:04.605404093 -0400 -@@ -107,6 +107,11 @@ - # define PATH_MAX 1024 /* default */ - #endif - -+#if defined(_WIN32) -+ #define WIN32_LEAN_AND_MEAN -+ #include <windows.h> -+#endif -+ - extern void _hs_append_history_line PARAMS((int, const char *)); - - /* history file version; currently unused */ -@@ -139,6 +144,19 @@ - static int histfile_backup PARAMS((const char *, const char *)); - static int histfile_restore PARAMS((const char *, const char *)); - -+static int -+history_rename(const char *from, const char *to) -+{ -+#if defined(_WIN32) -+ if (!MoveFileEx(from, to, MOVEFILE_REPLACE_EXISTING)) { -+ return -1; -+ } -+ return 0; -+#else -+ return rename(from, to); -+#endif -+} -+ - /* Return the string that should be used in the place of this - filename. This only matters when you don't specify the - filename to read_history (), or write_history (). */ -@@ -448,10 +466,10 @@ - if ((n = readlink (filename, linkbuf, sizeof (linkbuf) - 1)) > 0) - { - linkbuf[n] = '\0'; -- return (rename (linkbuf, back)); -+ return (history_rename (linkbuf, back)); - } - #endif -- return (rename (filename, back)); -+ return (history_rename (filename, back)); - } - - /* Restore ORIG from BACKUP handling case where ORIG is a symlink -@@ -467,10 +485,10 @@ - if ((n = readlink (orig, linkbuf, sizeof (linkbuf) - 1)) > 0) - { - linkbuf[n] = '\0'; -- return (rename (backup, linkbuf)); -+ return (history_rename (backup, linkbuf)); - } - #endif -- return (rename (backup, orig)); -+ return (history_rename (backup, orig)); - } - - /* Truncate the history file FNAME, leaving only LINES trailing lines.
--- a/src/readline.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/readline.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := readline $(PKG)_IGNORE := -$(PKG)_VERSION := 8.0 -$(PKG)_CHECKSUM := d58041c2143595dc001d2777ae9a200be30198b0 +$(PKG)_VERSION := 8.1 +$(PKG)_CHECKSUM := 48c5e0c3a212449e206e21ba82856accac842c6f $(PKG)_SUBDIR := readline-$($(PKG)_VERSION) $(PKG)_FILE := readline-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/readline/$($(PKG)_FILE)
--- a/src/sqlite.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/sqlite.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,11 +3,11 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3330000 -$(PKG)_CHECKSUM := d63f3ce52cb295d62d09fc2ad8f2d29c35e1645f +$(PKG)_VERSION := 3340100 +$(PKG)_CHECKSUM := c20286e11fe5c2e3712ce74890e1692417de6890 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.sqlite.org/2020/$($(PKG)_FILE) +$(PKG)_URL := http://www.sqlite.org/2021/$($(PKG)_FILE) $(PKG)_DEPS := readline zlib ifeq ($(MXE_SYSTEM),mingw)
--- a/src/tiff.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/tiff.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := tiff $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.0 -$(PKG)_CHECKSUM := 7a882f8d55fd0620cbf89c47994d2d1d3b975452 +$(PKG)_VERSION := 4.2.0 +$(PKG)_CHECKSUM := 400ff865beb34499633dd1095fe438995e6da707 $(PKG)_SUBDIR := tiff-$($(PKG)_VERSION) $(PKG)_FILE := tiff-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/libtiff/$($(PKG)_FILE)
--- a/src/transfig-1-fixes.patch Wed Feb 10 14:29:01 2021 -0500 +++ b/src/transfig-1-fixes.patch Thu Feb 11 09:43:33 2021 -0500 @@ -1,47 +1,61 @@ -diff -ur fig2dev-3.2.7a.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.7a/fig2dev/dev/genbitmaps.c ---- fig2dev-3.2.7a.orig/fig2dev/dev/genbitmaps.c 2018-10-19 15:28:40.513608360 -0400 -+++ fig2dev-3.2.7a/fig2dev/dev/genbitmaps.c 2018-10-19 15:30:51.900907004 -0400 -@@ -232,8 +232,9 @@ - if (to) - sprintf(com + n, " >'%s'", to); +diff -ur fig2dev-3.2.8.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.8/fig2dev/dev/genbitmaps.c +--- fig2dev-3.2.8.orig/fig2dev/dev/genbitmaps.c 2020-12-24 07:58:17.831822681 -0500 ++++ fig2dev-3.2.8/fig2dev/dev/genbitmaps.c 2020-12-24 07:59:41.971440443 -0500 +@@ -493,8 +493,9 @@ + err_msg("Cannot write command for conversion to bitmap"); + BITMAP_EXIT_FAILURE; } - +#if !defined (__WIN32__) || defined (__CYGWIN__) (void) signal(SIGPIPE, bitmaps_broken_pipe); +#endif - if ((tfp = popen(com, "w")) == 0) { - fprintf(stderr, "fig2dev: Can't open pipe to ghostscript\n"); + if ((tfp = popen(com, "w")) == NULL) { + fprintf(stderr, "fig2dev: Cannot open pipe to ghostscript\n"); fprintf(stderr, "command was: %s\n", com); -@@ -275,7 +276,9 @@ +@@ -534,8 +535,9 @@ status = pclose(tfp); - tfp = 0; /* Otherwise main() tries to close tfp again */ -+#if ! defined (__WIN32__) || defined (__CYGWIN__) + tfp = NULL; /* Otherwise main() tries to close tfp again */ ++#if !defined (__WIN32__) || defined (__CYGWIN__) (void) signal(SIGPIPE, SIG_DFL); +- ++#endif + if (status != 0) { + FILE *f; + +diff -ur fig2dev-3.2.8.orig/fig2dev/dev/genemf.h fig2dev-3.2.8/fig2dev/dev/genemf.h +--- fig2dev-3.2.8.orig/fig2dev/dev/genemf.h 2020-12-24 07:58:17.831822681 -0500 ++++ fig2dev-3.2.8/fig2dev/dev/genemf.h 2020-12-24 08:06:13.519929445 -0500 +@@ -30,7 +30,9 @@ + #include "config.h" + #endif + ++#if !defined (__WIN32__) || defined (__CYGWIN__) + #include <endian.h> +#endif - if (status != 0) { - fputs("Error in ghostcript or netpbm command\n", stderr); -diff -ur fig2dev-3.2.7a.orig/fig2dev/dev/genpdf.c fig2dev-3.2.7a/fig2dev/dev/genpdf.c ---- fig2dev-3.2.7a.orig/fig2dev/dev/genpdf.c 2018-10-19 15:28:40.509608259 -0400 -+++ fig2dev-3.2.7a/fig2dev/dev/genpdf.c 2018-10-19 15:31:31.761906076 -0400 -@@ -95,7 +95,9 @@ - "-dAutoFilterColorImages=false -dColorImageFilter=/DCTEncode " - "-sDEVICE=pdfwrite -dPDFSETTINGS=/prepress -o '%s' -", - GSEXE, ofile); + typedef unsigned char uchar; + typedef unsigned short TCHAR; +diff -ur fig2dev-3.2.8.orig/fig2dev/dev/genpdf.c fig2dev-3.2.8/fig2dev/dev/genpdf.c +--- fig2dev-3.2.8.orig/fig2dev/dev/genpdf.c 2020-12-24 07:58:17.831822681 -0500 ++++ fig2dev-3.2.8/fig2dev/dev/genpdf.c 2020-12-24 08:01:13.368456502 -0500 +@@ -111,7 +111,9 @@ + exit(EXIT_FAILURE); + } + +#if !defined (__WIN32__) || defined (__CYGWIN__) (void) signal(SIGPIPE, pdf_broken_pipe); +#endif if ((tfp = popen(com, "w")) == 0) { - fprintf(stderr, "fig2dev: Cannot open pipe to ghostscript\n"); - fprintf(stderr, "command was: %s\n", com); -@@ -125,7 +127,9 @@ - free(com); - return -1; + err_msg("fig2dev: Cannot open pipe to ghostscript"); + put_msg("Command was: %s", com); +@@ -145,7 +147,9 @@ + err_msg("Error in ghostcript command,\n %s", com); + status = -1; + } else { ++#if !defined (__WIN32__) || defined (__CYGWIN__) + (void)signal(SIGPIPE, SIG_DFL); ++#endif } -+#if !defined (__WIN32__) || defined (__CYGWIN__) - (void) signal(SIGPIPE, SIG_DFL); -+#endif - free(com); - return 0; + if (com != com_buf)
--- a/src/transfig.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/transfig.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := transfig $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.7b -$(PKG)_CHECKSUM := 8097c178b7fff1023112250938cc87837c0f564e +$(PKG)_VERSION := 3.2.8 +$(PKG)_CHECKSUM := 6a4714b653d98734dcfd3d24e6bdf091c2e20195 $(PKG)_SUBDIR := fig2dev-$($(PKG)_VERSION) $(PKG)_FILE := fig2dev-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mcj/$($(PKG)_FILE)
--- a/src/units.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/units.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,8 +3,8 @@ PKG := units $(PKG)_IGNORE := -$(PKG)_VERSION := 2.19 -$(PKG)_CHECKSUM := 8c241b04046cafa4a4503dc3567d8d869b46329c +$(PKG)_VERSION := 2.21 +$(PKG)_CHECKSUM := a897e639111c9400737b68ec22e5f70eaf5d7253 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/wxwidgets-1-fixes.patch Thu Feb 11 09:43:33 2021 -0500 @@ -0,0 +1,192 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji <djcj@gmx.de> +Date: Fri, 26 May 2017 09:33:22 +0200 +Subject: [PATCH 1/2] make it possible to install DLLs into $(libdir)/../bin + + +diff --git a/Makefile.in b/Makefile.in +index 1111111..2222222 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -15523,7 +15523,7 @@ distclean: clean + @COND_MONOLITHIC_1_SHARED_1@install_monodll: $(__monodll___depname) + @COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_1_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_1_SHARED_1@uninstall_monodll: +@@ -15558,7 +15558,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1@install_basedll: $(__basedll___depname) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1@uninstall_basedll: +@@ -15595,7 +15595,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1@install_netdll: $(__netdll___depname) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1@uninstall_netdll: +@@ -15632,7 +15632,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll: $(__coredll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_coredll: +@@ -15669,7 +15669,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: $(__advdll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_advdll: +@@ -15706,7 +15706,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@install_mediadll: $(__mediadll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@uninstall_mediadll: +@@ -15743,7 +15743,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@install_htmldll: $(__htmldll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@uninstall_htmldll: +@@ -15780,7 +15780,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@install_webviewdll: $(__webviewdll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ (cd $(DESTDIR)$(libdir) ; $(__webviewdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@uninstall_webviewdll: +@@ -15817,7 +15817,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@install_qadll: $(__qadll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@uninstall_qadll: +@@ -15854,7 +15854,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1@install_xmldll: $(__xmldll___depname) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1@uninstall_xmldll: +@@ -15891,7 +15891,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@install_xrcdll: $(__xrcdll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@uninstall_xrcdll: +@@ -15928,7 +15928,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@install_auidll: $(__auidll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@uninstall_auidll: +@@ -15965,7 +15965,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@install_ribbondll: $(__ribbondll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ (cd $(DESTDIR)$(libdir) ; $(__ribbondll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@uninstall_ribbondll: +@@ -16002,7 +16002,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@install_propgriddll: $(__propgriddll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ (cd $(DESTDIR)$(libdir) ; $(__propgriddll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@uninstall_propgriddll: +@@ -16039,7 +16039,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@install_richtextdll: $(__richtextdll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@uninstall_richtextdll: +@@ -16076,7 +16076,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@install_stcdll: $(__stcdll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@uninstall_stcdll: +@@ -16113,7 +16113,7 @@ distclean: clean + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: $(__gldll___depname) + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_inst_cmd)) + + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@uninstall_gldll: + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Maarten Bent <MaartenBent@users.noreply.github.com> +Date: Thu, 16 Aug 2018 20:08:56 +0200 +Subject: [PATCH 2/2] Fix c++11-narrowing error when using clang on Windows + +Case value 0xfffffd9f results in the following error: +error: case value evaluates to 4294966687, which cannot be narrowed to type +'DISPID' (aka 'long') [-Wc++11-narrowing] + +diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp +index 1111111..2222222 100644 +--- a/src/msw/mediactrl_am.cpp ++++ b/src/msw/mediactrl_am.cpp +@@ -2179,7 +2179,9 @@ void wxAMMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y), + //--------------------------------------------------------------------------- + void wxAMMediaEvtHandler::OnActiveX(wxActiveXEvent& event) + { +- switch(event.GetDispatchId()) ++ // cast to unsigned long to fix narrowing error with case 0xfffffd9f ++ // when using clang ++ switch (static_cast<unsigned long>(event.GetDispatchId())) + { + #ifndef __WXWINCE__ + case 0x00000001: // statechange in IActiveMovie
--- a/src/zeromq.mk Wed Feb 10 14:29:01 2021 -0500 +++ b/src/zeromq.mk Thu Feb 11 09:43:33 2021 -0500 @@ -3,12 +3,12 @@ PKG := zeromq $(PKG)_IGNORE := -$(PKG)_VERSION := 4.3.1 -$(PKG)_CHECKSUM := 6cce22d830eaf95feff7cab00744df13ad7ab7f3 +$(PKG)_VERSION := 4.3.4 +$(PKG)_CHECKSUM := 47277a64749049123d1401600e8cfbab10a3ae28 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://github.com/$(PKG)/libzmq/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := pthreads +$(PKG)_DEPS := pthreads libsodium define $(PKG)_UPDATE $(WGET) -q -O- 'https://github.com/zeromq/libzmq/tags' | \ @@ -20,8 +20,10 @@ cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ - --without-libsodium \ + --disable-perf \ + --with-libsodium \ $(ENABLE_SHARED_OR_STATIC) + $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' endef