diff -pruN 1.2.2-2/debian/changelog 1.2.2-2ubuntu4/debian/changelog --- 1.2.2-2/debian/changelog 2023-01-10 01:09:18.000000000 +0000 +++ 1.2.2-2ubuntu4/debian/changelog 2023-09-16 06:43:10.000000000 +0000 @@ -1,3 +1,31 @@ +inkscape (1.2.2-2ubuntu4) mantic; urgency=medium + + * use -fexcess-precision=fast to compile 2geom. (LP: #2036181) + Since gcc-13, excess precision support has been implemented for C++. + -fexcess-precision=fast restores previous behavior. + + -- Shengjing Zhu Sat, 16 Sep 2023 14:43:10 +0800 + +inkscape (1.2.2-2ubuntu3) mantic; urgency=medium + + * Add patch to specify Deja Vu Sans font to fix lpetest + * Add fonts-dejavu to Build-Depends + + -- Jeremy Bícha Tue, 05 Sep 2023 16:09:36 -0400 + +inkscape (1.2.2-2ubuntu2) mantic; urgency=medium + + * Rebuild against latest poppler + + -- Jeremy Bícha Thu, 17 Aug 2023 05:19:05 -0400 + +inkscape (1.2.2-2ubuntu1) lunar; urgency=medium + + * Restrict ragel and lib2geom build-deps on [!i386], + since they are not available there. + + -- Mattia Rizzolo Tue, 10 Jan 2023 17:38:44 +0100 + inkscape (1.2.2-2) unstable; urgency=medium * Add several patches skipping several tests that fail across varying diff -pruN 1.2.2-2/debian/control 1.2.2-2ubuntu4/debian/control --- 1.2.2-2/debian/control 2023-01-10 01:08:51.000000000 +0000 +++ 1.2.2-2ubuntu4/debian/control 2023-09-16 06:43:10.000000000 +0000 @@ -1,19 +1,21 @@ Source: inkscape Section: graphics Priority: optional -Maintainer: Debian Multimedia Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Multimedia Maintainers Uploaders: Mattia Rizzolo , Build-Depends: cmake, debhelper-compat (= 13), + fonts-dejavu, dh-python, dh-sequence-python3, ninja-build, python3, Build-Depends-Arch: imagemagick (>= 0) , - lib2geom-dev (>= 1.2.2-2), + lib2geom-dev (>= 1.2.2-2) [!i386], libaspell-dev, libboost-dev, libboost-filesystem-dev, @@ -51,7 +53,7 @@ Build-Depends-Arch: libxslt1-dev, pkg-config, python3-lxml , - ragel, + ragel [!i386], zlib1g-dev, Standards-Version: 4.6.2 Rules-Requires-Root: no diff -pruN 1.2.2-2/debian/patches/Fix-LPE-test-sensitivity-to-system-fonts-list.patch 1.2.2-2ubuntu4/debian/patches/Fix-LPE-test-sensitivity-to-system-fonts-list.patch --- 1.2.2-2/debian/patches/Fix-LPE-test-sensitivity-to-system-fonts-list.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.2-2ubuntu4/debian/patches/Fix-LPE-test-sensitivity-to-system-fonts-list.patch 2023-09-16 06:43:10.000000000 +0000 @@ -0,0 +1,354 @@ +From: PBS +Date: Wed, 18 Jan 2023 16:22:22 +0900 +Subject: Fix LPE test sensitivity to system fonts list + +The Measure LPE tests only pass if the text labels have exactly the +right size, which in particular only happens if the system decides to +resolve "Sans" to "DejaVu Sans". This can fail if the system has other +sans fonts installed such as Noto Sans. Therefore, we modify the files +in the LPE test suite to explicitly request that the labels are set in +DejaVu Sans. This makes the LPE test suite more robust against system +differences, and resolves certain test failures that only happen outside +of CI. + +Related: https://gitlab.com/inkscape/inkscape/-/issues/3554 + +This is similar to commit 170b95f9c8e2b49b3524e5ba6814993eb5845ccf +included in Inkscape 1.3 +--- + .../lpe_tests/MeasureSegments_multi_mm_1_0_2.svg | 36 +++++++++++----------- + .../lpe_tests/MeasureSegments_multi_px_1_0_2.svg | 36 +++++++++++----------- + 2 files changed, 36 insertions(+), 36 deletions(-) + +diff --git a/testfiles/lpe_tests/MeasureSegments_multi_mm_1_0_2.svg b/testfiles/lpe_tests/MeasureSegments_multi_mm_1_0_2.svg +index 6fedb6e..4362493 100644 +--- a/testfiles/lpe_tests/MeasureSegments_multi_mm_1_0_2.svg ++++ b/testfiles/lpe_tests/MeasureSegments_multi_mm_1_0_2.svg +@@ -37,7 +37,7 @@ + unit="mm" + orientation="parallel" + coloropacity="#000000ff" +- fontbutton="Sans 10" ++ fontbutton="DejaVu Sans 10" + precision="2" + fix_overlaps="0" + position="5" +@@ -89,7 +89,7 @@ Options for color, precision, label formatting and display + unit="mm" + orientation="parallel" + coloropacity="#000000ff" +- fontbutton="Sans 10" ++ fontbutton="DejaVu Sans 10" + precision="2" + fix_overlaps="0" + position="20" +@@ -141,7 +141,7 @@ Options for color, precision, label formatting and display + unit="mm" + orientation="parallel" + coloropacity="#0000c9ff" +- fontbutton="Sans 10" ++ fontbutton="DejaVu Sans 10" + precision="3" + fix_overlaps="0" + position="20" +@@ -316,7 +316,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="74.623274" + y="69.615438" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#0000c9;fill-opacity:1;font-size:3.52778px">353.990mm + 251.999mm +@@ -379,7 +379,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="74.623274" + y="113.6152" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#0000c9;fill-opacity:1;font-size:3.52778px">353.990mm + 251.999mm +@@ -442,7 +442,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="83.78686" + y="177.58552" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" + transform="rotate(-18.192992,96.153038,177.58552)">[0] 111.21mm +@@ -474,7 +474,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="178.53942" + y="180.15132" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" + transform="rotate(35.710028,189.78335,180.15132)">[1] 59.49mm +@@ -506,7 +506,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="238.65171" + y="235.3869" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" + transform="rotate(46.870329,249.89565,235.3869)">[2] 97.26mm +@@ -538,7 +538,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="236.91629" + y="323.4699" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" + transform="rotate(-33.542753,248.16023,323.4699)">[3] 79.77mm +@@ -570,7 +570,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="113.74196" + y="349.07529" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px">[4] 153.95mm + [5] 115.06mm +@@ -633,7 +633,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="-108.25485" + y="-5.807268" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" + transform="rotate(68.773104,-98.925524,-5.807268)">223.08mm +@@ -665,7 +665,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="33.866681" + y="18.883627" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" + transform="rotate(-37.310109,43.196006,18.883627)">270.70mm +@@ -697,7 +697,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="56.56926" + y="-75.345639" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" + transform="rotate(12.943535,65.833989,-75.345639)">174.20mm +@@ -729,7 +729,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="-23.799987" + y="-48.931375" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" + transform="rotate(-83.545649,-14.535258,-48.931375)">106.61mm +@@ -761,7 +761,7 @@ Options for color, precision, label formatting and display + sodipodi:insensitive="true" + x="13.483035" + y="-26.881641" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:3.52778px" + transform="rotate(-29.443674,22.747764,-26.881641)">108.82mm +diff --git a/testfiles/lpe_tests/MeasureSegments_multi_px_1_0_2.svg b/testfiles/lpe_tests/MeasureSegments_multi_px_1_0_2.svg +index bc9b4bb..62b2dd3 100644 +--- a/testfiles/lpe_tests/MeasureSegments_multi_px_1_0_2.svg ++++ b/testfiles/lpe_tests/MeasureSegments_multi_px_1_0_2.svg +@@ -37,7 +37,7 @@ + unit="mm" + orientation="parallel" + coloropacity="#000000ff" +- fontbutton="Sans 10" ++ fontbutton="DejaVu Sans 10" + precision="2" + fix_overlaps="0" + position="5" +@@ -76,7 +76,7 @@ + unit="mm" + orientation="parallel" + coloropacity="#000000ff" +- fontbutton="Sans 10" ++ fontbutton="DejaVu Sans 10" + precision="2" + fix_overlaps="0" + position="20" +@@ -115,7 +115,7 @@ + unit="mm" + orientation="parallel" + coloropacity="#0000c9ff" +- fontbutton="Sans 10" ++ fontbutton="DejaVu Sans 10" + precision="3" + fix_overlaps="0" + position="20" +@@ -282,7 +282,7 @@ + sodipodi:insensitive="true" + x="336.57003" + y="278.3921" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#0000c9;fill-opacity:1;font-size:13.3333px">200.935mm + 177.511mm +@@ -345,7 +345,7 @@ + sodipodi:insensitive="true" + x="336.57003" + y="462.02757" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#0000c9;fill-opacity:1;font-size:13.3333px">200.935mm + 177.511mm +@@ -408,7 +408,7 @@ + sodipodi:insensitive="true" + x="363.67937" + y="583.87522" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" + transform="rotate(-13.155907,406.176,583.87522)">[0] 60.82mm +@@ -440,7 +440,7 @@ + sodipodi:insensitive="true" + x="530.81449" + y="585.51701" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" + transform="rotate(30.479073,573.31112,585.51701)">[1] 27.29mm +@@ -472,7 +472,7 @@ + sodipodi:insensitive="true" + x="646.38934" + y="691.89504" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" + transform="rotate(48.835806,688.88598,691.89504)">[2] 54.29mm +@@ -504,7 +504,7 @@ + sodipodi:insensitive="true" + x="650.01793" + y="847.4009" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" + transform="rotate(-35.385894,692.51457,847.4009)">[3] 43.83mm +@@ -536,7 +536,7 @@ + sodipodi:insensitive="true" + x="411.46227" + y="900.04531" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px">[4] 82.74mm + [5] 66.25mm +@@ -599,7 +599,7 @@ + sodipodi:insensitive="true" + x="-93.489244" + y="197.34875" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" + transform="rotate(66.358638,-58.473056,197.34875)">100.72mm +@@ -631,7 +631,7 @@ + sodipodi:insensitive="true" + x="197.0472" + y="199.09298" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" + transform="rotate(-39.615226,232.06339,199.09298)">146.14mm +@@ -663,7 +663,7 @@ + sodipodi:insensitive="true" + x="264.75454" + y="-41.97728" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" + transform="rotate(27.009194,295.8417,-41.97728)">85.44mm +@@ -695,7 +695,7 @@ + sodipodi:insensitive="true" + x="100.96782" + y="21.518703" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" + transform="rotate(-76.167319,132.02243,21.518703)">79.10mm +@@ -727,7 +727,7 @@ + sodipodi:insensitive="true" + x="147.70297" + y="125.43862" +- style="font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" ++ style="font-family:DejaVu Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#000000;fill-opacity:1;font-size:13.3333px" + transform="rotate(-23.805346,178.69573,125.43862)">50.97mm diff -pruN 1.2.2-2/debian/patches/series 1.2.2-2ubuntu4/debian/patches/series --- 1.2.2-2/debian/patches/series 2023-01-10 01:08:16.000000000 +0000 +++ 1.2.2-2ubuntu4/debian/patches/series 2023-09-16 06:43:10.000000000 +0000 @@ -8,3 +8,5 @@ timeout-test-lpe.patch skip-test-librevenge.patch skip-test-glyph-big-endian.patch skip-test-use.patch +Fix-LPE-test-sensitivity-to-system-fonts-list.patch +use-fexcess-precision-fast-to-compile-2geom.patch diff -pruN 1.2.2-2/debian/patches/use-fexcess-precision-fast-to-compile-2geom.patch 1.2.2-2ubuntu4/debian/patches/use-fexcess-precision-fast-to-compile-2geom.patch --- 1.2.2-2/debian/patches/use-fexcess-precision-fast-to-compile-2geom.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.2-2ubuntu4/debian/patches/use-fexcess-precision-fast-to-compile-2geom.patch 2023-09-16 06:43:10.000000000 +0000 @@ -0,0 +1,27 @@ +From: Shengjing Zhu +Date: Sat, 16 Sep 2023 14:42:22 +0800 +Subject: use -fexcess-precision=fast to compile 2geom + +Since gcc-13, excess precision support has been implemented for C++. +-fexcess-precision=fast restores previous behavior. + +Ubuntu-Bug: https://launchpad.net/bugs/2036181 +--- + src/3rdparty/2geom/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/3rdparty/2geom/CMakeLists.txt b/src/3rdparty/2geom/CMakeLists.txt +index d2b06b9..987e004 100644 +--- a/src/3rdparty/2geom/CMakeLists.txt ++++ b/src/3rdparty/2geom/CMakeLists.txt +@@ -77,6 +77,10 @@ endif() + add_compile_options(-Wall -Wformat-security -Woverloaded-virtual -Wpointer-arith -Werror=return-type) + add_compile_options(-O2) + ++if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13) ++ add_compile_options(-fexcess-precision=fast) ++endif() ++ + # suppress the very annoying "#pragma ms_struct" Clang warning, caused by -mms-bitfield required for GTK + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + if(WIN32)