commit: dfe3654f6cb5b56bab656946e9b0027d58f9716d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 22 19:42:28 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Dec 26 16:34:36 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe3654f
games-fps/worldofpadman: drop 1.6-r4 Bug: https://bugs.gentoo.org/963101 Bug: https://bugs.gentoo.org/934048 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> games-fps/worldofpadman/Manifest | 3 - .../files/worldofpadman-1.6-c23.patch | 75 ---------- .../files/worldofpadman-1.6-clang.patch | 152 --------------------- .../files/worldofpadman-1.6-gentoo.patch | 92 ------------- games-fps/worldofpadman/metadata.xml | 3 - .../worldofpadman/worldofpadman-1.6-r4.ebuild | 106 -------------- 6 files changed, 431 deletions(-) diff --git a/games-fps/worldofpadman/Manifest b/games-fps/worldofpadman/Manifest index 287424e4817e..f23849885d1e 100644 --- a/games-fps/worldofpadman/Manifest +++ b/games-fps/worldofpadman/Manifest @@ -1,5 +1,2 @@ -DIST wop-1.5-unified.zip 947290087 BLAKE2B 5fb87cde661882fc095376012d9aca134d6399b4cedd4f3c78b739dd19e126360070278045d74c3318306e17490338111b8621e1c543b46e6bbecfbcd3658675 SHA512 fea0207efadf15afab7001227e27126aef4a673bd478dccb513c3011d0811074b2788083862f07e2f02f1a80ccb57a45ff64de8de155d8f8f7f1ab53ecf2402b -DIST wop-1.5.x-to-1.6-patch-unified.zip 122204892 BLAKE2B a0f9feb04a15ec04dd64dbacdf5a158738d625651b2293bc8b3740067e849f33cdd144bce6afd11914524d89fe4bcfd48dbcbc455e51017b1216439e9bae484a SHA512 a45018bd79e9e23c57bcaf692fa14c323671103558caad6acb794c2990cc5fe9cc8bdbe6a6c8254c4560d81eb59f5e3b9a6800a61b21a15870c4439f7179d936 DIST wop-1.7.0-unified.zip 1200906511 BLAKE2B ef8da8d79d28eae3907954a490679bf436cb96e1f5d7480d874acb62c5f9aba204cc6e48b10ca91ffeefeda04f73c6f70cdb80de6bcd9fa77a9a7eb9c280467c SHA512 1c1f2d88d6a4fe31f9f5a0f7884c6660feedb7c9d12c88f2339036041aa38e1ef4be9580489b2b42a93518c676f0ecdc6ee85be518e8a74970eb11a9d53b58a0 -DIST worldofpadman-1.6-bison-3.patch.xz 14284 BLAKE2B 9083243d12f59067c796c466e98061f601cf8fd07b9dd12718fd22ff1a9694fb57f2c55e204cddbd035209c9b7526f5b7297e53f742cf01a19a3cd0df491c5a8 SHA512 a8d54ed6041a3907e9d5fa2c61046e33022a1a80e10bf18db2140d8dfab42173f2fbdebcadf707f81d21395a574e68a20829170ca2067f1434874ea5856e4cce DIST worldofpadman-1.7.0.tar.gz 119562391 BLAKE2B ee6d23aef07fcdb36e5eac2c07ff97263c33466b1ba53c0c383285a21554b7b3dc7a268020c35098e3df0f9581f0ab9d4b151f4c24448e3f6b5bbb080a40a78e SHA512 c85053c73326893c61b23a2290e46647d2b58e60fa604004ed909c0a6d0ebae3500a3e2a5922fbf556dd12dddc6b58e8a61d27166ba55cc7ff5aded8697c5f9f diff --git a/games-fps/worldofpadman/files/worldofpadman-1.6-c23.patch b/games-fps/worldofpadman/files/worldofpadman-1.6-c23.patch deleted file mode 100644 index b060afcf1641..000000000000 --- a/games-fps/worldofpadman/files/worldofpadman-1.6-c23.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 5604ddf69b47e314150191c56a04b7009d885160 Mon Sep 17 00:00:00 2001 -From: Tim Angus <[email protected]> -Date: Sat, 8 Mar 2025 13:00:48 +0000 -Subject: [PATCH] Rename LCC constexpr function to constantexpr, avoiding C23 - keyword clash - -fixes #349 ---- - code/tools/lcc/src/c.h | 2 +- - code/tools/lcc/src/init.c | 2 +- - code/tools/lcc/src/simp.c | 4 ++-- - code/tools/lcc/src/stmt.c | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/code/tools/lcc/src/c.h b/code/tools/lcc/src/c.h -index d8560a020..2260141e3 100644 ---- a/code/tools/lcc/src/c.h -+++ b/code/tools/lcc/src/c.h -@@ -529,7 +529,7 @@ extern int process(char *); - extern int findfunc(char *, char *); - extern int findcount(char *, int, int); - --extern Tree constexpr(int); -+extern Tree constantexpr(int); - extern int intexpr(int, int); - extern Tree simplify(int, Type, Tree, Tree); - extern int ispow2(unsigned long u); -diff --git a/code/tools/lcc/src/init.c b/code/tools/lcc/src/init.c -index 64d73d319..972abf530 100644 ---- a/code/tools/lcc/src/init.c -+++ b/code/tools/lcc/src/init.c -@@ -190,7 +190,7 @@ static int initstruct(int len, Type ty, int lev) { - return n; - } - --/* initializer - constexpr | { constexpr ( , constexpr )* [ , ] } */ -+/* initializer - constantexpr | { constantexpr ( , constantexpr )* [ , ] } */ - Type initializer(Type ty, int lev) { - int n = 0; - Tree e; -diff --git a/code/tools/lcc/src/simp.c b/code/tools/lcc/src/simp.c -index 9f4e3ecc3..50e83e484 100644 ---- a/code/tools/lcc/src/simp.c -+++ b/code/tools/lcc/src/simp.c -@@ -167,7 +167,7 @@ static int subi(long x, long y, long min, long max, int needconst) { - static int subd(double x, double y, double min, double max, int needconst) { - return addd(x, -y, min, max, needconst); - } --Tree constexpr(int tok) { -+Tree constantexpr(int tok) { - Tree p; - - needconst++; -@@ -177,7 +177,7 @@ Tree constexpr(int tok) { - } - - int intexpr(int tok, int n) { -- Tree p = constexpr(tok); -+ Tree p = constantexpr(tok); - - needconst++; - if (p->op == CNST + I || p->op == CNST + U) -diff --git a/code/tools/lcc/src/stmt.c b/code/tools/lcc/src/stmt.c -index fe83e21f8..a65efc0ec 100644 ---- a/code/tools/lcc/src/stmt.c -+++ b/code/tools/lcc/src/stmt.c -@@ -119,7 +119,7 @@ - static char stop[] = { IF, ID, 0 }; - Tree p; - t = gettok(); -- p = constexpr(0); -+ p = constantexpr(0); - if (generic(p->op) == CNST && isint(p->type)) { - if (swp) { - needconst++; diff --git a/games-fps/worldofpadman/files/worldofpadman-1.6-clang.patch b/games-fps/worldofpadman/files/worldofpadman-1.6-clang.patch deleted file mode 100644 index 101ac5d257a0..000000000000 --- a/games-fps/worldofpadman/files/worldofpadman-1.6-clang.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 675e7a641a67eae2a27e5754e876d08d395c5da8 Mon Sep 17 00:00:00 2001 -From: Tim Angus <[email protected]> -Date: Fri, 21 Oct 2011 22:48:53 +0000 -Subject: [PATCH] * clang support - ---- - Makefile | 2 +- - code/asm/snapvector.c | 6 +++--- - code/botlib/be_ai_chat.c | 2 +- - code/qcommon/common.c | 3 +++ - code/qcommon/q_platform.h | 5 +++++ - code/qcommon/unzip.c | 2 +- - code/renderer/tr_model_iqm.c | 9 +++------ - code/renderer/tr_scene.c | 2 +- - 9 files changed, 19 insertions(+), 14 deletions(-) - -diff --git a/Makefile b/Makefile -index 3bec57714..d0d3ba939 100644 ---- a/Makefile -+++ b/Makefile -@@ -276,7 +276,7 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu")) - endif - - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ -- -pipe -DUSE_ICON -+ -Wno-self-assign -pipe -DUSE_ICON - CLIENT_CFLAGS += $(SDL_CFLAGS) - - OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer -diff --git a/code/asm/snapvector.c b/code/asm/snapvector.c -index a70a1069c..2ba248dfe 100644 ---- a/code/asm/snapvector.c -+++ b/code/asm/snapvector.c -@@ -55,9 +55,9 @@ void qsnapvectorsse(vec3_t vec) - - #define QROUNDX87(src) \ - "flds " src "\n" \ -- "fistp " src "\n" \ -- "fild " src "\n" \ -- "fstp " src "\n" -+ "fistpl " src "\n" \ -+ "fildl " src "\n" \ -+ "fstpl " src "\n" - - void qsnapvectorx87(vec3_t vec) - { -diff --git a/code/botlib/be_ai_chat.c b/code/botlib/be_ai_chat.c -index 10950e9d8..cc489d557 100644 ---- a/code/botlib/be_ai_chat.c -+++ b/code/botlib/be_ai_chat.c -@@ -1173,7 +1173,7 @@ bot_matchpiece_t *BotLoadMatchPieces(source_t *source, char *endtoken) - { - if (token.type == TT_NUMBER && (token.subtype & TT_INTEGER)) - { -- if (token.intvalue < 0 || token.intvalue >= MAX_MATCHVARIABLES) -+ if (token.intvalue >= MAX_MATCHVARIABLES) - { - SourceError(source, "can't have more than %d match variables\n", MAX_MATCHVARIABLES); - FreeSource(source); -diff --git a/code/qcommon/common.c b/code/qcommon/common.c -index 2e39731c0..4f9abfcac 100644 ---- a/code/qcommon/common.c -+++ b/code/qcommon/common.c -@@ -2329,7 +2329,10 @@ A way to force a bus error for development reasons - ================= - */ - static void Com_Crash_f( void ) { -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wnull-dereference" - * ( int * ) 0 = 0x12345678; -+#pragma clang diagnostic pop - } - - /* -diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h -index 8bc2984ca..f2baf1c75 100644 ---- a/code/qcommon/q_platform.h -+++ b/code/qcommon/q_platform.h -@@ -179,7 +179,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - #define OS_STRING "kFreeBSD" - #endif - -+#ifdef __clang__ -+#define ID_INLINE static inline -+#else - #define ID_INLINE inline -+#endif -+ - #define PATH_SEP '/' - - #if defined __i386__ -diff --git a/code/qcommon/unzip.c b/code/qcommon/unzip.c -index b307e98d4..128502ce0 100644 ---- a/code/qcommon/unzip.c -+++ b/code/qcommon/unzip.c -@@ -1250,7 +1250,7 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len) - return UNZ_PARAMERROR; - - -- if ((pfile_in_zip_read_info->read_buffer == NULL)) -+ if (pfile_in_zip_read_info->read_buffer == NULL) - return UNZ_END_OF_LIST_OF_FILE; - if (len==0) - return 0; -diff --git a/code/renderer/tr_model_iqm.c b/code/renderer/tr_model_iqm.c -index cad3aa6fd..98517d559 100644 ---- a/code/renderer/tr_model_iqm.c -+++ b/code/renderer/tr_model_iqm.c -@@ -284,9 +284,9 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na - LL( triangle->vertex[1] ); - LL( triangle->vertex[2] ); - -- if( triangle->vertex[0] < 0 || triangle->vertex[0] > header->num_vertexes || -- triangle->vertex[1] < 0 || triangle->vertex[1] > header->num_vertexes || -- triangle->vertex[2] < 0 || triangle->vertex[2] > header->num_vertexes ) { -+ if( triangle->vertex[0] > header->num_vertexes || -+ triangle->vertex[1] > header->num_vertexes || -+ triangle->vertex[2] > header->num_vertexes ) { - return qfalse; - } - } -@@ -323,9 +323,7 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na - mesh->first_vertex + mesh->num_vertexes > header->num_vertexes || - mesh->first_triangle >= header->num_triangles || - mesh->first_triangle + mesh->num_triangles > header->num_triangles || -- mesh->name < 0 || - mesh->name >= header->num_text || -- mesh->material < 0 || - mesh->material >= header->num_text ) { - return qfalse; - } -@@ -354,7 +352,6 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na - - if( joint->parent < -1 || - joint->parent >= (int)header->num_joints || -- joint->name < 0 || - joint->name >= (int)header->num_text ) { - return qfalse; - } -diff --git a/code/renderer/tr_scene.c b/code/renderer/tr_scene.c -index 34e4141d3..94910d611 100644 ---- a/code/renderer/tr_scene.c -+++ b/code/renderer/tr_scene.c -@@ -219,7 +219,7 @@ void RE_AddRefEntityToScene( const refEntity_t *ent ) { - } - return; - } -- if ( ent->reType < 0 || ent->reType >= RT_MAX_REF_ENTITY_TYPE ) { -+ if ( (int)ent->reType < 0 || ent->reType >= RT_MAX_REF_ENTITY_TYPE ) { - ri.Error( ERR_DROP, "RE_AddRefEntityToScene: bad reType %i", ent->reType ); - } - diff --git a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch deleted file mode 100644 index a8b46098eb76..000000000000 --- a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -344,11 +344,11 @@ - endif - - ifeq ($(USE_CIN_THEORA),1) -- CLIENT_LDFLAGS += -ltheora -+ CLIENT_LIBS += -ltheora - endif - - ifeq ($(USE_CODEC_MP3),1) -- CLIENT_LDFLAGS += -lmad -+ CLIENT_LIBS += -lmad - endif - - ifeq ($(USE_CURL),1) -@@ -380,12 +380,12 @@ - - ifeq ($(USE_CIN_THEORA),1) - BASE_CFLAGS += -DUSE_CIN_THEORA -- CLIENT_LDFLAGS += -ltheora -+ CLIENT_LIBS += -ltheora - endif - - ifeq ($(USE_CODEC_MP3),1) - BASE_CFLAGS += -DUSE_CODEC_MP3 -- CLIENT_LDFLAGS += -lmad -+ CLIENT_LIBS += -lmad - endif - else # ifeq Linux - -@@ -435,12 +435,12 @@ - - ifeq ($(USE_CIN_THEORA),1) - BASE_CFLAGS += -DUSE_CIN_THEORA -- CLIENT_LDFLAGS += -ltheora -+ CLIENT_LIBS += -ltheora - endif - - ifeq ($(USE_CODEC_MP3),1) - BASE_CFLAGS += -DUSE_CODEC_MP3 -- CLIENT_LDFLAGS += -lmad -+ CLIENT_LIBS += -lmad - endif - - BASE_CFLAGS += -D_THREAD_SAFE=1 -@@ -565,7 +565,7 @@ - endif - - ifeq ($(USE_CODEC_MP3),1) -- CLIENT_LDFLAGS += -lmad -+ CLIENT_LIBS += -lmad - endif - - ifeq ($(ARCH),x86) -@@ -662,11 +662,11 @@ - endif - - ifeq ($(USE_CIN_THEORA),1) -- CLIENT_LDFLAGS += -ltheora -+ CLIENT_LIBS += -ltheora - endif - - ifeq ($(USE_CODEC_MP3),1) -- CLIENT_LDFLAGS += -lmad -+ CLIENT_LIBS += -lmad - endif - - # cross-compiling tweaks -@@ -732,11 +732,11 @@ - endif - - ifeq ($(USE_CIN_THEORA),1) -- CLIENT_LDFLAGS += -ltheora -+ CLIENT_LIBS += -ltheora - endif - - ifeq ($(USE_CODEC_MP3),1) -- CLIENT_LDFLAGS += -lmad -+ CLIENT_LIBS += -lmad - endif - - ifeq ($(USE_CURL),1) -@@ -1780,7 +1780,7 @@ - - $(B)/wop-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) - $(echo_cmd) "LD $@" -- $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \ -+ $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \ - -o $@ $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) \ - $(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS) - endif diff --git a/games-fps/worldofpadman/metadata.xml b/games-fps/worldofpadman/metadata.xml index 425817984d07..706fe2f07637 100644 --- a/games-fps/worldofpadman/metadata.xml +++ b/games-fps/worldofpadman/metadata.xml @@ -5,9 +5,6 @@ <email>[email protected]</email> <name>Gentoo Games Project</name> </maintainer> - <use> - <flag name="maps">Install extra maps (PadPack)</flag> - </use> <upstream> <remote-id type="github">PadWorld-Entertainment/worldofpadman</remote-id> <remote-id type="sourceforge">worldofpadman</remote-id> diff --git a/games-fps/worldofpadman/worldofpadman-1.6-r4.ebuild b/games-fps/worldofpadman/worldofpadman-1.6-r4.ebuild deleted file mode 100644 index 748a59b85526..000000000000 --- a/games-fps/worldofpadman/worldofpadman-1.6-r4.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop - -DESCRIPTION="Cartoon style multiplayer first-person shooter" -HOMEPAGE="https://worldofpadman.net/"; -SRC_URI="https://downloads.sourceforge.net/${PN}/wop-1.5-unified.zip - https://downloads.sourceforge.net/${PN}/wop-1.5.x-to-1.6-patch-unified.zip - https://dev.gentoo.org/~asturm/distfiles/${P}-bison-3.patch.xz"; -S="${WORKDIR}/${P}_svn2178-src" - -LICENSE="GPL-2 worldofpadman" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+curl dedicated maps +openal +theora +vorbis" - -RDEPEND=" - virtual/zlib:= - !dedicated? ( - media-libs/libjpeg-turbo - media-libs/libsdl[joystick,opengl,video,X] - >=media-libs/speex-1.2.0 - media-libs/speexdsp - virtual/glu - virtual/opengl - curl? ( net-misc/curl ) - openal? ( media-libs/openal ) - theora? ( - media-libs/libogg - media-libs/libtheora:= - ) - vorbis? ( media-libs/libvorbis ) - ) -" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip" - -DOCS=( id-readme.txt IOQ3-README voip-readme.txt ../XTRAS/{changelog.txt,sounds_readme.txt} ) - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${WORKDIR}"/${P}-bison-3.patch # bug 921029, in 1.6.1 - "${FILESDIR}"/${P}-clang.patch # bug 944329, in 1.6.0 - "${FILESDIR}"/${P}-c23.patch # bug 944329, git main -) - -src_unpack() { - unpack ${A} - unzip XTRAS/"editing files"/${P}-src.zip -} - -src_prepare() { - default - sed -i \ - -e 's:JPEG_LIB_VERSION < 80:JPEG_LIB_VERSION < 62:' \ - code/renderer/tr_image_jpg.c || die #479652 -} - -src_compile() { - local arch - - if use amd64 ; then - arch=x86_64 - elif use x86 ; then - arch=i386 - fi - - local myemakeargs=( - V=1 - ARCH=${arch} - BUILD_CLIENT=$(use dedicated && echo 0) - DEFAULT_BASEDIR=/usr/share/${PN} - OPTIMIZE= - USE_CURL=$(usex curl 1 0) - USE_CURL_DLOPEN=0 - USE_OPENAL=$(usex openal 1 0) - USE_OPENAL_DLOPEN=0 - USE_CODEC_VORBIS=$(usex vorbis 1 0) - USE_CIN_THEORA=$(usex theora 1 0) - USE_RENDERER_DLOPEN=0 - USE_INTERNAL_ZLIB=0 - USE_INTERNAL_JPEG=0 - USE_INTERNAL_SPEEX=0 - ) - - emake ${myemakeargs[@]} -} - -src_install() { - newbin build/release-*/wopded.* ${PN}-ded - - if ! use dedicated ; then - newbin build/release-*/wop.* ${PN} - newicon misc/quake3.png ${PN}.png - make_desktop_entry ${PN} "World of Padman" - fi - - insinto /usr/share/${PN} - doins -r ../wop - - local HTML_DOCS=( ../XTRAS/{readme,readme.html} ) - einstalldocs -}
