From 24c53d42e0294f4f6e36fbb051891af86c9ae503 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 23 May 2023 02:57:53 +0100 Subject: gentoo auto-resync : 23:05:2023 - 02:57:53 --- games-roguelike/stone-soup/Manifest | 1 - games-roguelike/stone-soup/files/make-v2.patch | 120 ------------------------- 2 files changed, 121 deletions(-) delete mode 100644 games-roguelike/stone-soup/files/make-v2.patch (limited to 'games-roguelike/stone-soup') diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest index dcea930468d7..db7d38c51947 100644 --- a/games-roguelike/stone-soup/Manifest +++ b/games-roguelike/stone-soup/Manifest @@ -1,5 +1,4 @@ AUX make-advpng.patch 501 BLAKE2B 06ea1fdc6f9fa9c26f39493c074213c517434e376934faff2231a5600715af9122fb7cbdc00a6c1c8b1301e5a22f11493bd72de42d94c8d802f680f0de338ae4 SHA512 28f6bfcdc14c92ce6ff041a93d156af7a0e45609a6c97af0e3ec749e86d9b33e9a2aa46f664c69173ad08c1cc0985c4121d452954b8ffe7f56558fd529f503be -AUX make-v2.patch 3601 BLAKE2B 814d540dbd568282e1abe325cda8584b267454330b80d03897a7d34c0b45a213f1912ab8088de85bf1ae63d6252ddade505f14e6e87db414956296a893958370 SHA512 ec61eb094da2a9f13300ef8fd6fe2e56fd3abfe12318c6ba580da2999f99364d53b3dbe730b4577d3825ce533adfa0328b30c8e810e66a7dfde9b7ed1f8cf0f3 AUX make-v3.patch 3386 BLAKE2B d9956c02aed7da7eb66f0e4aa96a2821aee0f536484bb5de365135691ab469048cd903018f2c2452d035ce39e89ad4517a4d6569d35a965bd53fedcb6ddd7bc4 SHA512 fc0e27f348f1fbda3344fafd8674f1d6b0085b584973c53ef1ce3564d82e507dcf0ac3baa3f7d2547dc293a7c6d4714b4bffd6b10f25ec5a821c5b4bda0362fe AUX make.patch 3190 BLAKE2B 82322638290720242d1bfbf9995dce61e2ba857716cb233297ec4e5f32ef1cf9c88730a17b8dbf78897c635660a5beea9f88da51d0dcdf10f2490609bc7e4b62 SHA512 15fc91a939997b67249638c87071a1c7e6d7b5ed2625e14ca48cc7721ca0216d6b4590da40070077b31d9380ed96626ec7c80c780b1f9a8bba74a2d4800fb1ed AUX rltiles-make.patch 1704 BLAKE2B b740e8b305e9071a9b024589e4ef6cb4fd088d4424e35ab164f920ec0cf06b94a46b19ac7d223d5eac3ca92bb2565efea00731a556e429056041cddb5658988a SHA512 378bea1e53477c881b93f824e45231b13c34318e34cf1413325a642d2d4f7f16c654b00584bec552238e1e2ec6e8046b67ea7cbd5aa4cb6ecf9fb6a70d600dd9 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) -- cgit v1.2.3