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
