diff -ur widelands-1.0/cmake/codecheck/CodeCheck.py widelands-1.0_patched/cmake/codecheck/CodeCheck.py --- widelands-1.0/cmake/codecheck/CodeCheck.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/cmake/codecheck/CodeCheck.py 2022-04-20 12:32:09.761189490 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 # -*- coding: utf-8 -*- # diff -ur widelands-1.0/cmake/codecheck/rules/assert0.py widelands-1.0_patched/cmake/codecheck/rules/assert0.py --- widelands-1.0/cmake/codecheck/rules/assert0.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/cmake/codecheck/rules/assert0.py 2022-04-20 12:32:09.761189490 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python -tt +#!/usr/bin/python3 -tt # encoding: utf-8 # diff -ur widelands-1.0/cmake/codecheck/rules/garbage_after_include.py widelands-1.0_patched/cmake/codecheck/rules/garbage_after_include.py --- widelands-1.0/cmake/codecheck/rules/garbage_after_include.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/cmake/codecheck/rules/garbage_after_include.py 2022-04-20 12:32:09.761189490 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python -tt +#!/usr/bin/python3 -tt # encoding: utf-8 # diff -ur widelands-1.0/cmake/codecheck/rules/increment_decrement.py widelands-1.0_patched/cmake/codecheck/rules/increment_decrement.py --- widelands-1.0/cmake/codecheck/rules/increment_decrement.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/cmake/codecheck/rules/increment_decrement.py 2022-04-20 12:32:09.761189490 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python -tt +#!/usr/bin/python3 -tt # encoding: utf-8 # diff -ur widelands-1.0/cmake/codecheck/run_tests.py widelands-1.0_patched/cmake/codecheck/run_tests.py --- widelands-1.0/cmake/codecheck/run_tests.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/cmake/codecheck/run_tests.py 2022-04-20 12:32:09.761189490 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 # diff -ur widelands-1.0/cmake/WlFunctions.cmake widelands-1.0_patched/cmake/WlFunctions.cmake --- widelands-1.0/cmake/WlFunctions.cmake 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/cmake/WlFunctions.cmake 2022-04-20 12:32:09.761189490 +0300 @@ -325,5 +325,5 @@ #Quoting the CMake documentation on DESTINATION: #"If a relative path is given it is interpreted relative to the value of CMAKE_INSTALL_PREFIX" - install(TARGETS ${NAME} DESTINATION "." COMPONENT ExecutableFiles) + install(TARGETS ${NAME} DESTINATION games COMPONENT ExecutableFiles) endfunction() Только в widelands-1.0_patched/cmake: WlFunctions.cmake.orig diff -ur widelands-1.0/CMakeLists.txt widelands-1.0_patched/CMakeLists.txt --- widelands-1.0/CMakeLists.txt 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/CMakeLists.txt 2022-04-20 12:33:08.539767829 +0300 @@ -314,7 +314,6 @@ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type") wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow") - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized") wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11") endif() diff -ur widelands-1.0/doc/sphinx/extract_rst.py widelands-1.0_patched/doc/sphinx/extract_rst.py --- widelands-1.0/doc/sphinx/extract_rst.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/doc/sphinx/extract_rst.py 2022-04-20 12:32:09.761189490 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 from glob import glob diff -ur widelands-1.0/regression_test.py widelands-1.0_patched/regression_test.py --- widelands-1.0/regression_test.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/regression_test.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 from glob import glob diff -ur widelands-1.0/utils/buildcat.py widelands-1.0_patched/utils/buildcat.py --- widelands-1.0/utils/buildcat.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/buildcat.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 ############################################################################## diff -ur widelands-1.0/utils/build_deps.py widelands-1.0_patched/utils/build_deps.py --- widelands-1.0/utils/build_deps.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/build_deps.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 """Simple script to check that the build dependencies in the CMakeLists.txt diff -ur widelands-1.0/utils/detect_revision.py widelands-1.0_patched/utils/detect_revision.py --- widelands-1.0/utils/detect_revision.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/detect_revision.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # Tries to find out the repository revision of the current working directory diff -ur widelands-1.0/utils/file_utils.py widelands-1.0_patched/utils/file_utils.py --- widelands-1.0/utils/file_utils.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/file_utils.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- diff -ur widelands-1.0/utils/find_unused_includes.py widelands-1.0_patched/utils/find_unused_includes.py --- widelands-1.0/utils/find_unused_includes.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/find_unused_includes.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 # encoding: utf-8 """Script to find unused includes. diff -ur widelands-1.0/utils/fix_formatting.py widelands-1.0_patched/utils/fix_formatting.py --- widelands-1.0/utils/fix_formatting.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/fix_formatting.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- diff -ur widelands-1.0/utils/generate_glossary.py widelands-1.0_patched/utils/generate_glossary.py --- widelands-1.0/utils/generate_glossary.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/generate_glossary.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 diff -ur widelands-1.0/utils/glossary_checks.py widelands-1.0_patched/utils/glossary_checks.py --- widelands-1.0/utils/glossary_checks.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/glossary_checks.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 """Runs a glossary check on all po files and writes the check results to diff -ur widelands-1.0/utils/macos/fix_dependencies.py widelands-1.0_patched/utils/macos/fix_dependencies.py --- widelands-1.0/utils/macos/fix_dependencies.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/macos/fix_dependencies.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """This tool was written out of frustration with diff -ur widelands-1.0/utils/make_spritemap.py widelands-1.0_patched/utils/make_spritemap.py --- widelands-1.0/utils/make_spritemap.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/make_spritemap.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 import argparse diff -ur widelands-1.0/utils/optimize_pngs.py widelands-1.0_patched/utils/optimize_pngs.py --- widelands-1.0/utils/optimize_pngs.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/optimize_pngs.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 """Walk a directory and use command line tools to optimize all png files in Только в widelands-1.0_patched/utils: optimize_pngs.py.orig diff -ur widelands-1.0/utils/pywi/tests.py widelands-1.0_patched/utils/pywi/tests.py --- widelands-1.0/utils/pywi/tests.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/pywi/tests.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import config import animation """Tests for various pywi modules.""" diff -ur widelands-1.0/utils/rename_animation.py widelands-1.0_patched/utils/rename_animation.py --- widelands-1.0/utils/rename_animation.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/rename_animation.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 """Tool to rename all files for a widelands animation in bulk.""" diff -ur widelands-1.0/utils/run-clang-tidy.py widelands-1.0_patched/utils/run-clang-tidy.py --- widelands-1.0/utils/run-clang-tidy.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/run-clang-tidy.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # #===- run-clang-tidy.py - Parallel clang-tidy runner ---------*- python -*--===# # diff -ur widelands-1.0/utils/syncstream/syncexcerpt-to-text.py widelands-1.0_patched/utils/syncstream/syncexcerpt-to-text.py --- widelands-1.0/utils/syncstream/syncexcerpt-to-text.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/syncstream/syncexcerpt-to-text.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 import struct import sys diff -ur widelands-1.0/utils/test/test_lua-xgettext.py widelands-1.0_patched/utils/test/test_lua-xgettext.py --- widelands-1.0/utils/test/test_lua-xgettext.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/test/test_lua-xgettext.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 from lua_xgettext import gettext, Lua_GetText, head diff -ur widelands-1.0/utils/test/test_make_spritemap.py widelands-1.0_patched/utils/test/test_make_spritemap.py --- widelands-1.0/utils/test/test_make_spritemap.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/test/test_make_spritemap.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import make_spritemap import numpy as np diff -ur widelands-1.0/utils/update_appdata.py widelands-1.0_patched/utils/update_appdata.py --- widelands-1.0/utils/update_appdata.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/update_appdata.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 import subprocess Только в widelands-1.0_patched/utils: update_appdata.py.orig diff -ur widelands-1.0/utils/update_authors.py widelands-1.0_patched/utils/update_authors.py --- widelands-1.0/utils/update_authors.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/update_authors.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 import codecs diff -ur widelands-1.0/utils/update_copyright.py widelands-1.0_patched/utils/update_copyright.py --- widelands-1.0/utils/update_copyright.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/update_copyright.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 import os.path diff -ur widelands-1.0/utils/validate_json.py widelands-1.0_patched/utils/validate_json.py --- widelands-1.0/utils/validate_json.py 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/utils/validate_json.py 2022-04-20 12:32:09.764522742 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # encoding: utf-8 import codecs diff -ur widelands-1.0/xdg/CMakeLists.txt widelands-1.0_patched/xdg/CMakeLists.txt --- widelands-1.0/xdg/CMakeLists.txt 2021-06-14 12:22:20.000000000 +0300 +++ widelands-1.0_patched/xdg/CMakeLists.txt 2022-04-20 12:32:09.764522742 +0300 @@ -6,19 +6,19 @@ list(APPEND icon_sizes "16" "32" "48" "64" "128") foreach (icon_size ${icon_sizes}) #install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png) - install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ../share/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png) + install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION share/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png) endforeach (icon_size ${icon_sizes}) #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ../share/man/man6) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION share/man/man6) #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION ../share/applications) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION share/applications) #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ../share/metainfo) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION share/metainfo) find_program(GTK_UPDATE_ICON_CACHE NAMES gtk-update-icon-cache) if (GTK_UPDATE_ICON_CACHE) #install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor ||: )") - install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/../share/icons/hicolor ||: )") + install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor ||: )") else (GTK_UPDATE_ICON_CACHE) message(WARNING "gtk-update-icon-cache not found!") endif (GTK_UPDATE_ICON_CACHE)