Merge 721125b883 into 2244f3f528

As per a31368b037.

Signed-off-by: Michael Keller <github@ike.ch>

.gitattributes

@@ -1,8 +1,9 @@
 .gitignore	export-ignore
 .gitattributes	export-ignore
 Documentation/*.html.git text=auto
-theme/jqplot.canvasAxisTickRenderer.min.js binary
+theme/jqplot.canvasAxisTickRenderer.js binary
-theme/jqplot.highlighter.min.js binary
+theme/jqplot.canvasTextRenderer.js binary
+theme/jqplot.highlighter.js binary
 theme/jquery.jqplot.min.js binary
 theme/jquery.min.js binary
 CHANGELOG.md -text merge=union

core/divelogexportlogic.cpp

@@ -155,10 +155,10 @@ void exportHtmlInitLogic(const QString &filename, struct htmlExportSetting &hes)
 	file_copy_and_overwrite(searchPath + "dive_export.html", filename);
 	file_copy_and_overwrite(searchPath + "list_lib.js", exportFiles + "list_lib.js");
 	file_copy_and_overwrite(searchPath + "poster.png", exportFiles + "poster.png");
-	file_copy_and_overwrite(searchPath + "jqplot.highlighter.min.js", exportFiles + "jqplot.highlighter.min.js");
 	file_copy_and_overwrite(searchPath + "jquery.jqplot.min.js", exportFiles + "jquery.jqplot.min.js");
-	file_copy_and_overwrite(searchPath + "jqplot.canvasAxisTickRenderer.min.js", exportFiles + "jqplot.canvasAxisTickRenderer.min.js");
+	file_copy_and_overwrite(searchPath + "jqplot.canvasAxisTickRenderer.js", exportFiles + "jqplot.canvasAxisTickRenderer.js");
-	file_copy_and_overwrite(searchPath + "jqplot.canvasTextRenderer.min.js", exportFiles + "jqplot.canvasTextRenderer.min.js");
+	file_copy_and_overwrite(searchPath + "jqplot.canvasTextRenderer.js", exportFiles + "jqplot.canvasTextRenderer.js");
+	file_copy_and_overwrite(searchPath + "jqplot.highlighter.js", exportFiles + "jqplot.highlighter.js");
 	file_copy_and_overwrite(searchPath + "jquery.min.js", exportFiles + "jquery.min.js");
 	file_copy_and_overwrite(searchPath + "jquery.jqplot.min.css", exportFiles + "jquery.jqplot.min.css");
 	file_copy_and_overwrite(searchPath + hes.themeFile, exportFiles + "theme.css");

packaging/ubuntu/debian/source.lintian-overrides

@@ -1,7 +1,7 @@
 # We use the package
-subsurface source: source-is-missing theme/jqplot.canvasAxisTickRenderer.min.js
+subsurface source: source-is-missing theme/jqplot.canvasAxisTickRenderer.js
-subsurface source: source-is-missing theme/jqplot.canvasTextRenderer.min.js
+subsurface source: source-is-missing theme/jqplot.canvasTextRenderer.js
-subsurface source: source-is-missing theme/jqplot.highlighter.min.js
+subsurface source: source-is-missing theme/jqplot.highlighter.js
 subsurface source: source-is-missing theme/jquery.jqplot.min.js
 subsurface source: source-is-missing theme/jquery.min.js
 subsurface source: source-is-missing theme/list_lib.js

scripts/docker/mxe-build-container/Dockerfile

@@ -48,13 +48,14 @@ RUN apt-get install -y \
     libxml-parser-perl \
     python3 \
     python3-mako \
+    python3-setuptools \
     python-is-python3 \
     ruby \
     xz-utils \
     scons
 
 # very often master is broken, so we pass in a known good SHA
-ARG mxe_sha=master
+ARG mxe_sha=d6377b2f2334694dbb040294fd0d848327e63328
 ENV _ver=${mxe_sha}
 
 WORKDIR /win
@@ -73,9 +74,6 @@ ADD settings.mk .
 # backend is not picked
 ADD qtconnectivity-1.patch src/
 
-ADD mdbtools_version.patch .
-RUN patch -p1 < mdbtools_version.patch 2>&1 | tee mxe-patch.log
-
 # separate download from build so that we can redo the build
 RUN make -j download 2>&1 | tee mxe-build.log
 

scripts/docker/mxe-build-container/mdbtools_version.patch

@@ -1,52 +0,0 @@
-# Temporary patch to apply to MXE's src/mdbtools.mk file while building docker
-# image, until it's applied upstream at github's MXE repo.
-
-
-diff --git a/src/mdbtools.mk b/src/mdbtools.mk
-index 42d303c2..d9d0f557 100644
---- a/src/mdbtools.mk
-+++ b/src/mdbtools.mk
-@@ -1,19 +1,17 @@
- # 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)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
--$(PKG)_URL      := https://github.com/brianb/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
-+$(PKG)_VERSION  := 1.0.0
-+$(PKG)_CHECKSUM := 3446e1d71abdeb98d41e252777e67e1909b186496fda59f98f67032f7fbcd955
-+$(PKG)_GH_CONF  := mdbtools/mdbtools/releases, v
- $(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 +22,11 @@ define $(PKG)_BUILD
-         --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 =
--- 
-2.43.0
-

theme/dive_export.html

@@ -49,9 +49,9 @@ function load_scripts()
 	load_script_sync("list_lib.js");
 	load_script_sync("jquery.min.js");
 	load_script_sync("jquery.jqplot.min.js");
-	load_script_sync("jqplot.highlighter.min.js");
+	load_script_sync("jqplot.canvasAxisTickRenderer.js");
-	load_script_sync("jqplot.canvasAxisTickRenderer.min.js");
+	load_script_sync("jqplot.canvasTextRenderer.js");
-	load_script_sync("jqplot.canvasTextRenderer.min.js");
+	load_script_sync("jqplot.highlighter.js");
 }
 
 var advanced_shown=false;