Good morning Dirk. Have just realized MXE is shipping ancient mdbtools version 0.7.1 which dates back 10/2013.
I'll try to get this solved upstream, but don't know how long can it take. Meanwhile you can apply attached patch to the mxe building docker image. The good part is you don't need to rebuild the full image, just mdbtools after patching. An example workflow would be: - place the patch file in local folder accessible to running container, eg src/win32 (folder parallel to subsurface source) - load the image: (assumed running from same src folder previously said) docker run -v "$PWD"/win32:/win/win32 -v "$PWD"/subsurface:/win/subsurface --name=mybuilder -w /win -d subsurface/mxe-build-container:3.0.1 /bin/sleep 60m - patch the mxe sources docker exec -t mybuilder patch /win/mxe/src/mdbtools.mk /win/win32/mdbtools2.patch - redownload and build mdbtools inside the running container docker exec -t mybuilder bash -c "cd /win/mxe && make -j 2 download-mdbtools" docker exec -t mybuilder bash -c "cd /win/mxe && make MXE_TARGETS=x86_64-w64-mingw32.static mdbtools -j 1" - save the image of the container with a new tag, eg: docker commit -a "Salvador Cuñat salvador.cu...@gmail.com" -m "Apply mdbtools patch to get version v1.0.0 and rebuild package" mybuilder subsurface/mxe-build-container:3.0.2 If rebuilding the full image, the patch should be applied while building the Dockerfile, **after** checking out the desired MXE sha. Best regards.
--- /home/boret/src/mxe/src/mdbtools.mk 2024-01-07 13:12:55.514089205 +0100 +++ mdbtools-boret2.mk 2024-01-08 15:15:34.927893620 +0100 @@ -1,19 +1,19 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := mdbtools -$(PKG)_WEBSITE := https://sourceforge.net/projects/mdbtools/ +$(PKG)_WEBSITE := https://github.com/mdbtools/mdbtools $(PKG)_IGNORE := -$(PKG)_VERSION := 0.7.1 -$(PKG)_CHECKSUM := 4eac1bce55066a38d9ea6c52a8e8ecc101b79afe75118ecc16852990472c4721 -$(PKG)_SUBDIR := brianb-mdbtools-f8ce1cc +$(PKG)_VERSION := 1.0.0 +$(PKG)_CHECKSUM := 3446e1d71abdeb98d41e252777e67e1909b186496fda59f98f67032f7fbcd955 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/brianb/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/mdbtools/mdbtools/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := cc glib define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/brianb/mdbtools/tags' | \ - grep '<a href="/brianb/mdbtools/archive/' | \ - $(SED) -n 's,.*href="/brianb/mdbtools/archive/\([0-9][^"_]*\)\.tar.*,\1,p' | \ + $(WGET) -q -O- 'https://github.com/mdbtools/mdbtools/tags' | \ + grep 'href="/mdbtools/mdbtools/archive/' | \ + $(SED) -n 's,.*href="/mdbtools/mdbtools/archive/refs/tags/v\([0-9][^"_]*\)\.tar.*,\1,p' | \ head -1 endef @@ -24,10 +24,11 @@ --build="`config.guess`" \ --disable-shared \ --disable-man \ + --without-bash-completion-dir \ --prefix='$(PREFIX)/$(TARGET)' \ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= || \ - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= + $(MAKE) CFLAGS+='-Wno-deprecated-declarations' -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= || \ + $(MAKE) CFLAGS+='-Wno-deprecated-declarations' -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= endef $(PKG)_BUILD_SHARED =
_______________________________________________ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
