* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/
@ 2017-10-25 10:34 Jeroen Roovers
0 siblings, 0 replies; 7+ messages in thread
From: Jeroen Roovers @ 2017-10-25 10:34 UTC (permalink / raw
To: gentoo-commits
commit: 218086fe54d54874836389eda013c3501036ccd9
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 25 10:33:52 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 10:33:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218086fe
games-roguelike/stone-soup: Fix pkg-config call.
Package-Manager: Portage-2.3.12, Repoman-2.3.3
.../stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
index 0c029c9f096..e0b676c3d2e 100644
--- a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
+++ b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
@@ -18,12 +18,12 @@ index df51e70..2db2781 100644
ifdef LIBNCURSES_IS_UNICODE
-NC_LIB = ncurses
-NC_INCLUDE = $(NC_PREFIX)/include/ncurses
-+NC_LIBS = $(shell $(PKGCONFIG) --lib ncurses 2>/dev/null || echo "-L$(NC_PREFIX)/lib -lncurses")
++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_LIB = ncursesw
-NC_INCLUDE = $(NC_PREFIX)/include/ncursesw
-+NC_LIBS = $(shell $(PKGCONFIG) --lib ncursesw || echo "-L$(NC_PREFIX)/lib -lncursesw")
++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")
endif
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/
@ 2017-12-23 13:11 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2017-12-23 13:11 UTC (permalink / raw
To: gentoo-commits
commit: d74d32dbd7cb73c8b7f4f98f5e32b06a7c62d5b2
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 22 15:26:58 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 13:10:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d74d32db
games-roguelike/stone-soup: remove unused patches
...6.2-Use-pkg-config-for-linking-to-ncurses.patch | 49 ---------
.../files/stone-soup-0.16.2-perl526.patch | 48 ---------
...ne-soup-0.16.2-respect-flags-and-compiler.patch | 110 ---------------------
3 files changed, 207 deletions(-)
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
deleted file mode 100644
index e0b676c3d2e..00000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 88579f929f0fc777762de1ad0895264ad077e0ee Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Mon, 27 Oct 2014 20:48:03 +0100
-Subject: [PATCH 2/2] Use pkg-config for linking to ncurses
-
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=527034
----
- source/Makefile | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index df51e70..2db2781 100644
---- a/Makefile
-+++ b/Makefile
-@@ -956,17 +956,15 @@ 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")
- 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")
- endif
-
--INCLUDES_L += -isystem $(NC_INCLUDE)
--
- ifndef TILES
--LIBS += -L$(NC_PREFIX)/lib -l$(NC_LIB)
-+LIBS += $(NC_LIBS)
- endif
-
- endif
-@@ -1111,7 +1109,7 @@ CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS)
- else
- CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN)
- endif
--CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L)
-+CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L) $(NC_CFLAGS)
- ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L)
- YACC_CFLAGS := $(ALL_CFLAGS) -Wno-unused-function -Wno-sign-compare -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0
-
---
-2.1.2
-
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.16.2-perl526.patch b/games-roguelike/stone-soup/files/stone-soup-0.16.2-perl526.patch
deleted file mode 100644
index a450a635153..00000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.16.2-perl526.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ruN stone_soup-0.16.2.orig/source/util/gather_abilities stone_soup-0.16.2/source/util/gather_abilities
---- source.orig/util/gather_abilities 2015-08-10 03:32:30.000000000 +0200
-+++ source/util/gather_abilities 2017-07-08 20:46:16.112231100 +0200
-@@ -5,7 +5,7 @@
- $_ = <IN>;
- close IN;
-
--s/.*Ability_List\[\] =\n{\n(.*?)};.*/$1/s
-+s/.*Ability_List\[\] =\n\{\n(.*?)};.*/$1/s
- or die "Can't find Ability_List[] in ability.cc\n";
-
- print join("\n", sort /ABIL_[A-Z0-9_]+\s*,\s*"([*-Za-z0-9 '-]+)"/sg), "\n";
-diff -ruN stone_soup-0.16.2.orig/source/util/gather_cards stone_soup-0.16.2/source/util/gather_cards
---- source.orig/util/gather_cards 2015-08-10 03:32:30.000000000 +0200
-+++ source/util/gather_cards 2017-07-08 20:46:45.113232307 +0200
-@@ -5,7 +5,7 @@
- $_ = <IN>;
- close IN;
-
--s/.*card_name\(card_type card\)\n{\n\s+switch(.*?)\n}\n.*/$1/s
-+s/.*card_name\(card_type card\)\n\{\n\s+switch(.*?)\n}\n.*/$1/s
- or die "Can't find card_name() in decks.cc\n";
-
- @cards = map { /case CARD_[A-Z_]+:\s+return "([^"]+)";$/ ? ("$1") : () } split /\n/;
-diff -ruN stone_soup-0.16.2.orig/source/util/gather_mons stone_soup-0.16.2/source/util/gather_mons
---- source.orig/util/gather_mons 2014-07-28 17:19:20.000000000 +0200
-+++ source/util/gather_mons 2017-07-08 20:47:10.378233358 +0200
-@@ -99,7 +99,7 @@
- open IN, "util/cpp_version spl-summoning.cc|" or die "Can't read spl-summoning.cc\n";
- while (<IN>)
- {
-- $mons{$1} = 1 if (/^ { MONS_[A-Z0-9_]+, "([A-Za-z0-9 ']+)" },$/);
-+ $mons{$1} = 1 if (/^ \{ MONS_[A-Z0-9_]+, "([A-Za-z0-9 ']+)" },$/);
- }
- close IN;
- }
-diff -ruN stone_soup-0.16.2.orig/source/util/gen-mi-enum stone_soup-0.16.2/source/util/gen-mi-enum
---- source.orig/util/gen-mi-enum 2014-07-28 17:19:20.000000000 +0200
-+++ source/util/gen-mi-enum 2017-07-08 20:47:28.491234111 +0200
-@@ -5,7 +5,7 @@
- $_=<IN>;
- s/\r//g;
-
--s/^enum monster_info_flags\n{\n//m && s/^\s*NUM_MB_FLAGS.*//ms
-+s/^enum monster_info_flags\n\{\n//m && s/^\s*NUM_MB_FLAGS.*//ms
- or die "Can't find monster_info_flags in mon-info.h\n";
- open OUT, ">mi-enum.h" or die "Can't create mi-enum.h\n";
- print OUT "// Generated by gen-mi-enum, do not edit.\n\n";
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.16.2-respect-flags-and-compiler.patch b/games-roguelike/stone-soup/files/stone-soup-0.16.2-respect-flags-and-compiler.patch
deleted file mode 100644
index bf07f4e07ed..00000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.16.2-respect-flags-and-compiler.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From aaa7cde91e4b086164f0c7f46569a34bfbb4e479 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sun, 3 May 2015 15:05:43 +0200
-Subject: [PATCH] Respect flags and compiler
-
----
- Makefile | 5 ++---
- rltiles/Makefile | 22 +++++++++++-----------
- 2 files changed, 13 insertions(+), 14 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 8b9efd9..0f37edf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -103,7 +103,7 @@ include Makefile.obj
- #
-
-
--CFOTHERS := -pipe $(EXTERNAL_FLAGS)
-+CFOTHERS := $(EXTERNAL_FLAGS)
- CFWARN :=
- CFWARN_L := -Wall -Wformat-security -Wundef
-
-@@ -809,7 +809,6 @@ ifdef FULLDEBUG
- DEFINES += -DFULLDEBUG
- endif
- ifdef DEBUG
--CFOTHERS := -ggdb $(CFOTHERS)
- DEFINES += -DDEBUG
- endif
- ifndef NOWIZARD
-@@ -1627,7 +1626,7 @@ ifdef ANDROID
- # prove that tiles were generated properly
- grep tile_info rltiles/*.cc| head
- else
-- +$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES)
-+ $(MAKE) -C $(RLTILES) all V=$(V) ARCH=$(ARCH) DEBUG=$(DEBUG) TILES=$(TILES)$(WEBTILES)
- endif
-
- $(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles
-diff --git a/rltiles/Makefile b/rltiles/Makefile
-index ae11f43..464424f 100644
---- a/rltiles/Makefile
-+++ b/rltiles/Makefile
-@@ -1,7 +1,7 @@
- uname_S := $(shell uname -s)
-
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lmingw32
-+LIBS += -lmingw32
- endif
-
- # Note: since generation of tiles is done on the host, we don't care about
-@@ -10,7 +10,7 @@ endif
- # Also, cross-compilation with no system libraries for host rather than target
- # is not supported. If host=target, contribs are enough.
-
--CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
-+CXXFLAGS := -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
-
- ifdef ANDROID
- CXXFLAGS :=
-@@ -27,24 +27,24 @@ ifdef TILES
- PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a
- endif
-
-- CFLAGS += $(PNG_INCLUDE)
-- LDFLAGS += $(PNG_LIB)
-+ CXXFLAGS += $(PNG_INCLUDE)
-+ LIBS += $(PNG_LIB)
-
-- CFLAGS += -DUSE_TILE
-+ CXXFLAGS += -DUSE_TILE
- endif
-
- ifdef DEBUG
--CFLAGS += -O0 -DDEBUG -ggdb
-+CXXFLAGS += -DDEBUG
- endif
-
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
-+LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
- endif
- ifeq ($(uname_S),Darwin)
- LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
- endif
- ifeq ($(uname_S),Linux)
--LDFLAGS += -ldl -lpthread
-+LIBS += -ldl -lpthread
- endif
-
- # Attempt to use a full compiler name, to make
-@@ -129,10 +129,10 @@ clean:
-
- distclean: clean
-
--%.o: %.cc .cflags
-- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
-+%.o: %.cc
-+ $(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) -c $< -o $@
-
- $(TILEGEN): $(OBJECTS)
-- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
-+ $(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
-
- .PHONY: all clean distclean
---
-2.3.5
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/
@ 2020-11-20 13:26 Aaron Bauman
0 siblings, 0 replies; 7+ messages in thread
From: Aaron Bauman @ 2020-11-20 13:26 UTC (permalink / raw
To: gentoo-commits
commit: a5f166a894d84d28516da74fb9164ccac4b94617
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Nov 16 08:00:45 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 13:25:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f166a8
games-roguelike/stone-soup: remove unused patches
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18278
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
games-roguelike/stone-soup/files/gitless.patch | 13 -------------
games-roguelike/stone-soup/files/pyyaml-safe-load.patch | 11 -----------
2 files changed, 24 deletions(-)
diff --git a/games-roguelike/stone-soup/files/gitless.patch b/games-roguelike/stone-soup/files/gitless.patch
deleted file mode 100644
index 3aaeb747009..00000000000
--- a/games-roguelike/stone-soup/files/gitless.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /Makefile 2019-04-15 19:34:40.604288477 -0500
-+++ /Makefile 2019-04-15 19:36:25.249286603 -0500
-@@ -1149,9 +1149,8 @@
-
- LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
- SRC_PKG_BASE := stone_soup
--SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
-+SRC_VERSION := $(shell cat util/release_ver)
- MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|sed -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
--RECENT_TAG := $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
-
- export SRC_VERSION
-
diff --git a/games-roguelike/stone-soup/files/pyyaml-safe-load.patch b/games-roguelike/stone-soup/files/pyyaml-safe-load.patch
deleted file mode 100644
index dfbcdc96e1a..00000000000
--- a/games-roguelike/stone-soup/files/pyyaml-safe-load.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /util/species-gen.py 2019-04-18 23:19:07.444170831 -0500
-+++ /util/species-gen.py 2019-04-18 23:20:19.958169533 -0500
-@@ -417,7 +417,7 @@
- continue
- f_path = os.path.join(args.datadir, f_name)
- try:
-- species_spec = yaml.load(open(f_path))
-+ species_spec = yaml.safe_load(open(f_path))
- except yaml.YAMLError as e:
- print("Failed to load %s: %s" % (f_name, e))
- sys.exit(1)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/
@ 2021-08-27 23:40 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2021-08-27 23:40 UTC (permalink / raw
To: gentoo-commits
commit: d297d1041e08d7a94d14ee6032e33a67ebe752a2
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Aug 27 07:20:15 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 23:34:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d297d104
games-roguelike/stone-soup: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/22124
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../stone-soup/files/fixed-font-path.patch | 20 ----------
games-roguelike/stone-soup/files/gitless-1.patch | 13 -------
.../stone-soup/files/rltiles-ldflags-libs.patch | 45 ----------------------
3 files changed, 78 deletions(-)
diff --git a/games-roguelike/stone-soup/files/fixed-font-path.patch b/games-roguelike/stone-soup/files/fixed-font-path.patch
deleted file mode 100644
index 5f6bd651bec..00000000000
--- a/games-roguelike/stone-soup/files/fixed-font-path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile 2020-12-11 23:37:30.506956304 -0600
-+++ b/Makefile 2020-12-11 23:40:02.925609235 -0600
-@@ -932,7 +932,7 @@
- INSTALL_FONTS += "$(PROPORTIONAL_FONT)"
- endif
- else
-- SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)")
-+ SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf
- ifneq (,$(SYS_PROPORTIONAL_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
-@@ -952,7 +952,7 @@
- INSTALL_FONTS += "$(MONOSPACED_FONT)"
- endif
- else
-- SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)")
-+ SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf
- ifneq (,$(SYS_MONOSPACED_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
diff --git a/games-roguelike/stone-soup/files/gitless-1.patch b/games-roguelike/stone-soup/files/gitless-1.patch
deleted file mode 100644
index a7118dc13fc..00000000000
--- a/games-roguelike/stone-soup/files/gitless-1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /Makefile 2020-06-18 17:49:19.339016246 -0500
-+++ /Makefile 2020-06-18 17:55:11.200700094 -0500
-@@ -1181,9 +1181,8 @@
-
- LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
- SRC_PKG_BASE := stone_soup
--SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
-+SRC_VERSION := $(shell cat util/release_ver)
- MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
--RECENT_TAG := $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
- WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32)
-
- export SRC_VERSION
diff --git a/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch b/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch
deleted file mode 100644
index a2948b23619..00000000000
--- a/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/rltiles/Makefile
-+++ b/rltiles/Makefile
-@@ -1,7 +1,7 @@
- uname_S := $(shell uname -s)
-
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lmingw32
-+LIBS += -lmingw32
- endif
-
- # Note: since generation of tiles is done on the host, we don't care about
-@@ -29,7 +29,7 @@
- endif
-
- CFLAGS += $(PNG_INCLUDE)
-- LDFLAGS += $(PNG_LIB)
-+ LIBS += $(PNG_LIB)
-
- CFLAGS += -DUSE_TILE
- endif
-@@ -39,13 +39,13 @@
- endif
-
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
-+LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
- endif
- ifeq ($(uname_S),Darwin)
--LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
-+LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
- endif
- ifeq ($(uname_S),Linux)
--LDFLAGS += -ldl -lpthread
-+LIBS += -ldl -lpthread
- endif
-
- # Attempt to use a full compiler name, to make
-@@ -134,6 +134,6 @@
- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
-
- $(TILEGEN): $(OBJECTS)
-- $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
-+ $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
-
- .PHONY: all clean distclean
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/
@ 2022-07-15 1:32 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-07-15 1:32 UTC (permalink / raw
To: gentoo-commits
commit: 15e728310edb223dc1608ecbe51f6864f50846e7
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Jul 7 14:35:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 01:29:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e72831
games-roguelike/stone-soup: remove unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26265
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../stone-soup/files/make-no-png-dep-fix.patch | 94 ----------------------
1 file changed, 94 deletions(-)
diff --git a/games-roguelike/stone-soup/files/make-no-png-dep-fix.patch b/games-roguelike/stone-soup/files/make-no-png-dep-fix.patch
deleted file mode 100644
index b43c9c41e8c8..000000000000
--- a/games-roguelike/stone-soup/files/make-no-png-dep-fix.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/Makefile 2021-08-02 13:54:26.603900984 -0500
-+++ b/Makefile 2021-08-02 13:57:26.018910565 -0500
-@@ -186,7 +186,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
-
--HOST := $(shell sh -c 'cc -dumpmachine || echo unknown')
-+HOST :=
- ARCH := $(HOST)
-
- ifdef CROSSHOST
-@@ -457,15 +457,7 @@
- GCC_VER_SUFFIX:=-$(GCC_VER)
- endif
-
--# Attempt to use a full compiler name, to make
--# distcc builds work nicely.
--LMACH := $(shell gcc -dumpmachine)-
--ifeq ($(LMACH),-)
- LMACH :=
--endif
--ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && echo "Yes"),)
--LMACH :=
--endif
-
- ifneq ($(FORCE_CC),)
- GCC := $(FORCE_CC)
-@@ -765,7 +757,6 @@
- FULLDEBUG=YesPlease
- DEBUG=YesPlease
- NO_OPTIMIZE=YesPlease
-- COVERAGE=YesPlease
- endif
-
- # Debug-Lite
-@@ -773,7 +764,6 @@
- ifneq (,$(filter debug-lite,$(MAKECMDGOALS)))
- DEBUG=YesPlease
- NO_OPTIMIZE=YesPlease
-- COVERAGE=YesPlease
- endif
-
- # Profile
-@@ -781,12 +771,10 @@
- ifneq (,$(filter profile,$(MAKECMDGOALS)))
- FULLDEBUG=YesPlease
- DEBUG=YesPlease
-- COVERAGE=YesPlease
- endif
-
- # Unit tests
- ifneq (,$(filter catch2-tests,$(MAKECMDGOALS)))
-- COVERAGE=YesPlease
- endif
-
- ifdef HURRY
-@@ -938,7 +926,7 @@
- INSTALL_FONTS += "$(PROPORTIONAL_FONT)"
- endif
- else
-- SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)")
-+ SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf
- ifneq (,$(SYS_PROPORTIONAL_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
-@@ -958,7 +946,7 @@
- INSTALL_FONTS += "$(MONOSPACED_FONT)"
- endif
- else
-- SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)")
-+ SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf
- ifneq (,$(SYS_MONOSPACED_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
-@@ -1187,9 +1175,8 @@
-
- LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
- SRC_PKG_BASE := stone_soup
--SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
-+SRC_VERSION := $(shell cat util/release_ver)
- MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
--RECENT_TAG := $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
- WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32)
-
- export SRC_VERSION
-@@ -1523,7 +1510,7 @@
- endif
- endif
-
--install: all install-data
-+install: install-data
- [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
- $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
- $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/
@ 2023-05-22 21:27 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2023-05-22 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 945deae1e5ebcad1f4aab98f4719985f7279aa89
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri May 12 15:29:34 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May 22 21:25:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945deae1
games-roguelike/stone-soup: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31007
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-roguelike/stone-soup/files/make-v2.patch | 120 -------------------------
1 file changed, 120 deletions(-)
diff --git a/games-roguelike/stone-soup/files/make-v2.patch b/games-roguelike/stone-soup/files/make-v2.patch
deleted file mode 100644
index 7813fa1aebc1..000000000000
--- a/games-roguelike/stone-soup/files/make-v2.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/Makefile 2023-01-29 16:54:29.445857641 -0600
-+++ b/Makefile 2023-01-29 16:55:57.363274244 -0600
-@@ -92,7 +92,7 @@
- # processes. Not supported for MSYS2/cygwin builds, and will be overridden for
- # mac universal builds. This does not count as a change in build flags.
- ifndef GAME
-- GAME = crawl
-+ GAME = crawl-0.30
- endif
-
- # Disable GNU Make implicit rules and variables. Leaving them enabled will slow
-@@ -206,7 +206,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
-
--HOST := $(shell sh -c 'cc -dumpmachine || echo unknown')
-+HOST :=
- ARCH := $(HOST)
-
- ifdef CROSSHOST
-@@ -509,15 +509,7 @@
- GCC_VER_SUFFIX:=-$(GCC_VER)
- endif
-
--# Attempt to use a full compiler name, to make
--# distcc builds work nicely.
--LMACH := $(shell gcc -dumpmachine)-
--ifeq ($(LMACH),-)
- LMACH :=
--endif
--ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && echo "Yes"),)
--LMACH :=
--endif
-
- ifneq ($(FORCE_CC),)
- GCC := $(FORCE_CC)
-@@ -862,10 +854,11 @@
- COVERAGE=YesPlease
- # current catch2 doesn't support c++11
- STDFLAG = -std=c++14
-+ # tests require this
-+ LIBS += -lgcov
- endif
-
- ifdef HURRY
-- NO_OPTIMIZE=YesPlease
- endif
-
- ifdef COVERAGE
-@@ -1017,7 +1010,7 @@
- INSTALL_FONTS += "$(PROPORTIONAL_FONT)"
- endif
- else
-- SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)")
-+ SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf
- ifneq (,$(SYS_PROPORTIONAL_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
-@@ -1037,7 +1030,7 @@
- INSTALL_FONTS += "$(MONOSPACED_FONT)"
- endif
- else
-- SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)")
-+ SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf
- ifneq (,$(SYS_MONOSPACED_FONT))
- ifeq (,$(COPY_FONTS))
- DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
-@@ -1177,14 +1170,8 @@
-
- ifdef TILES_ANY
- ifndef NO_OPTIMIZE
-- ifneq (,$(shell which advpng))
-- USE_ADVPNG = y
-- else
-- ifneq (,$(shell which pngcrush))
- PNGCRUSH = pngcrush -q -m 113
- PNGCRUSH_LABEL = PNGCRUSH
-- endif
-- endif
- endif
- endif
-
-@@ -1280,9 +1266,8 @@
-
- LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
- SRC_PKG_BASE := stone_soup
--SRC_VERSION := $(shell git describe $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
-+SRC_VERSION := $(shell cat util/release_ver)
- MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
--RECENT_TAG := $(shell git describe --abbrev=0 $(MERGE_BASE))
- WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32)
-
- export SRC_VERSION
-@@ -1644,7 +1629,7 @@
- $(COPY) dat/tiles/stone_soup_icon-512x512.png $(prefix_fp)/share/icons/hicolor/512x512/apps/$(XDG_NAME).png
- $(COPY) dat/tiles/stone_soup_icon.svg $(prefix_fp)/share/icons/hicolor/scalable/apps/$(XDG_NAME).svg
-
--install: all install-data
-+install: install-data
- [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
- $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
- $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
-@@ -1667,7 +1652,6 @@
- +$(MAKE) -C contrib clean
-
- clean-android:
-- $(RM) -r $(datadir_fp)
- +cd android-project && rm -f local.properties && rm -f app/build.gradle
-
- distclean: clean clean-contrib clean-rltiles
-@@ -1899,9 +1883,6 @@
-
- dat/tiles/%.png: $(RLTILES)/%.png
- $(QUIET_PNGCRUSH)$(PNGCRUSH) $< $@
--ifdef USE_ADVPNG
-- $(QUIET_ADVPNG)$(ADVPNG) $@
--endif
-
- clean-rltiles:
- $(RM) $(DESTTILEFILES)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/
@ 2024-05-28 3:06 Erik Mackdanz
0 siblings, 0 replies; 7+ messages in thread
From: Erik Mackdanz @ 2024-05-28 3:06 UTC (permalink / raw
To: gentoo-commits
commit: 1bb6a03d98568d0f01507acfb41d0c47f494b155
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 02:01:35 2024 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Tue May 28 03:06:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb6a03d
games-roguelike/stone-soup: fix doubled slash for install paths for musl
Closes: https://bugs.gentoo.org/929087
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
games-roguelike/stone-soup/files/make-v3.patch | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/games-roguelike/stone-soup/files/make-v3.patch b/games-roguelike/stone-soup/files/make-v3.patch
index 7a1308b36bd6..19a308336cc3 100644
--- a/games-roguelike/stone-soup/files/make-v3.patch
+++ b/games-roguelike/stone-soup/files/make-v3.patch
@@ -1,5 +1,5 @@
---- a/Makefile 2023-04-08 18:39:09.818483802 -0500
-+++ b/Makefile 2023-04-08 18:44:54.509321177 -0500
+--- a/Makefile 2024-05-27 19:43:53.339479403 -0500
++++ b/Makefile 2024-05-27 19:45:08.737841222 -0500
@@ -206,7 +206,7 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
@@ -82,16 +82,27 @@
WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32)
export SRC_VERSION
-@@ -1644,7 +1630,7 @@
+@@ -1645,13 +1631,13 @@
$(COPY) dat/tiles/stone_soup_icon-512x512.png $(prefix_fp)/share/icons/hicolor/512x512/apps/$(XDG_NAME).png
$(COPY) dat/tiles/stone_soup_icon.svg $(prefix_fp)/share/icons/hicolor/scalable/apps/$(XDG_NAME).svg
-install: all install-data
+- [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
+- $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
+- $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
+install: install-data
- [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
- $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
- $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
-@@ -1901,9 +1887,6 @@
++ [ -d $(prefix_fp)$(bin_prefix) ] || mkdir -p $(prefix_fp)$(bin_prefix)
++ $(COPY) $(GAME) $(prefix_fp)$(bin_prefix)/
++ $(STRIP) $(prefix_fp)$(bin_prefix)/$(GAME)
+ ifeq ($(USE_DGAMELAUNCH),)
+- $(CHOWN) $(INSTALL_UGRP) $(prefix_fp)/$(bin_prefix)/$(GAME) || true
+- $(CHMOD) $(MCHMOD) $(prefix_fp)/$(bin_prefix)/$(GAME) || true
++ $(CHOWN) $(INSTALL_UGRP) $(prefix_fp)$(bin_prefix)/$(GAME) || true
++ $(CHMOD) $(MCHMOD) $(prefix_fp)$(bin_prefix)/$(GAME) || true
+ endif
+
+ clean: clean-rltiles clean-webserver clean-android clean-monster clean-catch2 \
+@@ -1905,9 +1891,6 @@
dat/tiles/%.png: $(RLTILES)/%.png
$(QUIET_PNGCRUSH)$(PNGCRUSH) $< $@
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-05-28 3:06 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-23 13:11 [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-05-28 3:06 Erik Mackdanz
2023-05-22 21:27 Conrad Kostecki
2022-07-15 1:32 Sam James
2021-08-27 23:40 Conrad Kostecki
2020-11-20 13:26 Aaron Bauman
2017-10-25 10:34 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox