diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-10-31 01:27:07 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-10-31 02:31:18 +0100 |
| commit | 1d9a9d27ae4d7981a0df749708b683859ee5c58e (patch) | |
| tree | 2d1fe0fdbd9496289bf9561fbbe1369d26eee260 /gnu/packages/patches | |
| parent | 4cae7e67f3164b0626a2a25215f5d94141a860da (diff) | |
| download | guix-1d9a9d27ae4d7981a0df749708b683859ee5c58e.tar.gz | |
gnu: meandmyshadow: Update to 0.5.
* gnu/packages/games.scm (meandmyshadow): Update to 0.5. [source]: Add unreleased bugfix patch. [arguments]: Remove obsolete ‘set-sdl'paths’ phase. [inputs]: Switch to SDL 2. Add lua. Remove libx11, mesa, and glu. * gnu/packages/patches/meandmyshadow-define-paths-earlier.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/meandmyshadow-define-paths-earlier.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch b/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch new file mode 100644 index 0000000000..505cbd23fe --- /dev/null +++ b/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch @@ -0,0 +1,50 @@ +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Wed, 31 Oct 2018 02:24:26 +0100 +Subject: [PATCH] gnu: meandmyshadow: Define paths earlier. + +The following patch was taken verbatim from the upstream repository[0] +and will be included in the next release. + +[0]: https://github.com/acmepjz/meandmyshadow/pull/29 +--- +From 4847e6b5755258a1e0534f2d4b91dce2ce3b459e Mon Sep 17 00:00:00 2001 +From: Dmitry Marakasov <amdmi3@amdmi3.ru> +Date: Wed, 24 Oct 2018 23:31:19 +0300 +Subject: [PATCH] Define paths earlier in CMakeLists.txt + +At the very least, paths should be defined before Configure_File(), otherwise empty DATAROOTDIR is substituted in config.h +--- + CMakeLists.txt | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e79639a..6321d9d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,13 @@ Project (meandmyshadow) + CMake_Minimum_Required (VERSION 3.1) + Set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") + ++#Path options ++Set (BINDIR "bin" CACHE STRING "Where to install binaries") ++Set (DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location") ++Set (ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.") ++Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.") ++ ++#Options + Option (DEBUG_MODE "Compile the game with debug mode enabled" OFF) + Option (DISABLED_DEBUG_STUFF "Enable this you'll see a lot of annoying script debug messages which will lag the game." OFF) + +@@ -164,12 +171,6 @@ Target_Link_Libraries ( + ${LUA_LIBRARIES} + ) + +-#Path options +-Set (BINDIR "bin" CACHE STRING "Where to install binaries") +-Set (DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location") +-Set (ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.") +-Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.") +- + #Install locations + Install (DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${DATAROOTDIR}/meandmyshadow/) + Install (FILES AUTHORS DESTINATION ${DATAROOTDIR}/meandmyshadow/) |