Date: Mon, 31 Aug 2020 04:00:21 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547148 - in head/games: q2pro qstat quetoo/files r1q2/files Message-ID: <202008310400.07V40LVQ085072@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Aug 31 04:00:21 2020 New Revision: 547148 URL: https://svnweb.freebsd.org/changeset/ports/547148 Log: Ensure that there is only one variable definition per each object, as the C (and C++) standards mandated for years and compilers started to enforce as of recently (Clang 11, GCC 10). Reported by: pkg-fallout Added: head/games/r1q2/files/patch-client_client.h (contents, props changed) head/games/r1q2/files/patch-client_le__util.c (contents, props changed) Modified: head/games/q2pro/Makefile head/games/qstat/Makefile head/games/quetoo/files/patch-clang-fixes Modified: head/games/q2pro/Makefile ============================================================================== --- head/games/q2pro/Makefile Mon Aug 31 03:57:11 2020 (r547147) +++ head/games/q2pro/Makefile Mon Aug 31 04:00:21 2020 (r547148) @@ -95,6 +95,11 @@ post-patch: ${WRKSRC}/ref_shared/r_images.c @${REINPLACE_CMD} -E 's|[[:digit:]]+|${SVN_REV}|' \ ${WRKSRC}/include/version.h +# Fix the build with -fno-common (for Clang 11 and GCC 10) + @${REINPLACE_CMD} -e '/^unsigned[[:blank:]]*d_8to24table/,+1d' \ + ${WRKSRC}/ref_soft/sw_main.c + @${REINPLACE_CMD} -e '/\*cl_paused/,+1d' \ + ${WRKSRC}/source/cl_null.c do-install: @${MKDIR} ${STAGEDIR}${LIBDIR}/baseq2 Modified: head/games/qstat/Makefile ============================================================================== --- head/games/qstat/Makefile Mon Aug 31 03:57:11 2020 (r547147) +++ head/games/qstat/Makefile Mon Aug 31 04:00:21 2020 (r547148) @@ -30,7 +30,9 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|qstat\.cfg|&.sample|' ${WRKSRC}/Makefile.am - @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|' ${WRKSRC}/qstat.c + @${REINPLACE_CMD} -e 's|__hpux|${OPSYS}|' ${WRKSRC}/qstat.c + @${ECHO_CMD} 'int do_dump = 0;' >> ${WRKSRC}/qstat.c + @${REINPLACE_CMD} -e 's|^int do_dump|extern &|' ${WRKSRC}/debug.h do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/info ${STAGEDIR}${DOCSDIR}/template Modified: head/games/quetoo/files/patch-clang-fixes ============================================================================== --- head/games/quetoo/files/patch-clang-fixes Mon Aug 31 03:57:11 2020 (r547147) +++ head/games/quetoo/files/patch-clang-fixes Mon Aug 31 04:00:21 2020 (r547148) @@ -11,6 +11,25 @@ --- src/cl_main.c.orig 2007-12-28 07:25:47.000000000 +0800 +++ src/cl_main.c 2013-09-05 14:53:30.000000000 +0800 +@@ -23,7 +23,7 @@ + + #include "client.h" + +-cvar_t *rcon_password; ++extern cvar_t *rcon_password; + cvar_t *rcon_address; + + cvar_t *cl_noskins; +@@ -43,9 +43,6 @@ cvar_t *cl_shownet; + cvar_t *cl_showmiss; + cvar_t *cl_showclamp; + +-cvar_t *paused; +-cvar_t *timedemo; +- + cvar_t *cl_vwep; + + cvar_t *cl_railtrailcolor; @@ -691,7 +691,7 @@ void CL_Ping_f(void){ } Added: head/games/r1q2/files/patch-client_client.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/r1q2/files/patch-client_client.h Mon Aug 31 04:00:21 2020 (r547148) @@ -0,0 +1,11 @@ +--- client/client.h.orig 2010-05-09 09:20:28 UTC ++++ client/client.h +@@ -136,8 +136,6 @@ struct localent_s + //yummmm splash gibs death blood + #define MAX_LOCAL_ENTS 1024 + +-localent_t cl_localents[MAX_LOCAL_ENTS]; +- + void Le_Reset (void); + + #ifdef USE_CURL Added: head/games/r1q2/files/patch-client_le__util.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/r1q2/files/patch-client_le__util.c Mon Aug 31 04:00:21 2020 (r547148) @@ -0,0 +1,10 @@ +--- client/le_util.c.orig 2005-01-12 05:19:36 UTC ++++ client/le_util.c +@@ -4,6 +4,7 @@ + + int localent_count = 0; + ++localent_t cl_localents[MAX_LOCAL_ENTS]; + cvar_t *cl_lents; + + void LE_RunEntity (localent_t *ent);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008310400.07V40LVQ085072>