diff --git a/.gitattributes b/.gitattributes index 5eec5d5d3..6de7402a3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,9 +1,8 @@ .gitignore export-ignore .gitattributes export-ignore Documentation/*.html.git text=auto -theme/jqplot.canvasAxisTickRenderer.js binary -theme/jqplot.canvasTextRenderer.js binary -theme/jqplot.highlighter.js binary +theme/jqplot.canvasAxisTickRenderer.min.js binary +theme/jqplot.highlighter.min.js binary theme/jquery.jqplot.min.js binary theme/jquery.min.js binary CHANGELOG.md -text merge=union diff --git a/core/divelogexportlogic.cpp b/core/divelogexportlogic.cpp index 16b91e660..5e7dea8bd 100644 --- a/core/divelogexportlogic.cpp +++ b/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.js", exportFiles + "jqplot.canvasAxisTickRenderer.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 + "jqplot.canvasAxisTickRenderer.min.js", exportFiles + "jqplot.canvasAxisTickRenderer.min.js"); + file_copy_and_overwrite(searchPath + "jqplot.canvasTextRenderer.min.js", exportFiles + "jqplot.canvasTextRenderer.min.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"); diff --git a/packaging/ubuntu/debian/source.lintian-overrides b/packaging/ubuntu/debian/source.lintian-overrides index aeeed8fcc..babc83ee6 100644 --- a/packaging/ubuntu/debian/source.lintian-overrides +++ b/packaging/ubuntu/debian/source.lintian-overrides @@ -1,7 +1,7 @@ # We use the package -subsurface source: source-is-missing theme/jqplot.canvasAxisTickRenderer.js -subsurface source: source-is-missing theme/jqplot.canvasTextRenderer.js -subsurface source: source-is-missing theme/jqplot.highlighter.js +subsurface source: source-is-missing theme/jqplot.canvasAxisTickRenderer.min.js +subsurface source: source-is-missing theme/jqplot.canvasTextRenderer.min.js +subsurface source: source-is-missing theme/jqplot.highlighter.min.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 diff --git a/scripts/docker/mxe-build-container/Dockerfile b/scripts/docker/mxe-build-container/Dockerfile index 511117ba3..9b314c029 100644 --- a/scripts/docker/mxe-build-container/Dockerfile +++ b/scripts/docker/mxe-build-container/Dockerfile @@ -48,14 +48,13 @@ 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=d6377b2f2334694dbb040294fd0d848327e63328 +ARG mxe_sha=master ENV _ver=${mxe_sha} WORKDIR /win @@ -74,6 +73,9 @@ 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 diff --git a/scripts/docker/mxe-build-container/mdbtools_version.patch b/scripts/docker/mxe-build-container/mdbtools_version.patch new file mode 100644 index 000000000..98fa6112d --- /dev/null +++ b/scripts/docker/mxe-build-container/mdbtools_version.patch @@ -0,0 +1,52 @@ +# 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 '