diff -Nru inkscape-1.1.2/debian/changelog inkscape-1.1.2/debian/changelog --- inkscape-1.1.2/debian/changelog 2022-02-19 14:05:05.000000000 +0000 +++ inkscape-1.1.2/debian/changelog 2022-03-10 17:25:18.000000000 +0000 @@ -1,4 +1,4 @@ -inkscape (1.1.2-1ubuntu1) jammy; urgency=medium +inkscape (1.1.2-3ubuntu1) jammy; urgency=medium * Merge from Debian. Remaining changes: + Restrict ragel and lib2geom build-deps on [!i386], since @@ -6,7 +6,21 @@ + Drop explicit dependency on libpoppler-glib8 that was added a workaround for a Debian upgrade bug. - -- Mattia Rizzolo Sat, 19 Feb 2022 15:05:05 +0100 + -- Erich Eickmeyer Thu, 10 Mar 2022 09:25:18 -0800 + +inkscape (1.1.2-3) unstable; urgency=medium + + * Add patch from upstream to fix crash when copying a 3d box without a + prospective. Closes: #1001937 + + -- Mattia Rizzolo Tue, 01 Mar 2022 17:51:02 +0100 + +inkscape (1.1.2-2) experimental; urgency=medium + + * Make tests fatal on all architectures again, as they seem to + be passing now. + + -- Mattia Rizzolo Sat, 19 Feb 2022 18:18:46 +0100 inkscape (1.1.2-1) unstable; urgency=medium diff -Nru inkscape-1.1.2/debian/control inkscape-1.1.2/debian/control --- inkscape-1.1.2/debian/control 2022-02-19 14:05:05.000000000 +0000 +++ inkscape-1.1.2/debian/control 2022-03-10 17:25:18.000000000 +0000 @@ -1,7 +1,8 @@ Source: inkscape Section: graphics Priority: optional -Maintainer: Debian Multimedia Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Multimedia Maintainers Uploaders: Mattia Rizzolo , Build-Depends: diff -Nru inkscape-1.1.2/debian/patches/fix-crash-when-3d-has-no-prospective.patch inkscape-1.1.2/debian/patches/fix-crash-when-3d-has-no-prospective.patch --- inkscape-1.1.2/debian/patches/fix-crash-when-3d-has-no-prospective.patch 1970-01-01 00:00:00.000000000 +0000 +++ inkscape-1.1.2/debian/patches/fix-crash-when-3d-has-no-prospective.patch 2022-03-10 17:14:16.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Fix a segfault when a 3D box has no perspective +Origin: upstream, https://gitlab.com/inkscape/inkscape/-/commit/49454d0ee7280fd13458c23db97ea25465a9c16b +Bug: https://gitlab.com/inkscape/inkscape/-/issues/3022 +Bug-Debian: https://bugs.debian.org/1001937 + + +--- a/src/ui/clipboard.cpp ++++ b/src/ui/clipboard.cpp +@@ -1022,10 +1022,9 @@ + } + + // For 3D boxes, copy perspectives +- { +- SPBox3D *box = dynamic_cast(item); +- if (box) { +- _copyNode(box->get_perspective()->getRepr(), _doc, _defs); ++ if (SPBox3D *box = dynamic_cast(item)) { ++ if (auto perspective = box->get_perspective()) { ++ _copyNode(perspective->getRepr(), _doc, _defs); + } + } + diff -Nru inkscape-1.1.2/debian/patches/fix-crash-without-gui.patch inkscape-1.1.2/debian/patches/fix-crash-without-gui.patch --- inkscape-1.1.2/debian/patches/fix-crash-without-gui.patch 2022-02-19 12:39:24.000000000 +0000 +++ inkscape-1.1.2/debian/patches/fix-crash-without-gui.patch 2022-03-10 17:14:16.000000000 +0000 @@ -9,11 +9,9 @@ src/inkscape-application.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/src/inkscape-application.cpp b/src/inkscape-application.cpp -index 0e7ac48b19..41a2e61abc 100644 --- a/src/inkscape-application.cpp +++ b/src/inkscape-application.cpp -@@ -1378,7 +1378,9 @@ InkscapeApplication::on_handle_local_options(const Glib::RefPtrcontains("with-gui") || options->contains("batch-process") ) { @@ -24,6 +22,3 @@ } if (options->contains("batch-process")) _batch_process = true; --- -GitLab - diff -Nru inkscape-1.1.2/debian/patches/series inkscape-1.1.2/debian/patches/series --- inkscape-1.1.2/debian/patches/series 2022-02-19 13:42:19.000000000 +0000 +++ inkscape-1.1.2/debian/patches/series 2022-03-10 17:14:16.000000000 +0000 @@ -2,3 +2,4 @@ python3_tests.patch refactor-pixbuf_to_png.patch fix-crash-without-gui.patch +fix-crash-when-3d-has-no-prospective.patch