Date: Thu, 1 Mar 2018 12:09:48 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463298 - in head/math/ogdf: . files Message-ID: <201803011209.w21C9mV2024856@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Thu Mar 1 12:09:48 2018 New Revision: 463298 URL: https://svnweb.freebsd.org/changeset/ports/463298 Log: math/ogdf: unbreak build with Clang 6 (C++14 by default) The bundled version of CoinMP required the same patches as those applied to the port math/coinmp, so the patches were copied from there. Submitted by: jbeich (via commit r458136) Reported by: antoine (via bug 224669) Added: head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp - copied, changed from r463291, head/math/coinmp/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp - copied, changed from r463291, head/math/coinmp/files/patch-Clp_src_ClpModel.cpp head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp - copied, changed from r463291, head/math/coinmp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp Modified: head/math/ogdf/Makefile Modified: head/math/ogdf/Makefile ============================================================================== --- head/math/ogdf/Makefile Thu Mar 1 11:35:27 2018 (r463297) +++ head/math/ogdf/Makefile Thu Mar 1 12:09:48 2018 (r463298) @@ -3,6 +3,7 @@ PORTNAME= ogdf PORTVERSION= 2015.05 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.ogdf.net/lib/exe/fetch.php/tech: DISTNAME= ${PORTNAME}.v${PORTVERSION} Copied and modified: head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp (from r463291, head/math/coinmp/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp) ============================================================================== --- head/math/coinmp/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp Thu Mar 1 10:22:46 2018 (r463291, copy source) +++ head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp Thu Mar 1 12:09:48 2018 (r463298) @@ -4,8 +4,8 @@ In file included from ./CglLandPSimplex.hpp:31: cuts_.resize(i, reinterpret_cast<OsiRowCut *> (NULL)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ---- Cgl/src/CglLandP/CglLandPUtils.hpp.orig 2013-04-06 20:39:53 UTC -+++ Cgl/src/CglLandP/CglLandPUtils.hpp +--- include/coin/CglLandPUtils.hpp.orig 2015-05-29 15:36:11 UTC ++++ include/coin/CglLandPUtils.hpp @@ -85,7 +85,7 @@ struct Cuts /** resize vector.*/ void resize(unsigned int i) Copied and modified: head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp (from r463291, head/math/coinmp/files/patch-Clp_src_ClpModel.cpp) ============================================================================== --- head/math/coinmp/files/patch-Clp_src_ClpModel.cpp Thu Mar 1 10:22:46 2018 (r463291, copy source) +++ head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp Thu Mar 1 12:09:48 2018 (r463298) @@ -2,9 +2,9 @@ ClpModel.cpp:3848:24: error: reinterpret_cast from 'nu reinterpret_cast<const char*> (NULL) /*integrality*/, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ---- Clp/src/ClpModel.cpp.orig 2015-03-19 08:09:18 UTC -+++ Clp/src/ClpModel.cpp -@@ -3845,7 +3845,7 @@ ClpModel::writeMps(const char *filename, +--- src/coin/Clp/ClpModel.cpp.orig 2015-05-29 15:36:41 UTC ++++ src/coin/Clp/ClpModel.cpp +@@ -3619,7 +3619,7 @@ ClpModel::writeMps(const char *filename, writer.setMpsData(*(matrix_->getPackedMatrix()), COIN_DBL_MAX, getColLower(), getColUpper(), objective, Copied and modified: head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp (from r463291, head/math/coinmp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp) ============================================================================== --- head/math/coinmp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp Thu Mar 1 10:22:46 2018 (r463291, copy source) +++ head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp Thu Mar 1 12:09:48 2018 (r463298) @@ -2,12 +2,12 @@ OsiClpSolverInterface.cpp:1451:50: error: reinterpret_ messagesPointer->setDetailMessages(100,10000,reinterpret_cast<int *> (NULL)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ---- Clp/src/OsiClp/OsiClpSolverInterface.cpp.orig 2015-07-14 13:16:13 UTC -+++ Clp/src/OsiClp/OsiClpSolverInterface.cpp -@@ -1448,7 +1448,7 @@ OsiClpSolverInterface::setupForRepeatedUse(int senseOf +--- src/coin/OsiClp/OsiClpSolverInterface.cpp.orig 2015-05-29 15:36:45 UTC ++++ src/coin/OsiClp/OsiClpSolverInterface.cpp +@@ -1422,7 +1422,7 @@ OsiClpSolverInterface::setupForRepeatedUse(int senseOf if (stopPrinting) { CoinMessages * messagesPointer = modelPtr_->messagesPointer(); - // won't even build messages + // won't even build messages - messagesPointer->setDetailMessages(100,10000,reinterpret_cast<int *> (NULL)); + messagesPointer->setDetailMessages(100,10000,static_cast<int *> (NULL)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803011209.w21C9mV2024856>