From owner-svn-ports-branches@freebsd.org Fri Aug 10 13:01:53 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB42A106A5E8; Fri, 10 Aug 2018 13:01:52 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 712AA89D6B; Fri, 10 Aug 2018 13:01:52 +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 54003701; Fri, 10 Aug 2018 13:01:52 +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 w7AD1qIk064699; Fri, 10 Aug 2018 13:01:52 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7AD1qYf064687; Fri, 10 Aug 2018 13:01:52 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808101301.w7AD1qYf064687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 10 Aug 2018 13:01:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r476830 - branches/2018Q3/devel/codeblocks-devel/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q3/devel/codeblocks-devel/files X-SVN-Commit-Revision: 476830 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Aug 2018 13:01:53 -0000 Author: jbeich Date: Fri Aug 10 13:01:51 2018 New Revision: 476830 URL: https://svnweb.freebsd.org/changeset/ports/476830 Log: MFH: r476829 devel/codeblocks-devel: unbreak with libc++ 5 In file included from sqvm.cpp:5: In file included from /usr/include/c++/v1/math.h:310: /usr/include/c++/v1/limits:148:85: error: expected expression _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return type();} ^ ../../../../src/include/scripting/squirrel/sqobject.h:99:24: note: expanded from macro 'type' #define type(obj) ((obj)._type) ^ Submitted by: Michael Butler (based on) Approved by: ports-secteam blanket Added: branches/2018Q3/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp - copied unchanged from r476829, head/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp Modified: Directory Properties: branches/2018Q3/ (props changed) Copied: branches/2018Q3/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp (from r476829, head/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp Fri Aug 10 13:01:51 2018 (r476830, copy of r476829, head/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp) @@ -0,0 +1,24 @@ +After https://reviews.llvm.org/rL301060 build fails: + +In file included from sqvm.cpp:5: +In file included from /usr/include/c++/v1/math.h:310: +/usr/include/c++/v1/limits:148:85: error: expected expression + _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return type();} + ^ +../../../../src/include/scripting/squirrel/sqobject.h:99:24: note: expanded from macro 'type' +#define type(obj) ((obj)._type) + ^ + +--- src/sdk/scripting/squirrel/sqvm.cpp.orig 2013-08-18 05:51:11 UTC ++++ src/sdk/scripting/squirrel/sqvm.cpp +@@ -1,9 +1,9 @@ + /* + see copyright notice in squirrel.h + */ +-#include "sqpcheader.h" + #include + #include ++#include "sqpcheader.h" + #include "sqopcodes.h" + #include "sqfuncproto.h" + #include "sqvm.h"