diff -Nru openscad-2021.01/debian/changelog openscad-2021.01/debian/changelog --- openscad-2021.01/debian/changelog 2023-02-06 18:05:30.000000000 +0000 +++ openscad-2021.01/debian/changelog 2023-02-26 16:49:50.000000000 +0000 @@ -1,8 +1,10 @@ -openscad (2021.01-5build1) lunar; urgency=medium +openscad (2021.01-6) unstable; urgency=medium - * Rebuild against latest icu + * Fix segfault during exit. + * Fix some lintians etc. + * Fix appdata issues. - -- Jeremy Bicha Mon, 06 Feb 2023 13:05:30 -0500 + -- Kristian Nielsen Sun, 26 Feb 2023 17:49:50 +0100 openscad (2021.01-5) unstable; urgency=medium diff -Nru openscad-2021.01/debian/control openscad-2021.01/debian/control --- openscad-2021.01/debian/control 2022-02-14 16:26:52.000000000 +0000 +++ openscad-2021.01/debian/control 2023-02-26 15:26:06.000000000 +0000 @@ -12,8 +12,8 @@ libopencsg-dev (>=1.3.0), libqscintilla2-qt5-dev, qtmultimedia5-dev, - libfreetype6-dev, - libfontconfig1-dev, + libfreetype-dev, + libfontconfig-dev, libharfbuzz-dev, libeigen3-dev, libglib2.0-dev, @@ -40,7 +40,7 @@ imagemagick (>= 6.5.9.3), libgl1-mesa-dri, xvfb, - libgl1-mesa-dev, + libgl-dev, openscad-mcad, fonts-hosny-amiri, libdouble-conversion-dev, @@ -54,7 +54,7 @@ # http://bugs.debian.org/797816 Build-Conflicts: libgles2-mesa-dev -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Rules-Requires-Root: no Section: graphics Homepage: http://openscad.org/ diff -Nru openscad-2021.01/debian/copyright openscad-2021.01/debian/copyright --- openscad-2021.01/debian/copyright 2022-02-14 16:26:52.000000000 +0000 +++ openscad-2021.01/debian/copyright 2023-02-26 16:49:50.000000000 +0000 @@ -254,7 +254,7 @@ License: PD-trochoids or LGPL-2.1 Files: debian/* -Copyright: © 2010-2022 Christian M. Amsüss , +Copyright: © 2010-2023 Christian M. Amsüss , Kristian Nielsen License: GPL-2+ with CGAL exception diff -Nru openscad-2021.01/debian/openscad-testing-data.lintian-overrides openscad-2021.01/debian/openscad-testing-data.lintian-overrides --- openscad-2021.01/debian/openscad-testing-data.lintian-overrides 2022-02-14 16:26:52.000000000 +0000 +++ openscad-2021.01/debian/openscad-testing-data.lintian-overrides 2023-02-26 16:49:50.000000000 +0000 @@ -1,13 +1,13 @@ # See README.source -- they're needed for unit tests. duplicate-font-file *amiri-regular.ttf* duplicate-font-file *LiberationSans-Regular.ttf* -font-outside-font-dir usr/share/openscad/testdata/ttf/marvosym-3.10/marvosym.ttf -font-in-non-font-package usr/share/openscad/testdata/ttf/marvosym-3.10/marvosym.ttf +font-outside-font-dir *marvosym.ttf* +font-in-non-font-package *marvosym.ttf* # These are unit tests for national encodings, so need to use non-utf8 bytes. -national-encoding usr/share/openscad/regression/* -national-encoding usr/share/openscad/testdata/* +national-encoding *usr/share/openscad/regression/* +national-encoding *usr/share/openscad/testdata/* # Other unit-test overrides. -package-contains-documentation-outside-usr-share-doc usr/share/openscad/regression/cgalstlsanitytest/normal-nan-expected.txt -image-file-has-unexpected-name usr/share/openscad/testdata/svg/viewbox/viewbox-tests.svg.in* +package-contains-documentation-outside-usr-share-doc *normal-nan-expected.txt* +image-file-has-unexpected-name *viewbox-tests.svg.in* diff -Nru openscad-2021.01/debian/patches/Cherry-pick-upstream-fix-for-use-after-free-crash-at-exit.patch openscad-2021.01/debian/patches/Cherry-pick-upstream-fix-for-use-after-free-crash-at-exit.patch --- openscad-2021.01/debian/patches/Cherry-pick-upstream-fix-for-use-after-free-crash-at-exit.patch 1970-01-01 00:00:00.000000000 +0000 +++ openscad-2021.01/debian/patches/Cherry-pick-upstream-fix-for-use-after-free-crash-at-exit.patch 2023-02-26 16:49:11.000000000 +0000 @@ -0,0 +1,27 @@ +From: Kristian Nielsen +Date: Sun, 26 Feb 2023 15:38:42 +0100 +Subject: Cherry-pick upstream fix for use-after-free crash at exit + +This patch can be dropped when importing next upstream release. + +Origin: https://github.com/openscad/openscad/pull/3846 +Bug: https://github.com/openscad/openscad/issues/3837 +Forwarded: not-needed +--- + src/openscad.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/openscad.cc b/src/openscad.cc +index 6c2a00c..568ca88 100644 +--- a/src/openscad.cc ++++ b/src/openscad.cc +@@ -844,7 +844,8 @@ int gui(vector &inputFiles, const fs::path &original_path, int argc, cha + + InputDriverManager::instance()->init(); + int rc = app.exec(); +- for (auto &mainw : scadApp->windowManager.getWindows()) delete mainw; ++ const auto &windows = scadApp->windowManager.getWindows(); ++ while (!windows.empty()) delete *windows.begin(); + return rc; + } + #else // OPENSCAD_QTGUI diff -Nru openscad-2021.01/debian/patches/Fix-appdata-issues.patch openscad-2021.01/debian/patches/Fix-appdata-issues.patch --- openscad-2021.01/debian/patches/Fix-appdata-issues.patch 1970-01-01 00:00:00.000000000 +0000 +++ openscad-2021.01/debian/patches/Fix-appdata-issues.patch 2023-02-26 16:49:50.000000000 +0000 @@ -0,0 +1,48 @@ +From: Kristian Nielsen +Date: Sun, 26 Feb 2023 17:49:07 +0100 +Subject: Fix appdata issues + +Fixes deprecated tag and sorts release list. +Patch taken from upstream, no need to keep after importing next upstream release. + +Origin: https://github.com/openscad/openscad/pull/3979 +Origin: https://github.com/openscad/openscad/pull/3643 +Forwarded: not-needed +--- + openscad.appdata.xml.in | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/openscad.appdata.xml.in b/openscad.appdata.xml.in +index 6e4ca78..8b94fb6 100644 +--- a/openscad.appdata.xml.in ++++ b/openscad.appdata.xml.in +@@ -21,9 +21,9 @@ +

