From 2244f3f5281426425370e9ecacb5c9e1258a7559 Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Mon, 21 Oct 2024 10:04:18 +1300 Subject: [PATCH 1/2] Export: Cleanup jqplot Module References. Clean up references to the jqplot modules that were overlooked in #4350. Signed-off-by: Michael Keller --- .gitattributes | 5 +++-- core/divelogexportlogic.cpp | 6 +++--- packaging/ubuntu/debian/source.lintian-overrides | 6 +++--- theme/dive_export.html | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitattributes b/.gitattributes index 6de7402a3..5eec5d5d3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,9 @@ .gitignore export-ignore .gitattributes export-ignore Documentation/*.html.git text=auto -theme/jqplot.canvasAxisTickRenderer.min.js binary -theme/jqplot.highlighter.min.js binary +theme/jqplot.canvasAxisTickRenderer.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 diff --git a/core/divelogexportlogic.cpp b/core/divelogexportlogic.cpp index 5e7dea8bd..16b91e660 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.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 + "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 + "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 babc83ee6..aeeed8fcc 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.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/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/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/theme/dive_export.html b/theme/dive_export.html index 953d8a0d2..88531c9d1 100644 --- a/theme/dive_export.html +++ b/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.min.js"); - load_script_sync("jqplot.canvasTextRenderer.min.js"); + load_script_sync("jqplot.canvasAxisTickRenderer.js"); + load_script_sync("jqplot.canvasTextRenderer.js"); + load_script_sync("jqplot.highlighter.js"); } var advanced_shown=false; From 721125b88377fd05c11422ee8aab99af08a4ba1d Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Tue, 22 Oct 2024 12:07:49 +1300 Subject: [PATCH 2/2] Make MXE Build on ubuntu 24.04. As per https://github.com/mxe/mxe/commit/a31368b037221d56bcfcfd8c546b89adffe9ea04. Signed-off-by: Michael Keller --- scripts/docker/mxe-build-container/Dockerfile | 6 +-- .../mdbtools_version.patch | 52 ------------------- 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 scripts/docker/mxe-build-container/mdbtools_version.patch diff --git a/scripts/docker/mxe-build-container/Dockerfile b/scripts/docker/mxe-build-container/Dockerfile index 9b314c029..511117ba3 100644 --- a/scripts/docker/mxe-build-container/Dockerfile +++ b/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 diff --git a/scripts/docker/mxe-build-container/mdbtools_version.patch b/scripts/docker/mxe-build-container/mdbtools_version.patch deleted file mode 100644 index 98fa6112d..000000000 --- a/scripts/docker/mxe-build-container/mdbtools_version.patch +++ /dev/null @@ -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 '