diff options
author | James Le Cuirot <chewi@gentoo.org> | 2019-04-14 14:24:03 +0100 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2019-04-14 14:26:07 +0100 |
commit | 34f929fa2a9bba8d1029c1b407a2ee65660abfdd (patch) | |
tree | 038b77c5cde2df3ec87076b73ddc496271ec0b04 /games-arcade/commandergenius/files | |
parent | www-misc/urlwatch: require pyyaml<5 for old versions (diff) | |
download | gentoo-34f929fa2a9bba8d1029c1b407a2ee65660abfdd.tar.gz gentoo-34f929fa2a9bba8d1029c1b407a2ee65660abfdd.tar.bz2 gentoo-34f929fa2a9bba8d1029c1b407a2ee65660abfdd.zip |
games-arcade/commandergenius: Version bump to 2.3.3
The path handling still seems a bit buggy but it more or less works
with the included patch.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'games-arcade/commandergenius/files')
4 files changed, 168 insertions, 0 deletions
diff --git a/games-arcade/commandergenius/files/commandergenius-2.3.1-build.patch b/games-arcade/commandergenius/files/commandergenius-2.3.1-build.patch new file mode 100644 index 000000000000..b5a9e1288a60 --- /dev/null +++ b/games-arcade/commandergenius/files/commandergenius-2.3.1-build.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9733f6d78..b515ee7a1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,7 +78,6 @@ add_subdirectory("src") + + MESSAGE( STATUS "CG_VERSION = ${CG_VERSION}" ) + +-INCLUDE(package.cmake) + + MESSAGE( STATUS "Build system is prepared. To Build the project just type \"make\"" ) + MESSAGE( STATUS "If you want to create the installation package just type \"make package\" after you build the project" ) diff --git a/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch b/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch new file mode 100644 index 000000000000..4d2c246e5b76 --- /dev/null +++ b/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch @@ -0,0 +1,52 @@ +From 84243052d0b9409b4d5b28e751e598287b00bab9 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 24 Feb 2019 21:26:38 +0000 +Subject: [PATCH 1/2] Remove deprecated "Application" entry from desktop + categories + +The desktop-file-validate tool says it is deprecated. +--- + share/cgenius.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/share/cgenius.desktop b/share/cgenius.desktop +index 8d0771522..b7b39ffef 100644 +--- a/share/cgenius.desktop ++++ b/share/cgenius.desktop +@@ -6,4 +6,4 @@ Icon=/usr/share/icons/hicolor/512x512/apps/CGLogo.png + Terminal=false + Type=Application + StartupNotify=true +-Categories=Application;Game;ArcadeGame; ++Categories=Game;ArcadeGame; +-- +2.20.1 + +From e9d6157210015b4aa5efcb9ba0c57842ae4ef266 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 24 Feb 2019 21:31:28 +0000 +Subject: [PATCH 2/2] Remove unnecessary absolute icon path from desktop entry + +We should not assume that the game has been installed to /usr and +there is no need to specify an absolute path for the icon anyway as +the standard says that bare icon names should be looked up. +--- + share/cgenius.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/share/cgenius.desktop b/share/cgenius.desktop +index b7b39ffef..9b09ec9fc 100644 +--- a/share/cgenius.desktop ++++ b/share/cgenius.desktop +@@ -2,7 +2,7 @@ + Name=Commander Genius + Comment=Play natively Commander Keen Games + Exec=CGeniusExe +-Icon=/usr/share/icons/hicolor/512x512/apps/CGLogo.png ++Icon=CGLogo + Terminal=false + Type=Application + StartupNotify=true +-- +2.20.1 + diff --git a/games-arcade/commandergenius/files/commandergenius-2.3.1-minizip.patch b/games-arcade/commandergenius/files/commandergenius-2.3.1-minizip.patch new file mode 100644 index 000000000000..ca2553b5f7d3 --- /dev/null +++ b/games-arcade/commandergenius/files/commandergenius-2.3.1-minizip.patch @@ -0,0 +1,93 @@ +From 04f776e73248d19d9beaf4ea8d407b7c85ecc9c9 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 24 Feb 2019 20:25:34 +0000 +Subject: [PATCH] Allow use of external minizip library instead of linking just + zlib + +Some distributions package the minizip part of zlib, as well as zlib +itself, so allow that to be used with help from pkg-config. +--- + src/engine/unzip/CMakeLists.txt | 42 +++++++++++++++++++++------------ + src/engine/unzip/miniunz.c | 4 ++-- + 2 files changed, 29 insertions(+), 17 deletions(-) + +diff --git a/src/engine/unzip/CMakeLists.txt b/src/engine/unzip/CMakeLists.txt +index 5f2b8a959..24833abb7 100644 +--- a/src/engine/unzip/CMakeLists.txt ++++ b/src/engine/unzip/CMakeLists.txt +@@ -1,23 +1,35 @@ +-find_package( ZLIB REQUIRED ) +-if ( ZLIB_FOUND ) +- include_directories( ${ZLIB_INCLUDE_DIRS} ) +-else ( ZLIB_FOUND ) +- Message(FATAL_ERROR "Zlib development packages not found!") +-endif( ZLIB_FOUND ) ++find_package(PkgConfig) + ++if ( PKGCONFIG_FOUND ) ++ pkg_check_modules(ZLIB minizip) ++else ( PKGCONFIG_FOUND ) ++ unset(ZLIB_FOUND) ++endif ( PKGCONFIG_FOUND ) + ++if ( ZLIB_FOUND ) ++ set(CXXSRC miniunz.c) ++ unset(HSRC) ++else ( ZLIB_FOUND ) ++ find_package(ZLIB REQUIRED) ++ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) + ++ set(CXXSRC ++ miniunz.c ++ ioapi.c ++ iowin32.c ++ unzip.c) + +-set(CXXSRC +- miniunz.c +- ioapi.c +- iowin32.c +- unzip.c) ++ set(HSRC ++ ioapi.h ++ iowin32.h ++ unzip.h) ++endif ( ZLIB_FOUND ) + +-set(HSRC +- ioapi.h +- iowin32.h +- unzip.h) ++if ( ZLIB_FOUND ) ++ include_directories( ${ZLIB_INCLUDE_DIRS} ) ++else ( ZLIB_FOUND ) ++ Message(FATAL_ERROR "Zlib development packages not found!") ++endif( ZLIB_FOUND ) + + add_library(unzip ${CXXSRC} ${HSRC}) + +diff --git a/src/engine/unzip/miniunz.c b/src/engine/unzip/miniunz.c +index 694aa8e60..0f289c96c 100644 +--- a/src/engine/unzip/miniunz.c ++++ b/src/engine/unzip/miniunz.c +@@ -56,7 +56,7 @@ + #endif + + +-#include "unzip.h" ++#include <unzip.h> + + #define CASESENSITIVITY (0) + #define WRITEBUFFERSIZE (8192) +@@ -64,7 +64,7 @@ + + #ifdef _WIN32 + #define USEWIN32IOAPI +-#include "iowin32.h" ++#include <iowin32.h> + #endif + /* + mini unzip, demo of unzip package +-- +2.20.1 + diff --git a/games-arcade/commandergenius/files/commandergenius-2.3.1-paths.patch b/games-arcade/commandergenius/files/commandergenius-2.3.1-paths.patch new file mode 100644 index 000000000000..50fb90b95022 --- /dev/null +++ b/games-arcade/commandergenius/files/commandergenius-2.3.1-paths.patch @@ -0,0 +1,11 @@ +diff -Naur a/GsKit/base/utils/FindFile.cpp b/GsKit/base/utils/FindFile.cpp +--- a/GsKit/base/utils/FindFile.cpp 2019-02-08 15:17:29.000000000 +0000 ++++ b/GsKit/base/utils/FindFile.cpp 2019-02-19 23:14:32.299939859 +0000 +@@ -493,7 +493,6 @@ + #else + AddToFileList(&basesearchpaths, "${HOME}/.CommanderGenius"); + #endif +- AddToFileList(&basesearchpaths, "."); + AddToFileList(&basesearchpaths, SYSTEM_DATA_DIR"/commandergenius"); // no use of ${SYSTEM_DATA}, because it is uncommon and could cause confusion to the user + #endif + } |