OpenSCAD is not an interactive modeller. Instead it is something like a 3D-compiler that reads in a script file that describes the object and renders the 3D model from this script file. This gives you (the designer) full control over the modelling process and enables you to easily change any step in the modelling process or make designs that are defined by configurable parameters.

+

OpenSCAD provides two main modelling techniques: First there is constructive solid geometry (aka CSG) and second there is extrusion of 2D outlines. As data exchange format for this 2D outlines Autocad DXF files are used. In addition to 2D paths for extrusion it is also possible to read design parameters from DXF files. Besides DXF files OpenSCAD can read and create 3D models in the STL and OFF file formats.

+ +- +- application/x-openscad +- ++ ++ application/x-openscad ++ + The OpenSCAD Developers + + +@@ -35,10 +35,15 @@ + + + ++ ++ + + + + +- ++ ++ ++ ++ + + diff -Nru openscad-2021.01/debian/patches/Fix-uninitialized-class-member.patch openscad-2021.01/debian/patches/Fix-uninitialized-class-member.patch --- openscad-2021.01/debian/patches/Fix-uninitialized-class-member.patch 1970-01-01 00:00:00.000000000 +0000 +++ openscad-2021.01/debian/patches/Fix-uninitialized-class-member.patch 2023-02-26 16:49:11.000000000 +0000 @@ -0,0 +1,26 @@ +From: Kristian Nielsen +Date: Sun, 26 Feb 2023 15:35:00 +0100 +Subject: Fix uninitialized class member + +This patch can be dropped when importing next upstream release, as the +associated code is gone/rewritten upstream. + +Forwarded: not-needed +--- + src/mainwin.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/mainwin.cc b/src/mainwin.cc +index f0e2837..2369ef1 100755 +--- a/src/mainwin.cc ++++ b/src/mainwin.cc +@@ -178,7 +178,8 @@ void fileExportedMessage(const char *format, const QString &filename) { + } // namespace + + MainWindow::MainWindow(const QStringList &filenames) +- : top_ctx(Context::create()), root_inst("group"), library_info_dialog(nullptr), font_list_dialog(nullptr), ++ : customizerEditor(nullptr), ++ top_ctx(Context::create()), root_inst("group"), library_info_dialog(nullptr), font_list_dialog(nullptr), + procevents(false), tempFile(nullptr), progresswidget(nullptr), includes_mtime(0), deps_mtime(0), last_parser_error_pos(-1) + { + setupUi(this); diff -Nru openscad-2021.01/debian/patches/series openscad-2021.01/debian/patches/series --- openscad-2021.01/debian/patches/series 2022-04-15 08:13:31.000000000 +0000 +++ openscad-2021.01/debian/patches/series 2023-02-26 16:49:50.000000000 +0000 @@ -12,3 +12,6 @@ Backport-upstream-patch-to-fix-a-FTBFS-in-sid.patch Add-CGAL-set_warning_behaviour-for-issue-3935.patch Remove-double-quoting-of-the-output-file-parameter-for-gh.patch +Fix-uninitialized-class-member.patch +Cherry-pick-upstream-fix-for-use-after-free-crash-at-exit.patch +Fix-appdata-issues.patch diff -Nru openscad-2021.01/debian/rules openscad-2021.01/debian/rules --- openscad-2021.01/debian/rules 2022-02-15 21:20:27.000000000 +0000 +++ openscad-2021.01/debian/rules 2023-02-26 16:49:50.000000000 +0000 @@ -142,7 +142,7 @@ sed -i 's/ | libqt5gui5-gles (>= [.0-9]*)//' debian/openscad.substvars override_dh_strip: - dh_strip --dbgsym-migration='openscad-dbg (<<2019.05-1~)' + dh_strip override_dh_auto_clean: dh_auto_clean diff -Nru openscad-2021.01/debian/source/lintian-overrides openscad-2021.01/debian/source/lintian-overrides --- openscad-2021.01/debian/source/lintian-overrides 2022-02-14 16:26:52.000000000 +0000 +++ openscad-2021.01/debian/source/lintian-overrides 2023-02-26 16:36:47.000000000 +0000 @@ -1,4 +1,7 @@ # Minified javascript deliberately shipped in upstream sources: # https://github.com/openscad/openscad/issues/1491 -source-contains-prebuilt-javascript-object scripts/examples-html/assets/js/rainbow.linenumbers.min.js -source-contains-prebuilt-javascript-object scripts/examples-html/assets/js/rainbow.min.js +source-contains-prebuilt-javascript-object *rainbow.linenumbers.min.js* +source-contains-prebuilt-javascript-object *rainbow.min.js* +# The src/OctoPrintInfo.html page is not generated, manually edited in +# upstream git repo. +source-is-missing *src/OctoPrintInfo.html*