From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5A636138247 for ; Thu, 26 Dec 2013 13:53:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C55DE094F; Thu, 26 Dec 2013 13:53:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D1A9E094F for ; Thu, 26 Dec 2013 13:53:54 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7130A33F23A for ; Thu, 26 Dec 2013 13:53:53 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2322) id 189B32004C; Thu, 26 Dec 2013 13:53:52 +0000 (UTC) From: "Julian Ospald (hasufell)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, hasufell@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in games-sports/dustrac/files: dustrac-1.6.2-cmake.patch dustrac-1.6.2-desktopfile.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: dustrac-1.6.2-cmake.patch dustrac-1.6.2-desktopfile.patch X-VCS-Directories: games-sports/dustrac/files X-VCS-Committer: hasufell X-VCS-Committer-Name: Julian Ospald Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20131226135352.189B32004C@flycatcher.gentoo.org> Date: Thu, 26 Dec 2013 13:53:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fe7de919-1829-497d-9e21-cb589c445254 X-Archives-Hash: 97de6e5abb6668fe444be782b2a2eb6b hasufell 13/12/26 13:53:52 Added: dustrac-1.6.2-cmake.patch dustrac-1.6.2-desktopfile.patch Log: initial import (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) Revision Changes Path 1.1 games-sports/dustrac/files/dustrac-1.6.2-cmake.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/dustrac/files/dustrac-1.6.2-cmake.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/dustrac/files/dustrac-1.6.2-cmake.patch?rev=1.1&content-type=text/plain Index: dustrac-1.6.2-cmake.patch =================================================================== From: Julian Ospald Date: Wed Dec 25 22:55:09 UTC 2013 Subject: respect flags, fix installation --- dustrac-1.6.2/CMakeLists.txt +++ dustrac-1.6.2/CMakeLists.txt @@ -43,7 +43,7 @@ endif() set(CMAKE_VERBOSE_MAKEFILE OFF) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall -O3 -pedantic") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fomit-frame-pointer -finline-functions -ffast-math") set(GAME_BINARY_NAME "dustrac-game") --- dustrac-1.6.2/src/game/CMakeLists.txt +++ dustrac-1.6.2/src/game/CMakeLists.txt @@ -128,16 +128,11 @@ # Copy desktop file if(ReleaseBuild AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(DesktopFileSourcePath) if(USC) - set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.opt.in) + configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.opt.in ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop) else() - set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.in) + configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.in ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop) endif() - add_custom_target(desktop-file-game ALL - COMMAND cmake -E copy ${DesktopFileSourcePath} - ${CMAKE_BINARY_DIR}/dustrac-game.desktop - DEPENDS ${GAME_BINARY_NAME}) endif() # Resource compilation for MinGW --- dustrac-1.6.2/src/editor/CMakeLists.txt +++ dustrac-1.6.2/src/editor/CMakeLists.txt @@ -76,16 +76,11 @@ # Copy desktop file if(ReleaseBuild AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(DesktopFileSourcePath) if(USC) - set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.opt.in) + configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.opt.in ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop) else() - set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.in) + configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.in ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop) endif() - add_custom_target(desktop-file-editor ALL - COMMAND cmake -E copy ${DesktopFileSourcePath} - ${CMAKE_BINARY_DIR}/dustrac-editor.desktop - DEPENDS ${EDITOR_BINARY_NAME}) endif() # Add the executable --- dustrac-1.6.2/InstallLinux.cmake +++ dustrac-1.6.2/InstallLinux.cmake @@ -58,7 +58,7 @@ install(FILES data/fonts.conf DESTINATION ${DATA_PATH}) install(FILES data/meshes.conf DESTINATION ${DATA_PATH}) install(FILES data/textures.conf DESTINATION ${DATA_PATH}) - install(FILES AUTHORS CHANGELOG COPYING README DESTINATION ${DOC_PATH}) + install(FILES AUTHORS CHANGELOG README DESTINATION ${DOC_PATH}) install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.jpg") install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.png") install(DIRECTORY data/levels DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.trk") @@ -69,8 +69,8 @@ if(ReleaseBuild) # Install .desktop files - install(FILES dustrac-game.desktop DESTINATION share/applications) - install(FILES dustrac-editor.desktop DESTINATION share/applications) + install(FILES ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop DESTINATION share/applications) + install(FILES ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop DESTINATION share/applications) # Install icons install(FILES data/icons/dustrac-game.png DESTINATION share/pixmaps) 1.1 games-sports/dustrac/files/dustrac-1.6.2-desktopfile.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/dustrac/files/dustrac-1.6.2-desktopfile.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/dustrac/files/dustrac-1.6.2-desktopfile.patch?rev=1.1&content-type=text/plain Index: dustrac-1.6.2-desktopfile.patch =================================================================== From: Julian Ospald Date: Wed Dec 25 23:21:50 UTC 2013 Subject: fix desktop files --- dustrac-1.6.2/src/dustrac-editor.desktop.in +++ dustrac-1.6.2/src/dustrac-editor.desktop.in @@ -4,5 +4,5 @@ Exec=dustrac-editor Icon=dustrac-editor Type=Application -Categories=Game +Categories=Game; StartupNotify=true --- dustrac-1.6.2/src/dustrac-editor.desktop.opt.in +++ dustrac-1.6.2/src/dustrac-editor.desktop.opt.in @@ -4,5 +4,5 @@ Exec=/opt/dustrac/dustrac-editor Icon=dustrac-editor Type=Application -Categories=Game +Categories=Game; StartupNotify=true --- dustrac-1.6.2/src/dustrac-game.desktop.in +++ dustrac-1.6.2/src/dustrac-game.desktop.in @@ -4,5 +4,5 @@ Exec=dustrac-game Icon=dustrac-game Type=Application -Categories=Game +Categories=Game; StartupNotify=true --- dustrac-1.6.2/src/dustrac-game.desktop.opt.in +++ dustrac-1.6.2/src/dustrac-game.desktop.opt.in @@ -4,5 +4,5 @@ Exec=/opt/dustrac/dustrac-game Icon=dustrac-game Type=Application -Categories=Game +Categories=Game; StartupNotify=true