|
 |
94f3f9 |
diff -up inkscape-0.92.3/share/filters/CMakeLists.txt.python2 inkscape-0.92.3/share/filters/CMakeLists.txt
|
|
|
94f3f9 |
--- inkscape-0.92.3/share/filters/CMakeLists.txt.python2 2018-07-13 09:49:16.745284660 +0200
|
|
|
94f3f9 |
+++ inkscape-0.92.3/share/filters/CMakeLists.txt 2018-07-13 09:49:19.718289481 +0200
|
|
|
94f3f9 |
@@ -1,6 +1,6 @@
|
|
|
94f3f9 |
add_custom_command(
|
|
|
94f3f9 |
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h
|
|
|
94f3f9 |
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h
|
|
|
94f3f9 |
+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h
|
|
|
94f3f9 |
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg
|
|
|
94f3f9 |
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py
|
|
|
94f3f9 |
)
|
|
|
94f3f9 |
diff -up inkscape-0.92.3/share/palettes/CMakeLists.txt.python2 inkscape-0.92.3/share/palettes/CMakeLists.txt
|
|
|
94f3f9 |
--- inkscape-0.92.3/share/palettes/CMakeLists.txt.python2 2018-07-13 09:48:29.279207685 +0200
|
|
|
94f3f9 |
+++ inkscape-0.92.3/share/palettes/CMakeLists.txt 2018-07-13 09:48:32.351212667 +0200
|
|
|
94f3f9 |
@@ -2,7 +2,7 @@ set(I18N_FILES "inkscape.gpl" "svg.gpl"
|
|
|
94f3f9 |
|
|
|
94f3f9 |
add_custom_command(
|
|
|
94f3f9 |
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h
|
|
|
94f3f9 |
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h
|
|
|
94f3f9 |
+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h
|
|
|
94f3f9 |
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
|
94f3f9 |
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES}
|
|
|
94f3f9 |
)
|
|
|
94f3f9 |
diff -up inkscape-0.92.3/share/patterns/CMakeLists.txt.python2 inkscape-0.92.3/share/patterns/CMakeLists.txt
|
|
|
94f3f9 |
--- inkscape-0.92.3/share/patterns/CMakeLists.txt.python2 2018-07-13 09:48:48.886239480 +0200
|
|
|
94f3f9 |
+++ inkscape-0.92.3/share/patterns/CMakeLists.txt 2018-07-13 09:48:51.762244143 +0200
|
|
|
94f3f9 |
@@ -1,6 +1,6 @@
|
|
|
94f3f9 |
add_custom_command(
|
|
|
94f3f9 |
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h
|
|
|
94f3f9 |
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h
|
|
|
94f3f9 |
+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h
|
|
|
94f3f9 |
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg
|
|
|
94f3f9 |
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py
|
|
|
94f3f9 |
)
|
|
|
94f3f9 |
diff -up inkscape-0.92.3/share/symbols/CMakeLists.txt.python2 inkscape-0.92.3/share/symbols/CMakeLists.txt
|
|
|
94f3f9 |
--- inkscape-0.92.3/share/symbols/CMakeLists.txt.python2 2018-07-13 09:49:03.745263577 +0200
|
|
|
94f3f9 |
+++ inkscape-0.92.3/share/symbols/CMakeLists.txt 2018-07-13 09:49:05.959267167 +0200
|
|
|
94f3f9 |
@@ -2,7 +2,7 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURREN
|
|
|
94f3f9 |
|
|
|
94f3f9 |
add_custom_command(
|
|
|
94f3f9 |
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h
|
|
|
94f3f9 |
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h
|
|
|
94f3f9 |
+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h
|
|
|
94f3f9 |
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
|
94f3f9 |
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES}
|
|
|
94f3f9 |
)
|
|
|
94f3f9 |
diff -up inkscape-0.92.3/share/templates/CMakeLists.txt.python2 inkscape-0.92.3/share/templates/CMakeLists.txt
|
|
|
94f3f9 |
--- inkscape-0.92.3/share/templates/CMakeLists.txt.python2 2018-07-12 14:53:11.195317573 +0200
|
|
|
94f3f9 |
+++ inkscape-0.92.3/share/templates/CMakeLists.txt 2018-07-12 14:53:13.824322527 +0200
|
|
|
94f3f9 |
@@ -2,7 +2,7 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURREN
|
|
|
94f3f9 |
|
|
|
94f3f9 |
add_custom_command(
|
|
|
94f3f9 |
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/templates.h
|
|
|
94f3f9 |
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h
|
|
|
94f3f9 |
+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h
|
|
|
94f3f9 |
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
|
94f3f9 |
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES}
|
|
|
94f3f9 |
)
|
|
|
94f3f9 |
diff -up inkscape-0.92.3/src/extension/implementation/implementation.cpp.python2 inkscape-0.92.3/src/extension/implementation/implementation.cpp
|
|
|
94f3f9 |
diff -up inkscape-0.92.3/src/extension/implementation/script.cpp.python2 inkscape-0.92.3/src/extension/implementation/script.cpp
|
|
|
94f3f9 |
--- inkscape-0.92.3/src/extension/implementation/script.cpp.python2 2018-07-12 14:54:09.974428340 +0200
|
|
|
94f3f9 |
+++ inkscape-0.92.3/src/extension/implementation/script.cpp 2018-07-12 14:54:19.590446461 +0200
|
|
|
94f3f9 |
@@ -87,7 +87,7 @@ Script::interpreter_t const Script::inte
|
|
|
94f3f9 |
#ifdef WIN32
|
|
|
94f3f9 |
{"python", "python-interpreter", "pythonw" },
|
|
|
94f3f9 |
#else
|
|
|
94f3f9 |
- {"python", "python-interpreter", "python" },
|
|
|
94f3f9 |
+ {"python", "python-interpreter", "python2" },
|
|
|
94f3f9 |
#endif
|
|
|
94f3f9 |
{"ruby", "ruby-interpreter", "ruby" },
|
|
|
94f3f9 |
{"shell", "shell-interpreter", "sh" },
|