From 57a40e8dda313d30302f9436fb83e02f0f4bf7c7 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 15 Jan 2019 09:16:58 -0600 Subject: [PATCH] End of line patch. --- inkscape-0.92.3-endofline.patch | 14 ++++++++++++++ inkscape.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 inkscape-0.92.3-endofline.patch diff --git a/inkscape-0.92.3-endofline.patch b/inkscape-0.92.3-endofline.patch new file mode 100644 index 0000000..ef4712f --- /dev/null +++ b/inkscape-0.92.3-endofline.patch @@ -0,0 +1,14 @@ +--- src/libnrtype/Layout-TNG-OutIter.cpp.orig 2019-01-15 13:18:22.783789165 +0100 ++++ src/libnrtype/Layout-TNG-OutIter.cpp 2019-01-15 13:23:02.208986679 +0100 +@@ -783,7 +783,10 @@ + - _parent_layout->_chunks[_parent_layout->_spans[_parent_layout->_lineToSpan(line_index)].in_chunk].left_x; + } + _char_index = _parent_layout->_cursorXOnLineToIterator(line_index + n, _x_coordinate)._char_index; +- _glyph_index = _parent_layout->_characters[_char_index].in_glyph; ++ if (_char_index == _parent_layout->_characters.size()) ++ _glyph_index = _parent_layout->_glyphs.size(); ++ else ++ _glyph_index = _parent_layout->_characters[_char_index].in_glyph; + return true; + } + diff --git a/inkscape.spec b/inkscape.spec index a0f36fa..04a0448 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,6 +1,6 @@ Name: inkscape Version: 0.92.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Vector-based drawing program using SVG # Inkscape tags their releases with underscores and in ALLCAPS @@ -22,6 +22,7 @@ Patch1: inkscape-python2.patch Patch2: inkscape-0.92.3-poppler-0.64.patch Patch3: inkscape-0.92.3-poppler-0.65.patch Patch4: inkscape-0.92.3-oob.patch +Patch5: inkscape-0.92.3-endofline.patch Provides: bundled(libcroco) Provides: bundled(libgdl) @@ -120,6 +121,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format. %patch2 -p1 %patch3 -p1 %patch4 -p0 +%patch5 -p0 pathfix.py -pni "%{__python2} %{py2_shbang_opts}" . # https://bugs.launchpad.net/inkscape/+bug/314381 @@ -229,6 +231,9 @@ pathfix.py -pni "%{__python2} %{py2_shbang_opts}" $RPM_BUILD_ROOT%{_datadir}/ink %changelog +* Tue Jan 15 2019 Gwyn Ciesla - 0.92.3-11 +- End of line patch. + * Mon Jan 14 2019 Gwyn Ciesla - 0.92.3-10 - Alternate out of bounds patch.