pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gzdoom: fix distinfo and PLIST



Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sat Jul 22 23:06:22 2023 +0200
Changeset:	62bd625752507c424d06661c76f9a71ab4b47c88

Modified Files:
	gzdoom/PLIST
	gzdoom/distinfo
Removed Files:
	gzdoom/patches/patch-src_d__main.cpp

Log Message:
gzdoom: fix distinfo and PLIST

patches/patch-src_d__main.cpp is not used anymore, and was
not listed in distinfo.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=62bd625752507c424d06661c76f9a71ab4b47c88

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gzdoom/PLIST                         |  6 ------
 gzdoom/distinfo                      |  2 ++
 gzdoom/patches/patch-src_d__main.cpp | 24 ------------------------
 3 files changed, 2 insertions(+), 30 deletions(-)

diffs:
diff --git a/gzdoom/PLIST b/gzdoom/PLIST
index f31d5c215f..a1545f0ab1 100644
--- a/gzdoom/PLIST
+++ b/gzdoom/PLIST
@@ -13,13 +13,7 @@ share/doc/gzdoom/licenses/lgpl.txt
 share/doc/gzdoom/rh-log.txt
 share/doc/gzdoom/skins.txt
 share/games/doom/brightmaps.pk3
-share/games/doom/fm_banks/GENMIDI-readme.txt
 share/games/doom/fm_banks/GENMIDI.GS.wopl
-share/games/doom/fm_banks/fmmidi-readme.txt
-share/games/doom/fm_banks/fmmidi.wopn
-share/games/doom/fm_banks/gems-fmlib-gmize-readme.txt
-share/games/doom/fm_banks/gems-fmlib-gmize.wopn
-share/games/doom/fm_banks/gs-by-papiezak-and-sneakernets-readme.txt
 share/games/doom/fm_banks/gs-by-papiezak-and-sneakernets.wopn
 share/games/doom/game_support.pk3
 share/games/doom/game_widescreen_gfx.pk3
diff --git a/gzdoom/distinfo b/gzdoom/distinfo
index 1ce3900351..d6e05675c4 100644
--- a/gzdoom/distinfo
+++ b/gzdoom/distinfo
@@ -3,4 +3,6 @@ $NetBSD$
 BLAKE2s (gzdoom/g4.10.0.tar.gz) = 178ae2f7f527c8523141b340866718055286a5248c52dbb1ac7d4f79993d8057
 SHA512 (gzdoom/g4.10.0.tar.gz) = fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
 Size (gzdoom/g4.10.0.tar.gz) = 24319337 bytes
+SHA1 (patch-src_common_console_c__console.h) = 887fa404253f20e92f798120e4a1dcf9fed4c4c7
+SHA1 (patch-src_common_platform_posix_sdl_i__system.cpp) = fef2eb02c0a30bfe9b9a1b7b55b0bb1d9b45c3ed
 SHA1 (patch-src_gameconfigfile.cpp) = 4c30c413e7d4bc3b25e940f8d5cb7e5dabbc8092
diff --git a/gzdoom/patches/patch-src_d__main.cpp b/gzdoom/patches/patch-src_d__main.cpp
deleted file mode 100644
index bae763470d..0000000000
--- a/gzdoom/patches/patch-src_d__main.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Fix "Cannot find gzdoom.pk3" -- https://github.com/ZDoom/gzdoom/pull/1665
-
---- src/d_main.cpp.orig	2022-07-04 08:31:18.000000000 +0000
-+++ src/d_main.cpp
-@@ -3535,6 +3535,8 @@ static int D_DoomMain_Internal (void)
- 	std::set_new_handler(NewFailure);
- 	const char *batchout = Args->CheckValue("-errorlog");
- 	
-+	D_DoomInit();
-+
- 	// [RH] Make sure zdoom.pk3 is always loaded,
- 	// as it contains magic stuff we need.
- 	wad = BaseFileSearch(BASEWAD, NULL, true, GameConfig);
-@@ -3568,8 +3570,6 @@ static int D_DoomMain_Internal (void)
- 
- 	if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME, GetVersionString());
- 
--	D_DoomInit();
--
- 	extern void D_ConfirmSendStats();
- 	D_ConfirmSendStats();
- 


Home | Main Index | Thread Index | Old Index