diff options
author | Stefan Strogin <steils@gentoo.org> | 2020-06-05 08:42:39 +0300 |
---|---|---|
committer | Stefan Strogin <steils@gentoo.org> | 2020-06-05 08:42:39 +0300 |
commit | ac0a8e3b8b0cedff61c3249dfda566181850fb8f (patch) | |
tree | 19ac24e80a987fba7927b232e646d9f6db5ecff8 /games-rpg/eternal-lands/files | |
parent | games-rpg/eternal-lands: version bump to 1.9.5.8 (diff) | |
download | gentoo-ac0a8e3b8b0cedff61c3249dfda566181850fb8f.tar.gz gentoo-ac0a8e3b8b0cedff61c3249dfda566181850fb8f.tar.bz2 gentoo-ac0a8e3b8b0cedff61c3249dfda566181850fb8f.zip |
games-rpg/eternal-lands: drop old 1.9.5.3
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Stefan Strogin <steils@gentoo.org>
Diffstat (limited to 'games-rpg/eternal-lands/files')
-rw-r--r-- | games-rpg/eternal-lands/files/el-wrapper | 53 | ||||
-rw-r--r-- | games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch | 70 |
2 files changed, 0 insertions, 123 deletions
diff --git a/games-rpg/eternal-lands/files/el-wrapper b/games-rpg/eternal-lands/files/el-wrapper deleted file mode 100644 index ab392d334207..000000000000 --- a/games-rpg/eternal-lands/files/el-wrapper +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -e - -elc=~/.elc -datadir=$elc/el_data -browser=xdg-open - -if [[ ! -e $elc ]] || [[ ! -e $datadir ]] || [[ ! -e $elc/servers.lst ]] || - [[ ! -e $elc/el.ini ]]; then - - [[ -e $elc ]] || mkdir -p $elc - - if [[ ! -e $datadir ]]; then - echo - echo "The \"Eternal Lands\" launcher is downloading the game data..." - echo "It is only needed before the first start." - echo "The default data location is ~/.elc/el_data" - echo - - tmpdir="`mktemp -d /tmp/eternal-lands.XXXXXXXXXX`" - trap "rm -r $tmpdir" EXIT - wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/el_195_1_data_files.zip -P $tmpdir - unzip $tmpdir/el_195_1_data_files.zip -d $elc - - echo - echo "The game sound and music are optional, you can download \ -them now or any time later from the official website and unpack into \ -~/.elc/el_data/sound and ~/.elc/el_data/music" - while true; do - read -r -n 1 -p "Download the game sound and music now? (y/n) " yn - case $yn in - [Yy]) break;; - [Nn]) break;; - *) echo -e "\nPlease answer Yes or No.";; - esac - done - echo - - if [[ $yn == [Yy] ]]; then - wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/eternallands-sound_1.9.4.zip -P $tmpdir - wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/music_full.zip -P $tmpdir - unzip $tmpdir/eternallands-sound_1.9.4.zip -d $datadir - mkdir $datadir/music - unzip $tmpdir/music_full.zip -d $datadir/music - fi - - rm -r $tmpdir - fi - - [[ -e $elc/servers.lst ]] || cp $datadir/servers.lst $elc/ - [[ -e $elc/el.ini ]] || cp $datadir/el.ini $elc/ -fi - -exec /usr/bin/el.linux.bin -dir="$datadir" -b="$browser" "$@" diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch deleted file mode 100644 index 28f4ab0da542..000000000000 --- a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch +++ /dev/null @@ -1,70 +0,0 @@ -From ef13ae006609e51eaddbcdf0495f44cfde797e26 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin <steils@gentoo.org> -Date: Tue, 14 May 2019 20:34:47 +0300 -Subject: [PATCH 1/2] Respect {C,CXX,LD}FLAGS - -Upstream-Status: Inappropriate [Gentoo-specific] -Signed-off-by: Stefan Strogin <steils@gentoo.org> ---- - Makefile.linux | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/Makefile.linux b/Makefile.linux -index c57aeeeb..a0839c5c 100644 ---- a/Makefile.linux -+++ b/Makefile.linux -@@ -17,11 +17,11 @@ OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST - $(shell pkg-config vorbisfile --cflags) \ - $(shell pkg-config zlib --cflags) - --CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES) -+CFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES) - --CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES) -+CXXFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES) - --LDFLAGS=$(shell pkg-config sdl --libs) \ -+LDFLAGS += $(shell pkg-config sdl --libs) \ - $(shell pkg-config libxml-2.0 --libs) \ - $(shell pkg-config SDL_net --libs) \ - $(shell pkg-config SDL_image --libs) \ -@@ -111,7 +111,7 @@ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz - DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P) - #(shell echo $OBJ |sed s/\.o/\.P/)) - --EXE=el.x86.linux.bin -+EXE=el.linux.bin - - ifndef CC - CC=gcc -@@ -127,8 +127,8 @@ all: $(EXE) - - # the compile targets - $(EXE): $(OBJS) -- @echo " LINK $(EXE)" -- @$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS) -+ @echo "$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)" -+ @$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS) - - #recompile on Makefile or conf change - #.depend $(OBJS): Makefile.linux make.conf -@@ -136,14 +136,14 @@ $(EXE): $(OBJS) - DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :) - - $(COBJS): %.o: %.c Makefile.linux make.conf -- @echo " CC $@" -+ @echo "$(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@" - @if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \ - mv ".deps/$@.pp" ".deps/$@.P"; \ - else rm -f ".deps/$@.pp"; exit 1; \ - fi - - $(CXXOBJS): %.o: %.cpp Makefile.linux make.conf -- @echo " CXX $@" -+ @echo "$(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@" - @if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \ - mv ".deps/$@.pp" ".deps/$@.P"; \ - else rm -f ".deps/$@.pp"; exit 1; \ --- -2.21.0 - |