From owner-svn-ports-all@freebsd.org Wed Feb 26 18:13:50 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 2B55C25FAE2; Wed, 26 Feb 2020 18:13:50 +0000 (UTC) (envelope-from jbeich@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) server-signature RSA-PSS (4096 bits) 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 48SP7d3K2Qz4L8b; Wed, 26 Feb 2020 18:13:49 +0000 (UTC) (envelope-from jbeich@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 5C9E1399F; Wed, 26 Feb 2020 18:13:49 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01QIDnmY097421; Wed, 26 Feb 2020 18:13:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01QIDnYk097420; Wed, 26 Feb 2020 18:13:49 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202002261813.01QIDnYk097420@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 26 Feb 2020 18:13:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527180 - head/games/gzdoom/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/games/gzdoom/files X-SVN-Commit-Revision: 527180 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.29 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: Wed, 26 Feb 2020 18:13:50 -0000 Author: jbeich Date: Wed Feb 26 18:13:48 2020 New Revision: 527180 URL: https://svnweb.freebsd.org/changeset/ports/527180 Log: games/gzdoom: unbreak with Clang 10 In file included from MachineIndependent/glslang.y:60: In file included from glslang/glslang/MachineIndependent/SymbolTable.h:68: In file included from glslang/glslang/MachineIndependent/../Include/Common.h:107: glslang/glslang/MachineIndependent/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator' void setAllocator(TPoolAllocator* a) { allocator = *a; } ~~~~~~~~~ ^ ~~ glslang/glslang/MachineIndependent/../Include/PoolAlloc.h:244:21: note: declared private here TPoolAllocator& operator=(const TPoolAllocator&); // don't allow assignment operator ^ Reported by: antoine (via bug 244251 exp-run) Added: head/games/gzdoom/files/patch-glslang_glslang_Include_PoolAlloc.h (contents, props changed) Added: head/games/gzdoom/files/patch-glslang_glslang_Include_PoolAlloc.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/gzdoom/files/patch-glslang_glslang_Include_PoolAlloc.h Wed Feb 26 18:13:48 2020 (r527180) @@ -0,0 +1,22 @@ +https://github.com/KhronosGroup/glslang/commit/24b3e8384e93 + +In file included from MachineIndependent/glslang.y:60: +In file included from glslang/glslang/MachineIndependent/SymbolTable.h:68: +In file included from glslang/glslang/MachineIndependent/../Include/Common.h:107: +glslang/glslang/MachineIndependent/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator' + void setAllocator(TPoolAllocator* a) { allocator = *a; } + ~~~~~~~~~ ^ ~~ +glslang/glslang/MachineIndependent/../Include/PoolAlloc.h:244:21: note: declared private here + TPoolAllocator& operator=(const TPoolAllocator&); // don't allow assignment operator + ^ + +--- glslang/glslang/Include/PoolAlloc.h.orig 2019-05-04 19:58:35 UTC ++++ glslang/glslang/Include/PoolAlloc.h +@@ -304,7 +304,6 @@ class pool_allocator { (public) + size_type max_size() const { return static_cast(-1) / sizeof(T); } + size_type max_size(int size) const { return static_cast(-1) / size; } + +- void setAllocator(TPoolAllocator* a) { allocator = *a; } + TPoolAllocator& getAllocator() const { return allocator; } + + protected: