[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/files/, games-arcade/commandergenius/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/files/, games-arcade/commandergenius/
@ 2016-11-25 19:21 Michael Palimaka
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2016-11-25 19:21 UTC (permalink / raw
  To: gentoo-commits

commit:     4c95fbad76c6c27c9759b69e8963eb1906f99b05
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 19:16:44 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 19:21:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c95fbad

games-arcade/commandergenius: remove old

Package-Manager: portage-2.3.2

 games-arcade/commandergenius/Manifest              |  1 -
 .../commandergenius/commandergenius-1.8.0.0.ebuild | 92 ----------------------
 .../files/commandergenius-1.8.0.0-install.patch    | 20 -----
 3 files changed, 113 deletions(-)

diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest
index 40d9b0b..7be2129 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1,2 +1 @@
-DIST CGenius-1.8.0.0-Release-Source.tar.gz 22863637 SHA256 131cbc12d711d1c168baf89f1f9e0e4e9560049c21f42399d913c09c619e6153 SHA512 4e4dc91a5cfabfcace9db2fa85fe2d3dbe91396760cdf37372a12270782ac29906cbeb05b7e48bdf3a64eb042d3b7e209d3370f20ad8b8dfbc1d8c59a95abba9 WHIRLPOOL e8c3068a956fc62ecbd6d134cc4d16e96249555463b41e4193cf6796229a5ecc3e02398914d34ac8cc481978d6df0107c70d6ace635f05e3ae742efd3150ee17
 DIST commandergenius-1.8.3.tar.gz 71446309 SHA256 f3c79cc2e322dab408018ac3469cc3747acea14498bef64c13edcb522e73b966 SHA512 821a356751629b7f3b122f52a31588f2174580fa6450699f8a03bcd78e305c649c7b36bb21dd2d222411c648b78c3bb02c11e9691e8cb2459380e6a70c2dbe2a WHIRLPOOL dae311c4b193ea50efe22557e3dd0bf4f1d179f1dc40f3e68a8d09758736212c68ad33a406ca0d7df60b48ccf67f3e9673967e21f4ceeb997d614667ba2124bc

diff --git a/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild b/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild
deleted file mode 100644
index 2e3466b..00000000
--- a/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils eutils games
-
-MY_P=CGenius-${PV}-Release-Source
-DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
-HOMEPAGE="http://clonekeenplus.sourceforge.net"
-SRC_URI="mirror://sourceforge/clonekeenplus/CGenius/V${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="opengl tremor"
-RESTRICT="mirror" # contains keen files, but we do not install them
-
-RDEPEND="media-libs/libsdl2[X,opengl?,sound,video]
-	media-libs/sdl2-image
-	opengl? ( virtual/opengl )
-	tremor? ( media-libs/tremor )
-	!tremor? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-
-S=${WORKDIR}/CGenius-${PV}-Release-Source
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-install.patch
-
-	rm -rf vfsroot || die
-
-	cat <<-EOF > version.h
-	#ifndef __CG__VERSION_H__
-	#define __CG__VERSION_H__
-
-	#define CGVERSION	"${PV}-Release"
-
-	#endif
-	EOF
-
-	sed -i \
-		-e '/INCLUDE(package.cmake)/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAPPDIR="${GAMES_BINDIR}"
-		-DSHAREDIR="/usr/share"
-		-DGAMES_SHAREDIR="${GAMES_DATADIR}"
-		-DDOCDIR="/usr/share/doc/${PF}"
-		-DBUILD_TARGET="LINUX"
-		$(cmake-utils_use opengl OPENGL)
-		$(cmake-utils_use tremor TREMOR)
-		$(cmake-utils_use !tremor OGG)
-		-DUSE_SDL2=1
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon CGLogo.png ${PN}.png
-	newgamesbin "${FILESDIR}"/commandergenius-wrapper commandergenius
-	if [[ -e "${ED}${GAMES_BINDIR}"/CGeniusExe ]] ; then
-		mv "${ED}${GAMES_BINDIR}"/CGeniusExe \
-			"${ED}${GAMES_BINDIR}"/CommanderGenius || die
-	fi
-
-	make_desktop_entry commandergenius
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Check your settings in ~/.CommanderGenius/cgenius.cfg"
-	elog "after you have started the game for the first time."
-	use opengl && elog "You may also want to set \"OpenGL = true\""
-	elog
-	elog "Run the game via:"
-	elog "    'commandergenius [path-to-keen-data]'"
-	elog "or add your keen data dir to the search paths in cgenius.cfg"
-}

diff --git a/games-arcade/commandergenius/files/commandergenius-1.8.0.0-install.patch b/games-arcade/commandergenius/files/commandergenius-1.8.0.0-install.patch
deleted file mode 100644
index ea502bd..00000000
--- a/games-arcade/commandergenius/files/commandergenius-1.8.0.0-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- CGenius-1.8.0.0-Release-Source.orig/src/install.cmake
-+++ CGenius-1.8.0.0-Release-Source/src/install.cmake
-@@ -22,7 +22,7 @@
- 
- # This will copy the resources files to the proper directory
- IF(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/vfsroot")
--	INSTALL(DIRECTORY vfsroot/ 
-+	INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}vfsroot/ 
- 		DESTINATION ${DATADIR})
- ENDIF(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/vfsroot")
- 
-@@ -31,7 +31,7 @@
- 	DESTINATION ${DOCDIR})
- 
- # This will copy the readme file. 
--INSTALL(FILES changelog.txt 
-+INSTALL(FILES ${CMAKE_SOURCE_DIR}/changelog.txt 
- 	DESTINATION ${DOCDIR})
- 
- # Windows might not have those dlls so we ship them with the packages


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/files/, games-arcade/commandergenius/
@ 2019-04-14 13:26 James Le Cuirot
  0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2019-04-14 13:26 UTC (permalink / raw
  To: gentoo-commits

commit:     34f929fa2a9bba8d1029c1b407a2ee65660abfdd
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 13:24:03 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 13:26:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f929fa

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 <AT> gentoo.org>

 games-arcade/commandergenius/Manifest              |  1 +
 .../commandergenius/commandergenius-2.3.3.ebuild   | 91 +++++++++++++++++++++
 .../files/commandergenius-2.3.1-build.patch        | 12 +++
 .../files/commandergenius-2.3.1-desktop.patch      | 52 ++++++++++++
 .../files/commandergenius-2.3.1-minizip.patch      | 93 ++++++++++++++++++++++
 .../files/commandergenius-2.3.1-paths.patch        | 11 +++
 games-arcade/commandergenius/metadata.xml          |  3 +-
 7 files changed, 262 insertions(+), 1 deletion(-)

diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest
index 77859bf4c17..dcd67035647 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1 +1,2 @@
+DIST Commander-Genius-v2.3.3.tar.bz2 63885924 BLAKE2B a072f922bac6f76e615bbb602c1b5ac4fca634a90bdead461d666da0d70ad5ddd6865504c84a09905bb313728b840df973ae006d120ae01d8c8f8a7bd4a10abe SHA512 f64f24b01cd0921570f633913c8a3b1b50537596b2c46377862a913e36c74934521c1c55fca676b78674c669d475d9c2c2c09ac4a22ebdad1826508e6b9598b6
 DIST commandergenius-1.8.3.tar.gz 71446309 BLAKE2B 01f54e3deb4189e103d9ae23efadfe82363893b48e31d4b5b505f961191b5afe36440b67f0da55d59b6fceeadb15659503d3326975cb131f131b9a630ac35ae8 SHA512 821a356751629b7f3b122f52a31588f2174580fa6450699f8a03bcd78e305c649c7b36bb21dd2d222411c648b78c3bb02c11e9691e8cb2459380e6a70c2dbe2a

diff --git a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild b/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
new file mode 100644
index 00000000000..4c3fc02b572
--- /dev/null
+++ b/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils desktop python-single-r1 xdg-utils
+
+MY_PN="Commander-Genius"
+MY_P="${MY_PN}-v${PV}"
+DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
+HOMEPAGE="http://clonekeenplus.sourceforge.net"
+SRC_URI="https://gitlab.com/Dringgstein/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+downloader opengl +python"
+RESTRICT="mirror" # contains keen files, but we do not install them
+
+RDEPEND="media-libs/libsdl2[opengl?,video]
+	media-libs/sdl2-image
+	media-libs/sdl2-mixer[vorbis]
+	sys-libs/zlib[minizip]
+	downloader? ( net-misc/curl )
+	opengl? ( virtual/opengl )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-minizip.patch
+	"${FILESDIR}"/${PN}-2.3.1-desktop.patch
+	"${FILESDIR}"/${PN}-2.3.1-build.patch
+	"${FILESDIR}"/${PN}-2.3.1-paths.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+SHAREDIR="/usr/share"
+GAMESDIR="${SHAREDIR}/${PN}/games"
+DOCS=()
+
+src_configure() {
+	local mycmakeargs=(
+		-DAPPDIR="${EPREFIX}/usr/bin"
+		-DGAMES_SHAREDIR="${EPREFIX}${SHAREDIR}"
+		-DDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DDOWNLOADER=$(usex downloader)
+		-DOPENGL=$(usex opengl)
+		-DUSE_PYTHON3=$(usex python)
+		-DUSE_SDL2=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# The normal executable name is weird.
+	dosym CGeniusExe /usr/bin/${PN}
+
+	# Game data can be manually installed here.
+	keepdir "${GAMESDIR}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	elog "Run ${PN} to start the game. It will search for game data"
+	elog "in ~/.CommanderGenius/games and ${EPREFIX}${GAMESDIR}."
+	elog "You can also specify paths in cgenius.cfg or pass paths as an"
+	elog "argument."
+	elog
+	use downloader && elog "Data for some games can be downloaded from the menu."
+	elog
+	elog "Check your settings in ~/.CommanderGenius/cgenius.cfg after you have"
+	elog "started the game for the first time."
+	elog
+	use opengl && elog "You may also want to set \"OpenGL = true\"."
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}

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 00000000000..b5a9e1288a6
--- /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 00000000000..4d2c246e5b7
--- /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 00000000000..ca2553b5f7d
--- /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 00000000000..50fb90b9502
--- /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
+ }

diff --git a/games-arcade/commandergenius/metadata.xml b/games-arcade/commandergenius/metadata.xml
index 1f862355f14..86222e373a5 100644
--- a/games-arcade/commandergenius/metadata.xml
+++ b/games-arcade/commandergenius/metadata.xml
@@ -10,9 +10,10 @@
 			Use <pkg>media-libs/tremor</pkg> as ogg decoder
 			instead of <pkg>media-libs/libvorbis</pkg>
 		</flag>
+		<flag name="downloader">Allows some Keen games to be downloaded from the menu</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">clonekeenplus</remote-id>
-		<remote-id type="github">gerstrong/Commander-Genius</remote-id>
+		<remote-id type="gitlab">Dringgstein/Commander-Genius</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/files/, games-arcade/commandergenius/
@ 2020-03-30 22:39 James Le Cuirot
  0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2020-03-30 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     85c3414f25e0944e041379d55eb8507a1196f89b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 22:38:46 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 22:38:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c3414f

games-arcade/commandergenius: Drop old 2.3.3

Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-arcade/commandergenius/Manifest              |  1 -
 .../commandergenius/commandergenius-2.3.3.ebuild   | 92 ---------------------
 .../files/commandergenius-2.3.1-desktop.patch      | 52 ------------
 .../files/commandergenius-2.3.1-minizip.patch      | 93 ----------------------
 4 files changed, 238 deletions(-)

diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest
index 67267068a0c..8161b076039 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1,2 +1 @@
-DIST Commander-Genius-v2.3.3.tar.bz2 63885924 BLAKE2B a072f922bac6f76e615bbb602c1b5ac4fca634a90bdead461d666da0d70ad5ddd6865504c84a09905bb313728b840df973ae006d120ae01d8c8f8a7bd4a10abe SHA512 f64f24b01cd0921570f633913c8a3b1b50537596b2c46377862a913e36c74934521c1c55fca676b78674c669d475d9c2c2c09ac4a22ebdad1826508e6b9598b6
 DIST Commander-Genius-v2.4.0.tar.bz2 62351265 BLAKE2B 0a3338bee2e494f415ce5072978f050766fff16e5df5e7b27824fb4d4c699d2e5a690924f339189325383bee273cbfa5424f43aa9dc87ae4abf63c7cbf1ea6cd SHA512 76eda96fade00d164d3ea5b95acadfb28a3b24864a5ce3f2c9317837a1027cd8d0282a474b8d25bacc26008a26a6adc5062ee655f9abd350d44db58aa70d3b3b

diff --git a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild b/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
deleted file mode 100644
index 9a139cff2fa..00000000000
--- a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake desktop python-single-r1 xdg-utils
-
-MY_PN="Commander-Genius"
-MY_P="${MY_PN}-v${PV}"
-DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
-HOMEPAGE="http://clonekeenplus.sourceforge.net"
-SRC_URI="https://gitlab.com/Dringgstein/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+downloader opengl +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="mirror" # contains keen files, but we do not install them
-
-RDEPEND="media-libs/libsdl2[opengl?,video]
-	media-libs/sdl2-image
-	media-libs/sdl2-mixer[vorbis]
-	sys-libs/zlib[minizip]
-	downloader? ( net-misc/curl )
-	opengl? ( virtual/opengl )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-	dev-libs/boost"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.1-minizip.patch
-	"${FILESDIR}"/${PN}-2.3.1-desktop.patch
-	"${FILESDIR}"/${PN}-2.3.1-build.patch
-	"${FILESDIR}"/${PN}-2.3.1-paths.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-SHAREDIR="/usr/share"
-GAMESDIR="${SHAREDIR}/${PN}/games"
-DOCS=()
-
-src_configure() {
-	local mycmakeargs=(
-		-DAPPDIR="${EPREFIX}/usr/bin"
-		-DGAMES_SHAREDIR="${EPREFIX}${SHAREDIR}"
-		-DDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DDOWNLOADER=$(usex downloader)
-		-DOPENGL=$(usex opengl)
-		-DUSE_PYTHON3=$(usex python)
-		-DUSE_SDL2=ON
-		-DBUILD_SHARED_LIBS=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# The normal executable name is weird.
-	dosym CGeniusExe /usr/bin/${PN}
-
-	# Game data can be manually installed here.
-	keepdir "${GAMESDIR}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	elog "Run ${PN} to start the game. It will search for game data"
-	elog "in ~/.CommanderGenius/games and ${EPREFIX}${GAMESDIR}."
-	elog "You can also specify paths in cgenius.cfg or pass paths as an"
-	elog "argument."
-	elog
-	use downloader && elog "Data for some games can be downloaded from the menu."
-	elog
-	elog "Check your settings in ~/.CommanderGenius/cgenius.cfg after you have"
-	elog "started the game for the first time."
-	elog
-	use opengl && elog "You may also want to set \"OpenGL = true\"."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch b/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch
deleted file mode 100644
index 4d2c246e5b7..00000000000
--- a/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index ca2553b5f7d..00000000000
--- a/games-arcade/commandergenius/files/commandergenius-2.3.1-minizip.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-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
-


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/files/, games-arcade/commandergenius/
@ 2023-04-19  3:24 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-04-19  3:24 UTC (permalink / raw
  To: gentoo-commits

commit:     b62f4a1dcac81842a89a24c6ba6347d80ea78b6b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 03:22:22 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 03:22:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62f4a1d

games-arcade/commandergenius: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/898756
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../commandergenius-2.4.0-r1.ebuild                |  1 +
 .../files/commandergenius-2.4.0-gcc13.patch        | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
index f263f3a77456..82eb3b850b7e 100644
--- a/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
@@ -38,6 +38,7 @@ BDEPEND="python? ( ${PYTHON_DEPS} )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.1-build.patch
 	"${FILESDIR}"/${PN}-2.3.1-paths.patch
+	"${FILESDIR}"/${P}-gcc13.patch
 )
 
 pkg_setup() {

diff --git a/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch b/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch
new file mode 100644
index 000000000000..866905c251b8
--- /dev/null
+++ b/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch
@@ -0,0 +1,23 @@
+https://gitlab.com/Dringgstein/Commander-Genius/-/commit/f9fb2808acfca598fe6e6963c84fe9afe5bcd89e
+
+From f9fb2808acfca598fe6e6963c84fe9afe5bcd89e Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Tue, 28 Mar 2023 10:56:06 +0200
+Subject: [PATCH] build: resolve compile error with gcc-13
+
+GsKit/base/utils/Unicode.h:16:9: error: 'uint32_t' does not name a type
+GsKit/base/utils/Unicode.h:17:27: error: 'UnicodeChar' was not declared in this scope
+GsKit/base/utils/Unicode.h:17:38: error: template argument 1 is invalid
+...
+--- a/GsKit/base/utils/Unicode.h
++++ b/GsKit/base/utils/Unicode.h
+@@ -11,6 +11,7 @@
+ #ifndef __UNICODE_H__
+ #define __UNICODE_H__
+ 
++#include <cstdint>
+ #include <string>
+ 
+ typedef uint32_t UnicodeChar;
+-- 
+GitLab


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-04-19  3:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-14 13:26 [gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/files/, games-arcade/commandergenius/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2023-04-19  3:24 Sam James
2020-03-30 22:39 James Le Cuirot
2016-11-25 19:21 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox