584358bf10
Replace references to /usr/bin/python with /usr/bin/python2.
inkscape-0.92.3 uses GTK3 only if the WITH_GTK3_EXPERIMENTAL flag is
enabled during the build. Otherwise it uses GTK2. The Fedora package
currently doesn't use the GTK3 build, but the GTK2 build. Since it's
not possible to mix GTK2 and GTK3 in the same process, none of the
GTK3-based BuildRequires are necessary.
This reverts commit 9883cce400 and brings back the gtkspell
requirement. gtkspell3 is a GTK3 library that's not used in the GTK2
build, anyway, and it was only working so far because the gtkspell
requirement is optional in the GTK2 build. Since gtkspell is no longer
orphaned there's no problem in bringing it back.
https://bugzilla.redhat.com/show_bug.cgi?id=1464487
https://bugzilla.redhat.com/show_bug.cgi?id=1604371
54 lines
2.7 KiB
Diff
54 lines
2.7 KiB
Diff
--- 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}
|
|
)
|