diff --git a/inkscape-0.92.3-1575842.patch b/inkscape-0.92.3-1575842.patch deleted file mode 100644 index 6dd3b58..0000000 --- a/inkscape-0.92.3-1575842.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libnrtype/Layout-TNG-OutIter.cpp~ 2018-03-11 16:38:09.000000000 -0400 -+++ src/libnrtype/Layout-TNG-OutIter.cpp 2018-06-16 13:17:03.129605681 -0400 -@@ -182,6 +182,8 @@ - if (_input_stream[source_index]->Type() != TEXT_SOURCE) - return iterator(this, char_index); - -+ if (char_index >= _characters.size()) -+ return end(); - return iterator(this, char_index); - /* This code was never used, the text_iterator argument was "NULL" in all calling code - InputStreamTextSource const *text_source = static_cast(_input_stream[source_index]); diff --git a/inkscape-0.92.3-endofline.patch b/inkscape-0.92.3-endofline.patch deleted file mode 100644 index ef4712f..0000000 --- a/inkscape-0.92.3-endofline.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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-0.92.3-oob.patch b/inkscape-0.92.3-oob.patch deleted file mode 100644 index bf5a7f5..0000000 --- a/inkscape-0.92.3-oob.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/libnrtype/Layout-TNG-OutIter.cpp.orig 2019-01-11 19:56:12.701209914 +0100 -+++ src/libnrtype/Layout-TNG-OutIter.cpp 2019-01-11 19:58:19.624114664 +0100 -@@ -46,7 +46,8 @@ - best_x_difference = this_x_difference; - } - } -- if (best_char_index == -1) return iterator(this, char_index); -+ if (best_char_index == -1) best_char_index = char_index; -+ if (best_char_index == _characters.size()) return end(); - return iterator(this, best_char_index); - } - diff --git a/inkscape-python2.patch b/inkscape-python2.patch deleted file mode 100644 index 43e158c..0000000 --- a/inkscape-python2.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- inkscape-0.92.3/share/filters/CMakeLists.txt -+++ inkscape-0.92.3/share/filters/CMakeLists.txt -@@ -1,6 +1,6 @@ - add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h -- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h -+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h - MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py - ) ---- inkscape-0.92.3/share/palettes/CMakeLists.txt -+++ inkscape-0.92.3/share/palettes/CMakeLists.txt -@@ -2,7 +2,7 @@ set(I18N_FILES "inkscape.gpl" "svg.gpl" - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h -- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h -+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} - ) ---- inkscape-0.92.3/share/patterns/CMakeLists.txt -+++ inkscape-0.92.3/share/patterns/CMakeLists.txt -@@ -1,6 +1,6 @@ - add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h -- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h -+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h - MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py - ) ---- inkscape-0.92.3/share/symbols/CMakeLists.txt -+++ inkscape-0.92.3/share/symbols/CMakeLists.txt -@@ -2,7 +2,7 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURREN - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h -- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h -+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} - ) ---- inkscape-0.92.3/share/templates/CMakeLists.txt -+++ inkscape-0.92.3/share/templates/CMakeLists.txt -@@ -2,7 +2,7 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURREN - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/templates.h -- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h -+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} - )