[patch] Patch for wesnoth-1.6.1

wesnoth-1.6.1-fix-desktop-entries.patch (text/plain), 3.44 KB, created by Ulrich Müller on 2009-04-13 23:40:24 UTC

--- wesnoth-1.6.1-orig/CMakeLists.txt
+++ wesnoth-1.6.1/CMakeLists.txt
@@ -259,25 +259,11 @@
 # Install desktop file so wesnoth appears in the application start menu with an icon
 #
 if(ENABLE_DESKTOP_ENTRY AND ENABLE_GAME)
-  # do some crude string replacing to have the real binary name in the .desktop file (read in original .desktop file, replace the Exec= line with the correct value and output the generated file)
-  file(READ icons/wesnoth.desktop wesnoth-desktop-orig)
-  #string(REGEX REPLACE "(\nName.*=.*)\n" "\\1 (${BINARY_SUFFIX})\n" wesnoth-desktop-modified ${wesnoth-desktop-orig} )
-  string(REPLACE "Exec=wesnoth" "Exec=${BINARY_PREFIX}wesnoth${BINARY_SUFFIX}" wesnoth-desktop-modified ${wesnoth-desktop-orig} )
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth${BINARY_SUFFIX}.desktop ${wesnoth-desktop-modified} )
-  
-  #execute_process(COMMAND sed "-i" "'s/^\(Name.*=.*\)$/\1TEST/g'" ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth${BINARY_SUFFIX}.desktop )
-  #exec_program(sed ARGS "-i" "'s/^\(Name.*=.*\)$/\1TEST/g'" ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth${BINARY_SUFFIX}.desktop )
-  # install the generated .desktop file
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth${BINARY_SUFFIX}.desktop DESTINATION ${DESKTOPDIR} )
+  install(FILES icons/wesnoth.desktop DESTINATION ${DESKTOPDIR} )
   install(FILES icons/wesnoth-icon.png DESTINATION ${ICONDIR} )
   
   if(ENABLE_EDITOR)
-    # do some crude string replacing to have the real binary name in the .desktop file (read in original .desktop file, replace the Exec= line with the correct value and output the generated file)
-    file(READ icons/wesnoth_editor.desktop wesnoth-editor-desktop-orig)
-    string(REPLACE "Exec=wesnoth -e" "Exec=${BINARY_PREFIX}wesnoth${BINARY_SUFFIX} -e" wesnoth-editor-desktop-modified ${wesnoth-editor-desktop-orig} )
-    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth_editor${BINARY_SUFFIX}.desktop ${wesnoth-editor-desktop-modified} )
-    # install the generated .desktop file
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth_editor${BINARY_SUFFIX}.desktop DESTINATION ${DESKTOPDIR} )
+    install(FILES icons/wesnoth_editor.desktop DESTINATION ${DESKTOPDIR} )
     install(FILES icons/wesnoth_editor-icon.png DESTINATION ${ICONDIR} )
   endif(ENABLE_EDITOR)
 endif(ENABLE_DESKTOP_ENTRY AND ENABLE_GAME)
--- wesnoth-1.6.1-orig/icons/wesnoth.desktop
+++ wesnoth-1.6.1/icons/wesnoth.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.6
+Version=1.0
 Type=Application
 Name=Battle for Wesnoth
 Name[af]=Die Stryd vir Wesnoth
@@ -52,7 +52,6 @@
 Comment[sr]=Фантазијска стратешка игра на потезе
 Comment[sr@latin]=Fantazijska strateška igra na poteze
 Comment[tr]=Fantastik, sırayla oynanan bir strateji oyunu
-Icon=wesnoth-icon.png
+Icon=wesnoth-icon
 Exec=wesnoth
 Categories=Game;StrategyGame;
-
--- wesnoth-1.6.1-orig/icons/wesnoth_editor.desktop
+++ wesnoth-1.6.1/icons/wesnoth_editor.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.6
+Version=1.0
 Type=Application
 Name=Battle for Wesnoth Map Editor
 Name[cs]=Editor map Bitvy o Wesnoth
@@ -31,7 +31,6 @@
 Comment[sr]=Уређивач за мапе намењене Боју за Веснот
 Comment[sr@latin]=Uređivač za mape namenjene Boju za Vesnot
 Comment[tr]=Wesnoth savaşı haritaları için harita düzenleyici
-Icon=wesnoth_editor-icon.png
+Icon=wesnoth_editor-icon
 Exec=wesnoth -e
 Categories=Game;StrategyGame;
-