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.17.1.exheres-0 index c9256a69..fffe36ef 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.17.1.exheres-0 @@ -1,3 +1,4 @@ +# Copyright 2011 Elias Pipping # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 @@ -43,12 +44,18 @@ MYOPTIONS=" tiles [[ description = [ Do graphical (tiled) build instead of ncurses build ] ]] " -RESTRICT="test" +RESTRICT="test" # lots of sydbox access violations DEPENDENCIES=" + build: + dev-lang/perl:* + sys-devel/bison + sys-devel/flex + virtual/pkg-config + tiles? ( sys-libs/ncurses ) build+run: - dev-lang/lua:5.1 dev-db/sqlite:3 + dev-lang/lua:5.1 sys-libs/zlib !tiles? ( sys-libs/ncurses ) tiles? ( @@ -60,23 +67,17 @@ DEPENDENCIES=" x11-dri/glu x11-dri/mesa ) - build: - dev-lang/perl - sys-devel/bison - sys-devel/flex - virtual/pkg-config - tiles? ( sys-libs/ncurses ) " WORK=${WORKBASE}/${MY_PNV}/source MY_SAVEDIR=/var/lib/games/${MY_PN} -# https://github.com/crawl/crawl/pull/237 +# 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}"/0004-${PV}-MAKE-allow-to-skip-automagic-gold-linker-detection.patch + -p3 "${FILES}"/0003-${PV}-MAKE-allow-to-skip-automagic-gold-linker-detection.patch ) DEFAULT_SRC_COMPILE_PARAMS=( 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 index 70796fcb..9857f235 100644 --- 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 @@ -1,34 +1,41 @@ -From 7927399449c4e10a91329fc11239f7979cdf0496 Mon Sep 17 00:00:00 2001 +From fd26eed89bbe3f980b76df379eb0d44c02e48918 Mon Sep 17 00:00:00 2001 From: Julian Ospald -Date: Fri, 19 Feb 2016 12:30:24 +0100 -Subject: [PATCH 1/3] MAKE: use PKGCONFIG to get ncurses flags, if available +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 - -Upstream pull-request: -https://github.com/crawl/crawl/pull/237 --- - crawl-ref/source/Makefile | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + 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..3702c4c 100644 +index e9c54db..88ad7f8 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile -@@ -1013,17 +1013,17 @@ endif +@@ -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 -+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") ++ 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 -+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") ++ 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) @@ -40,6 +47,3 @@ index e9c54db..3702c4c 100644 endif endif --- -2.7.1 - 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 index ec91efce..d25eb54b 100644 --- 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 @@ -1,20 +1,17 @@ -From 39d12bfca474695bdfeee8e749137cb93e1c5d0b Mon Sep 17 00:00:00 2001 +From 4c94a6bea47048a707ea86d17d36ac1161a99c76 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 19 Feb 2016 12:34:07 +0100 -Subject: [PATCH 2/3] MAKE: always use $(PKGCONFIG) instead of pkg-config +Subject: [PATCH] MAKE: always use $(PKGCONFIG) instead of pkg-config This fixes build failures on distributions that use special binary prefixes and PATHs. - -Upstream pull-request: -https://github.com/crawl/crawl/pull/237 --- 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 3702c4c..839e0c5 100644 +index 88ad7f8..266c3da 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -605,7 +605,7 @@ endif @@ -49,6 +46,3 @@ index 98e01ec..3d97d7a 100644 else PNG_INCLUDE := -I../contrib/install/$(ARCH)/include PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a --- -2.7.1 - diff --git a/packages/games-roguelike/dungeon-crawl-stone-soup/files/0004-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 similarity index 82% rename from packages/games-roguelike/dungeon-crawl-stone-soup/files/0004-0.17.1-MAKE-allow-to-skip-automagic-gold-linker-detection.patch rename to packages/games-roguelike/dungeon-crawl-stone-soup/files/0003-0.17.1-MAKE-allow-to-skip-automagic-gold-linker-detection.patch index ea14a996..d24a4e35 100644 --- a/packages/games-roguelike/dungeon-crawl-stone-soup/files/0004-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 @@ -1,18 +1,15 @@ -From 2c22f71a1d853e720a1daf1c6cf83b9b0b6f7b18 Mon Sep 17 00:00:00 2001 +From cf5b5111a5bb69ec154f0bd3e96dc53e14d93cbd Mon Sep 17 00:00:00 2001 From: Julian Ospald 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. - -Upstream pull-request: -https://github.com/crawl/crawl/pull/237 --- crawl-ref/source/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile -index 484f801..6fbd534 100644 +index 266c3da..e7c60ac 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -46,6 +46,7 @@ @@ -23,7 +20,7 @@ index 484f801..6fbd534 100644 # 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. -@@ -1048,9 +1049,11 @@ CFWARN := -wd383,810,869,981,1418 -we14,193,304 +@@ -1058,9 +1059,11 @@ CFWARN := -wd383,810,869,981,1418 -we14,193,304 CFWARN_L := endif @@ -35,6 +32,3 @@ index 484f801..6fbd534 100644 LDFLAGS += $(CFOPTIMIZE) $(CFOPTIMIZE_L) $(EXTERNAL_LDFLAGS) --- -2.7.1 -