From owner-svn-ports-all@freebsd.org Sat Aug 29 02:21:47 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 347C73CAB1E; Sat, 29 Aug 2020 02:21:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BdgFl0bT8z3Xsk; Sat, 29 Aug 2020 02:21:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC7361E9DF; Sat, 29 Aug 2020 02:21:46 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07T2Lkh0027823; Sat, 29 Aug 2020 02:21:46 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07T2LkBn027821; Sat, 29 Aug 2020 02:21:46 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202008290221.07T2LkBn027821@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sat, 29 Aug 2020 02:21:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546865 - head/games/megaglest/files X-SVN-Group: ports-head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/games/megaglest/files X-SVN-Commit-Revision: 546865 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Aug 2020 02:21:47 -0000 Author: kevans Date: Sat Aug 29 02:21:46 2020 New Revision: 546865 URL: https://svnweb.freebsd.org/changeset/ports/546865 Log: games/megaglest: fix build with LLVM 11 The fallout here is due to the new -fno-common default in GCC 10 / LLVM 11. PR: 248870 Obtained from: https://github.com/MegaGlest/megaglest-source/issues/197 MFH: 2020Q3 (-fno-common build fix) Added: head/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h (contents, props changed) head/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c (contents, props changed) Added: head/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h Sat Aug 29 02:21:46 2020 (r546865) @@ -0,0 +1,28 @@ +--- source/shared_lib/include/feathery_ftp/ftpTypes.h.orig 2020-08-25 07:39:46 UTC ++++ source/shared_lib/include/feathery_ftp/ftpTypes.h +@@ -69,7 +69,7 @@ typedef uint16_t port_t; + extern "C" { + #endif + +-int VERBOSE_MODE_ENABLED; ++extern int VERBOSE_MODE_ENABLED; + + typedef ip_t (*ftpFindExternalFTPServerIpType)(ip_t clientIp); + typedef void (*ftpAddUPNPPortForwardType)(int internalPort, int externalPort); +@@ -77,11 +77,11 @@ typedef void (*ftpRemoveUPNPPortForwardType)(int inter + typedef int (*ftpIsValidClientType)(ip_t clientIp); + typedef int (*ftpIsClientAllowedToGetFileType)(ip_t clientIp, const char *username, const char *filename); + +-ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; +-ftpAddUPNPPortForwardType ftpAddUPNPPortForward; +-ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; +-ftpIsValidClientType ftpIsValidClient; +-ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; ++extern ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; ++extern ftpAddUPNPPortForwardType ftpAddUPNPPortForward; ++extern ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; ++extern ftpIsValidClientType ftpIsValidClient; ++extern ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; + + #ifdef __cplusplus + } Added: head/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c Sat Aug 29 02:21:46 2020 (r546865) @@ -0,0 +1,16 @@ +--- source/shared_lib/sources/feathery_ftp/ftpRuntime.c.orig 2020-08-25 07:57:08 UTC ++++ source/shared_lib/sources/feathery_ftp/ftpRuntime.c +@@ -30,6 +30,13 @@ + #include "ftp.h" + #include "ftpMessages.h" + ++int VERBOSE_MODE_ENABLED; ++ ++ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; ++ftpAddUPNPPortForwardType ftpAddUPNPPortForward; ++ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; ++ftpIsValidClientType ftpIsValidClient; ++ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; + + /** + * @brief server-sockets that listens for incoming connections