summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Julian Ospald <hasufell@posteo.de> 2016-05-14 15:19:32 +0200
committerAvatar Wulf C. Krueger <philantrop@exherbo.org> 2016-05-21 09:09:06 +0200
commit67c583ec6bf39bd5e4a36e75ff96c9c96c35df9c (patch)
treee52e9544ca7dbdedbda5ae0e7ef9576292680f82
parent95cc97a3a4f5a281981715db0ae55ebeeb8a348b (diff)
downloadgames-67c583ec6bf39bd5e4a36e75ff96c9c96c35df9c.tar.gz
games-67c583ec6bf39bd5e4a36e75ff96c9c96c35df9c.tar.xz
games-roguelike/dungeon-crawl-stone-soup: bump to 0.18.1
Also remove the ancient 0.13.1 version. Change-Id: Ib1f528a15b821fca5eef6bc4f092440c6f24e26e Reviewed-on: https://galileo.mailstation.de/gerrit/6029 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Wulf C. Krueger <philantrop@exherbo.org>
-rw-r--r--packages/games-roguelike/dungeon-crawl-stone-soup/dungeon-crawl-stone-soup-0.13.1.exheres-066
-rw-r--r--packages/games-roguelike/dungeon-crawl-stone-soup/dungeon-crawl-stone-soup-0.18.1.exheres-0 (renamed from packages/games-roguelike/dungeon-crawl-stone-soup/dungeon-crawl-stone-soup-0.17.1.exheres-0)7
-rw-r--r--packages/games-roguelike/dungeon-crawl-stone-soup/files/0001-0.17.1-MAKE-use-PKGCONFIG-to-get-ncurses-flags-if-available.patch49
-rw-r--r--packages/games-roguelike/dungeon-crawl-stone-soup/files/0002-0.17.1-MAKE-always-use-PKGCONFIG-instead-of-pkg-config.patch48
-rw-r--r--packages/games-roguelike/dungeon-crawl-stone-soup/files/0003-0.17.1-MAKE-allow-to-skip-automagic-gold-linker-detection.patch34
5 files changed, 0 insertions, 204 deletions
diff --git a/packages/games-roguelike/dungeon-crawl-stone-soup/dungeon-crawl-stone-soup-0.13.1.exheres-0 b/packages/games-roguelike/dungeon-crawl-stone-soup/dungeon-crawl-stone-soup-0.13.1.exheres-0
deleted file mode 100644
index 1a41ce1..0000000
--- a/packages/games-roguelike/dungeon-crawl-stone-soup/dungeon-crawl-stone-soup-0.13.1.exheres-0
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2011 Elias Pipping <pipping@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require game
-
-MY_PN=stone_soup
-MY_PNV=${MY_PN}-${PV}
-
-SUMMARY="Single-player, role-playing roguelike game"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
-DOWNLOADS="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_PNV}-nodeps.tar.xz"
-
-LICENCES="
- BSD-2 [[ note = [ all contributions by Steve Noonan and Jesse Luehrs ] ]]
- BSD-3 [[ note = [ mt19937ar.cc, MSVC/stdint.h ] ]]
- GPL-2
- public-domain [[ note = [ most of tiles ] ]]
-"
-SLOT="0"
-PLATFORMS="~amd64"
-MYOPTIONS=""
-
-# A version with tiles would also need SDL_image, opengl, freetype, etc.
-DEPENDENCIES="
- build:
- app-arch/xz
- virtual/pkg-config
- build+run:
- dev-db/sqlite:3
- dev-lang/lua
- sys-libs/ncurses
-"
-
-# Tests only work in debug mode
-RESTRICT="test"
-
-WORK=${WORKBASE}/${MY_PNV}/source
-
-MY_SAVEDIR=/var/lib/games/${MY_PN}
-# Whenever one of these changes, make rebuilds everything.
-# Exporting does not suffice.
-MY_COMMON_ARGS=(
- bin_prefix=usr/bin
- DATADIR=/usr/share/${MY_PN}
- SAVEDIR=${MY_SAVEDIR}
- DESTDIR="${IMAGE}"
-
- INSTALL_UGRP=wizard:games
- MCHMOD=ug+s
-
- STRIP=echo
- V=1
-)
-
-DEFAULT_SRC_COMPILE_PARAMS=( "${MY_COMMON_ARGS[@]}" )
-
-src_install() {
- emake install "${MY_COMMON_ARGS[@]}"
-
- keepdir ${MY_SAVEDIR}/morgue
- keepdir ${MY_SAVEDIR}/saves/db
- preserve_scores "${IMAGE}"${MY_SAVEDIR}
-
- dovarlibgames -R
-}
-
diff --git a/packages/games-roguelike/dungeon-crawl-stone-soup/dungeon-crawl-stone-soup-0.17.1.exheres-0 b/packages/games-roguelike/dungeon-crawl-stone-soup/dungeon-crawl-stone-soup-0.18.1.exheres-0
index a2a424d..4ec7464 100644
--- a/packages/games-roguelike/dungeon-crawl-stone-soup/dungeon-crawl-stone-soup-0.17.1.exheres-0
+++ b/packages/games-roguelike/dungeon-crawl-stone-soup/dungeon-crawl-stone-soup-0.18.1.exheres-0
@@ -55,13 +55,6 @@ WORK=${WORKBASE}/${MY_PNV}/source
MY_SAVEDIR=/var/lib/games/${MY_PN}
-# merged upstream: https://github.com/crawl/crawl/pull/237
-DEFAULT_SRC_PREPARE_PATCHES=(
- -p3 "${FILES}"/0001-${PV}-MAKE-use-PKGCONFIG-to-get-ncurses-flags-if-available.patch
- -p3 "${FILES}"/0002-${PV}-MAKE-always-use-PKGCONFIG-instead-of-pkg-config.patch
- -p3 "${FILES}"/0003-${PV}-MAKE-allow-to-skip-automagic-gold-linker-detection.patch
-)
-
DEFAULT_SRC_COMPILE_PARAMS=(
DATADIR="/usr/share/${PN}"
SAVEDIR=${MY_SAVEDIR}
diff --git a/packages/games-roguelike/dungeon-crawl-stone-soup/files/0001-0.17.1-MAKE-use-PKGCONFIG-to-get-ncurses-flags-if-available.patch b/packages/games-roguelike/dungeon-crawl-stone-soup/files/0001-0.17.1-MAKE-use-PKGCONFIG-to-get-ncurses-flags-if-available.patch
deleted file mode 100644
index 9857f23..0000000
--- a/packages/games-roguelike/dungeon-crawl-stone-soup/files/0001-0.17.1-MAKE-use-PKGCONFIG-to-get-ncurses-flags-if-available.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From fd26eed89bbe3f980b76df379eb0d44c02e48918 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@posteo.de>
-Date: Fri, 19 Feb 2016 16:02:11 +0100
-Subject: [PATCH] MAKE: use PKGCONFIG to get ncurses flags, if available
-
-This fixes build failures on some distributions:
-https://bugs.gentoo.org/show_bug.cgi?id=527034
----
- crawl-ref/source/Makefile | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
-index e9c54db..88ad7f8 100644
---- a/crawl-ref/source/Makefile
-+++ b/crawl-ref/source/Makefile
-@@ -1013,17 +1013,27 @@ endif
- # Your ncurses library may include Unicode support, and you may not have a
- # separate libncursesw; this is the case on Mac OS/Darwin.
- ifdef LIBNCURSES_IS_UNICODE
--NC_LIB = ncurses
--NC_INCLUDE = $(NC_PREFIX)/include/ncurses
-+ ifndef NO_PKGCONFIG
-+ NC_LIBS = $(shell $(PKGCONFIG) --libs ncurses 2>/dev/null || echo "-L$(NC_PREFIX)/lib -lncurses")
-+ NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncurses 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncurses")
-+ else
-+ NC_LIBS = -L$(NC_PREFIX)/lib -lncurses
-+ NC_CFLAGS = -isystem $(NC_PREFIX)/include/ncurses
-+ endif
- else
--NC_LIB = ncursesw
--NC_INCLUDE = $(NC_PREFIX)/include/ncursesw
-+ ifndef NO_PKGCONFIG
-+ NC_LIBS = $(shell $(PKGCONFIG) --libs ncursesw || echo "-L$(NC_PREFIX)/lib -lncursesw")
-+ NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncursesw 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncursesw")
-+ else
-+ NC_LIBS = -L$(NC_PREFIX)/lib -lncursesw
-+ NC_CFLAGS = -isystem $(NC_PREFIX)/include/ncursesw
-+ endif
- endif
-
--INCLUDES_L += -isystem $(NC_INCLUDE)
-+CFOTHERS_L += $(NC_CFLAGS)
-
- ifndef TILES
--LIBS += -L$(NC_PREFIX)/lib -l$(NC_LIB)
-+LIBS += $(NC_LIBS)
- endif
-
- endif
diff --git a/packages/games-roguelike/dungeon-crawl-stone-soup/files/0002-0.17.1-MAKE-always-use-PKGCONFIG-instead-of-pkg-config.patch b/packages/games-roguelike/dungeon-crawl-stone-soup/files/0002-0.17.1-MAKE-always-use-PKGCONFIG-instead-of-pkg-config.patch
deleted file mode 100644
index d25eb54..0000000
--- a/packages/games-roguelike/dungeon-crawl-stone-soup/files/0002-0.17.1-MAKE-always-use-PKGCONFIG-instead-of-pkg-config.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4c94a6bea47048a707ea86d17d36ac1161a99c76 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@posteo.de>
-Date: Fri, 19 Feb 2016 12:34:07 +0100
-Subject: [PATCH] MAKE: always use $(PKGCONFIG) instead of pkg-config
-
-This fixes build failures on distributions that use special
-binary prefixes and PATHs.
----
- crawl-ref/source/Makefile | 2 +-
- crawl-ref/source/rltiles/Makefile | 5 +++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
-index 88ad7f8..266c3da 100644
---- a/crawl-ref/source/Makefile
-+++ b/crawl-ref/source/Makefile
-@@ -605,7 +605,7 @@ endif
- #
-
- ifndef NO_PKGCONFIG
--ifeq ($(shell which pkg-config 2> /dev/null),)
-+ifeq ($(shell which $(PKGCONFIG) 2> /dev/null),)
- NO_PKGCONFIG = YesPlease
- endif
- endif
-diff --git a/crawl-ref/source/rltiles/Makefile b/crawl-ref/source/rltiles/Makefile
-index 98e01ec..3d97d7a 100644
---- a/crawl-ref/source/rltiles/Makefile
-+++ b/crawl-ref/source/rltiles/Makefile
-@@ -10,6 +10,7 @@ endif
- # Also, cross-compilation with no system libraries for host rather than target
- # is not supported. If host=target, contribs are enough.
-
-+PKGCONFIG = pkg-config
- CFLAGS := -O2 $(STDFLAG) -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
-
- ifdef ANDROID
-@@ -20,8 +21,8 @@ endif
-
- ifdef TILES
- ifndef NO_PKGCONFIG
-- PNG_INCLUDE := $(shell pkg-config libpng --cflags 2> /dev/null || echo "-I../contrib/install/$(ARCH)/include")
-- PNG_LIB := $(shell pkg-config libpng --libs 2> /dev/null || echo "../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a")
-+ PNG_INCLUDE := $(shell $(PKGCONFIG) libpng --cflags 2> /dev/null || echo "-I../contrib/install/$(ARCH)/include")
-+ PNG_LIB := $(shell $(PKGCONFIG) libpng --libs 2> /dev/null || echo "../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a")
- else
- PNG_INCLUDE := -I../contrib/install/$(ARCH)/include
- PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a
diff --git a/packages/games-roguelike/dungeon-crawl-stone-soup/files/0003-0.17.1-MAKE-allow-to-skip-automagic-gold-linker-detection.patch b/packages/games-roguelike/dungeon-crawl-stone-soup/files/0003-0.17.1-MAKE-allow-to-skip-automagic-gold-linker-detection.patch
deleted file mode 100644
index d24a4e3..0000000
--- a/packages/games-roguelike/dungeon-crawl-stone-soup/files/0003-0.17.1-MAKE-allow-to-skip-automagic-gold-linker-detection.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From cf5b5111a5bb69ec154f0bd3e96dc53e14d93cbd Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@posteo.de>
-Date: Fri, 19 Feb 2016 14:03:41 +0100
-Subject: [PATCH] MAKE: allow to skip automagic gold linker detection
-
-This causes build failures on exherbo otherwise.
----
- crawl-ref/source/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
-index 266c3da..e7c60ac 100644
---- a/crawl-ref/source/Makefile
-+++ b/crawl-ref/source/Makefile
-@@ -46,6 +46,7 @@
- # USE_ICC -- set to use Intel's compiler
- # LTO -- set for better optimization but slower compilation,
- # requires gcc4.6+
-+# NO_TRY_GOLD -- if set don't try to detect a working gold linker
- # NOASSERTS -- set to disable assertion checks (ignored in debug mode)
- # NOWIZARD -- set to disable wizard mode. Use if you have untrusted
- # remote players without DGL.
-@@ -1058,9 +1059,11 @@ CFWARN := -wd383,810,869,981,1418 -we14,193,304
- CFWARN_L :=
- endif
-
-+ifndef NO_TRY_GOLD
- ifeq (,$(shell echo 'int main(){return 1;}'|$(GXX) -x c++ - -o /dev/null -fuse-ld=gold 2>&1))
- LDFLAGS += -fuse-ld=gold
- endif
-+endif
-
- LDFLAGS += $(CFOPTIMIZE) $(CFOPTIMIZE_L) $(EXTERNAL_LDFLAGS)
-