commit: 8aa982f5af344ba0915c147655a4f88d2214fbde Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Thu Aug 1 19:45:08 2024 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Thu Aug 1 19:45:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa982f5
games-arcade/tuxdash: treeclean Closes: https://bugs.gentoo.org/935308 (pkgremoved) Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> games-arcade/tuxdash/Manifest | 1 - .../files/tuxdash-0.8-fix-build-system.patch | 11 --- .../tuxdash/files/tuxdash-0.8-fix-c++14.patch | 101 --------------------- .../tuxdash/files/tuxdash-0.8-fix-paths.patch | 45 --------- games-arcade/tuxdash/metadata.xml | 8 -- games-arcade/tuxdash/tuxdash-0.8-r1.ebuild | 47 ---------- profiles/package.mask | 1 - 7 files changed, 214 deletions(-) diff --git a/games-arcade/tuxdash/Manifest b/games-arcade/tuxdash/Manifest deleted file mode 100644 index 40df83c0db8b..000000000000 --- a/games-arcade/tuxdash/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tuxdash_src_0.8.tar.bz2 447560 BLAKE2B 023deef628c1a6e0ea602fd87e3fe6347f38308dff45623aa59406d15805b87aafdb21e4756e5f2b90c97b56a76d4052c4aacb1401ff03e1e3157cac170b1536 SHA512 5c42b89ce3121025801d78d35962a2aa3d10e4443f6c929e7df4b45673e6285f37ed353877aa33eaa0edf584f7a428a8f485301ba1476865a498ab699ee81f86 diff --git a/games-arcade/tuxdash/files/tuxdash-0.8-fix-build-system.patch b/games-arcade/tuxdash/files/tuxdash-0.8-fix-build-system.patch deleted file mode 100644 index 9f861d98e8cc..000000000000 --- a/games-arcade/tuxdash/files/tuxdash-0.8-fix-build-system.patch +++ /dev/null @@ -1,11 +0,0 @@ -Fix build system to honour all user variables. - ---- a/src/Makefile -+++ b/src/Makefile -@@ -1,4 +1,4 @@ - all: -- g++ main.cpp -Wall `/usr/bin/sdl-config --libs --cflags` -lSDL_ttf -o ../TuxDash -+ $(CXX) main.cpp $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) `/usr/bin/sdl-config --libs --cflags` -lSDL_ttf -o ../tuxdash - static: -- g++ -static main.cpp -Wall `/usr/bin/sdl-config --cflags --static-libs` -lSDL_ttf -lfreetype -lz -o ../TuxDash -+ $(CXX) -static main.cpp $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) `/usr/bin/sdl-config --cflags --static-libs` -lSDL_ttf -lfreetype -lz -o ../tuxdash diff --git a/games-arcade/tuxdash/files/tuxdash-0.8-fix-c++14.patch b/games-arcade/tuxdash/files/tuxdash-0.8-fix-c++14.patch deleted file mode 100644 index b37f456f559b..000000000000 --- a/games-arcade/tuxdash/files/tuxdash-0.8-fix-c++14.patch +++ /dev/null @@ -1,101 +0,0 @@ -Modernise C++ to avoid errors in C++14 mode. -See also: https://bugs.gentoo.org/show_bug.cgi?id=600084 - ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -66,7 +66,7 @@ - - void writeconfig(const map& game_map) { - ofstream config((ostring)TuxHomeDirectory + "/config"); // open config file -- if(config == NULL) { // error check -+ if(!config) { // error check - cout << "Warning: Couldn't write to file " << (ostring)TuxHomeDirectory + "/config" << endl; - return; - } -@@ -124,7 +124,7 @@ - - void readconfig(class map& game_map) { - ifstream config((ostring)TuxHomeDirectory + "/config"); // open config file -- if(config==0) { // error check -+ if(!config) { // error check - cout << "Warning: Couldn't find configuration file " << (ostring)TuxHomeDirectory + "/config" << ". Using default values." << endl; - return; - } ---- a/src/map.cpp -+++ b/src/map.cpp -@@ -346,13 +346,13 @@ - cout << "-- copy map --" << endl; // print status message - ifstream in_file(path); // open source file - -- if(in_file == 0) { // error checking -+ if(!in_file) { // error checking - cout << "Couldn't open sourcefile \"" << filename << "\"" << endl; - cout << endl << "-- error in copymap --" << endl; - return 1; - } - -- if(out_file == 0) { // error checking -+ if(!out_file) { // error checking - cout << "Couldn't open target file \"" << temp_path << "\" for writing " << endl; - cout << endl << "-- error in copymap --" << endl; - return 1; -@@ -390,7 +390,7 @@ - path = mapfolder; - path += filename; - file.open(path); // open file -- if(file == NULL) { -+ if(!file) { - cout << "map::savemap : error while saving map to file '" << path << "'" << endl; - return 1; - } -@@ -402,7 +402,7 @@ - path = savefolder; - path += filename; - file.open(path); // open file -- if(file == NULL) { -+ if(!file) { - cout << "map::savemap : error while saving game to file '" << path << "'" << endl; - return 1; - } ---- a/src/menu.cpp -+++ b/src/menu.cpp -@@ -119,7 +119,7 @@ - - // add a selection box - --class element* menu_mgm::add_box(int x, int y, const ostring& text, const ostring& value, bool selectable, int size, int xgroup, int ygroup, int max, int width, int height, unsigned char r, unsigned char g, unsigned char b, int value_type, bool dependency, char* depend) { -+class element* menu_mgm::add_box(int x, int y, const ostring& text, const ostring& value, bool selectable, int size, int xgroup, int ygroup, int max, int width, int height, unsigned char r, unsigned char g, unsigned char b, int value_type, bool dependency, const char* depend) { - class element& newone = add(); - newone.value = value; - newone.posx = x; ---- a/src/menu.h -+++ b/src/menu.h -@@ -56,7 +56,7 @@ - void check_custom_parameters(); // check if parameters are okay - ostring keytoa(SDLKey); // cast SDLKey to ASCII - class element* add_text(int, int, const ostring&, bool, int, int =-1, int =-1, unsigned char =0, unsigned char =0, unsigned char = 0, int = -1, int = -1); // add a text element -- class element* add_box(int, int, const ostring&, const ostring&, bool, int, int, int, int, int, int, unsigned char, unsigned char, unsigned char, int = 0, bool =false, char* =0); // add a box element -+ class element* add_box(int, int, const ostring&, const ostring&, bool, int, int, int, int, int, int, unsigned char, unsigned char, unsigned char, int = 0, bool =false, const char* =0); // add a box element - class element* add_select(int, int, const ostring&, const ostring&, bool, int, int, int, const char* oneoftwo=0); // add a select element - void draw_window(); // draw the current menu screen with all elements - void selection_mgm(char); // process user input for menu navigation ---- a/src/surface.cpp -+++ b/src/surface.cpp -@@ -92,7 +92,7 @@ - else file_tmp = file; - - TTF_Font *font = TTF_OpenFont(file_tmp, size); -- SDL_Color color = {r, g, b, 0}; -+ SDL_Color color = {(Uint8)r, (Uint8)g, (Uint8)b, 0}; - - area = TTF_RenderText_Solid(font, text, color); - -@@ -118,7 +118,7 @@ - SDL_Surface* text_surface; - SDL_Rect temp; - TTF_Font *font_tmp = TTF_OpenFont(font, size); -- SDL_Color farbe = {r, g, b, 0}; -+ SDL_Color farbe = {(Uint8)r, (Uint8)g, (Uint8)b, 0}; - text_surface = TTF_RenderText_Solid(font_tmp, text, farbe); - TTF_CloseFont(font_tmp); - temp = pos; diff --git a/games-arcade/tuxdash/files/tuxdash-0.8-fix-paths.patch b/games-arcade/tuxdash/files/tuxdash-0.8-fix-paths.patch deleted file mode 100644 index 72cde9d411f8..000000000000 --- a/games-arcade/tuxdash/files/tuxdash-0.8-fix-paths.patch +++ /dev/null @@ -1,45 +0,0 @@ -Change paths for Gentoo's filesystem layout. - ---- a/config -+++ b/config -@@ -1,11 +1,11 @@ - # Fullscreen enable/disable --Fullscreen = 0 -+Fullscreen = 1 - # Width of screen in blocks - screenX = 21 - # Height of screen in blocks - screenY = 16 - # Theme Folder - path to a valid theme --theme = themes/original/ -+theme = /usr/share/tuxdash/themes/original/ - # Distance in X direction, before scrolling starts - scrolldistX = 3 - # Distance in Y direction, before scrolling starts ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -340,9 +340,7 @@ - - // set tuxdash's config / working directory - char* HomeDirectory; -- char* CurrentDirectory; - HomeDirectory = getenv("HOME"); // get users home directory -- CurrentDirectory = getenv("PWD"); // get TuxDash's working directory - TuxHomeDirectory = new char[strlen(HomeDirectory)+strlen("/.tuxdash")+1]; // align space for the string containing the path to tuxdash's config directory - strcpy(TuxHomeDirectory, HomeDirectory); - strcat(TuxHomeDirectory, "/.tuxdash"); -@@ -355,12 +353,12 @@ - } - else { - mkdir((ostring)TuxHomeDirectory + "/themes", 0711); // create the themes folder. The default themes are not copied there, but the folder is created for possible additional themes added by the player -- chdir(CurrentDirectory); -+ chdir("/usr/share/tuxdash"); - system((ostring)"cp -r maps savegames config " + TuxHomeDirectory); - } - } - cout << endl << " Using " << TuxHomeDirectory << " for configuration, map and savegame files" << endl; -- chdir(CurrentDirectory); -+ chdir("/usr/share/tuxdash"); - // finished with check of working directory - - int running=1, start, stop, framestart = time(0), frames=0, frame_count = 0; diff --git a/games-arcade/tuxdash/metadata.xml b/games-arcade/tuxdash/metadata.xml deleted file mode 100644 index 1c3ba213c494..000000000000 --- a/games-arcade/tuxdash/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Games Project</name> -</maintainer> -</pkgmetadata> diff --git a/games-arcade/tuxdash/tuxdash-0.8-r1.ebuild b/games-arcade/tuxdash/tuxdash-0.8-r1.ebuild deleted file mode 100644 index 564ff17963db..000000000000 --- a/games-arcade/tuxdash/tuxdash-0.8-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="A simple BoulderDash clone" -HOMEPAGE="http://www.tuxdash.de/index.php?language=EN"; -SRC_URI="http://www.tuxdash.de/ressources/downloads/${PN}_src_${PV}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - media-libs/libsdl[video] - media-libs/sdl-ttf" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8-fix-build-system.patch - "${FILESDIR}"/${PN}-0.8-fix-c++14.patch - "${FILESDIR}"/${PN}-0.8-fix-paths.patch -) - -src_prepare() { - default - rm -f GPL TuxDash || die -} - -src_configure() { - tc-export CXX -} - -src_compile() { - emake -C src -} - -src_install() { - dobin tuxdash - einstalldocs - - insinto /usr/share/${PN} - doins -r themes maps fonts savegames config -} diff --git a/profiles/package.mask b/profiles/package.mask index 107bdf993c37..991183440b44 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -225,7 +225,6 @@ sci-astronomy/esomidas # Ancient, dead upstream, generally awful. # Removal on 2024-08-01. Bugs #935307, #935308, #935309. games-arcade/spacerider -games-arcade/tuxdash games-arcade/xsfcave # Sam James <[email protected]> (2024-06-25)
