FreeBSD Bugzilla – Attachment 149599 Details for
Bug 195173
cad/gmsh: upgrade to 2.8.5 and chase cad/opencascade
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to upgrade
gmsh.diff (text/plain), 5.61 KB, created by
Thierry Thomas
on 2014-11-19 18:40:47 UTC
(
hide
)
Description:
Patch to upgrade
Filename:
MIME Type:
Creator:
Thierry Thomas
Created:
2014-11-19 18:40:47 UTC
Size:
5.61 KB
patch
obsolete
>Index: cad/gmsh/Makefile >=================================================================== >--- cad/gmsh/Makefile (revision 372638) >+++ cad/gmsh/Makefile (working copy) >@@ -2,8 +2,7 @@ > # $FreeBSD$ > > PORTNAME= gmsh >-PORTVERSION= 2.8.4 >-PORTREVISION= 5 >+PORTVERSION= 2.8.5 > CATEGORIES= cad > MASTER_SITES= http://www.geuz.org/gmsh/src/ \ > http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/ >@@ -45,7 +44,7 @@ > .if !defined(WITHOUT_SHARED_LIB) > CMAKE_ARGS+= -DENABLE_BUILD_SHARED=ON > ALL_TARGET+= shared >-PLIST_SUB+= SHARED_LIB="" >+PLIST_SUB+= SHARED_LIB="" VER=${PORTVERSION} VE=${PORTVERSION:R} > USE_LDCONFIG= yes > .else > PLIST_SUB+= SHARED_LIB="@comment " >@@ -193,7 +192,7 @@ > @${ECHO} "because Taucs requires Metis." >> ${PKGMESSAGE} > .endif > >-post-patch: >+pre-configure: > ${REINPLACE_CMD} -e s+share/doc/gmsh+${DOCSDIR_REL}+ \ > -e s+share/man/man1+man/man1+ ${WRKSRC}/CMakeLists.txt > >Index: cad/gmsh/distinfo >=================================================================== >--- cad/gmsh/distinfo (revision 372638) >+++ cad/gmsh/distinfo (working copy) >@@ -1,4 +1,4 @@ >-SHA256 (gmsh/gmsh-2.8.4-source.tgz) = 199e27cba3258976eddfd7767560ec52382702076bca5d4bcf067124e6f6624b >-SIZE (gmsh/gmsh-2.8.4-source.tgz) = 11866204 >+SHA256 (gmsh/gmsh-2.8.5-source.tgz) = 0ea2fdbcc9ba44c90e03dbc553e7f0ddb2f9044173ac34db123db4fe65af3130 >+SIZE (gmsh/gmsh-2.8.5-source.tgz) = 8665258 > SHA256 (gmsh/manual.pdf) = 8a682ee7f02380f52d5efdde5f9f9d8e927a4f4eb29287a878c1016225568911 > SIZE (gmsh/manual.pdf) = 206713 >Index: cad/gmsh/files/patch-CMakeLists.txt >=================================================================== >--- cad/gmsh/files/patch-CMakeLists.txt (revision 372638) >+++ cad/gmsh/files/patch-CMakeLists.txt (working copy) >@@ -1,6 +1,6 @@ >---- CMakeLists.txt.orig 2013-09-27 12:59:06.000000000 +0000 >-+++ CMakeLists.txt 2013-09-27 17:45:20.000000000 +0000 >-@@ -84,6 +84,7 @@ >+--- CMakeLists.txt.orig 2014-07-09 09:27:58.000000000 +0200 >++++ CMakeLists.txt 2014-11-17 23:45:13.000000000 +0100 >+@@ -89,6 +89,7 @@ > opt(VORO3D "Enable Voro3D (for hex meshing, experimental)" ${DEFAULT}) > opt(WRAP_JAVA "Enable generation of Java wrappers (experimental)" OFF) > opt(WRAP_PYTHON "Enable generation of Python wrappers" OFF) >@@ -8,7 +8,16 @@ > > set(GMSH_MAJOR_VERSION 2) > set(GMSH_MINOR_VERSION 8) >-@@ -1318,7 +1319,7 @@ >+@@ -1017,7 +1018,7 @@ >+ # ModelingData >+ TKBRep TKGeomBase TKG3d TKG2d >+ # FoundationClasses >+- TKAdvTools TKMath TKernel) >++ TKMath TKernel) >+ if(ENABLE_SGEOM) >+ set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED} >+ # For SGEOM >+@@ -1450,7 +1451,7 @@ > set(GMSH_BIN bin) > set(GMSH_LIB lib) > set(GMSH_DOC share/doc/gmsh) >@@ -17,7 +26,7 @@ > endif(ENABLE_OS_SPECIFIC_INSTALL) > if(CYGWIN) > unix2dos(GMSH_API) >-@@ -1339,7 +1340,7 @@ >+@@ -1471,7 +1472,7 @@ > set(GMSH_BIN bin) > set(GMSH_LIB lib) > set(GMSH_DOC share/doc/gmsh) >@@ -26,7 +35,7 @@ > endif(WIN32 OR CYGWIN) > > # mark targets as optional so we can install them separately if needed >-@@ -1394,11 +1395,13 @@ >+@@ -1524,11 +1525,13 @@ > if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) > install(FILES ${GMSH_API} DESTINATION include/gmsh) > endif(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) >Index: cad/gmsh/files/patch-Geo_OCCFace.cpp >=================================================================== >--- cad/gmsh/files/patch-Geo_OCCFace.cpp (revision 0) >+++ cad/gmsh/files/patch-Geo_OCCFace.cpp (working copy) >@@ -0,0 +1,24 @@ >+--- Geo/OCCFace.cpp.orig 2014-02-07 08:31:21.000000000 +0100 >++++ Geo/OCCFace.cpp 2014-11-18 23:35:55.000000000 +0100 >+@@ -28,7 +28,11 @@ >+ #include <BRepMesh_FastDiscret.hxx> >+ >+ #if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6) >+-#include <BOPInt_Context.hxx> >++# if (OCC_VERSION_MINOR < 8) >++# include <BOPInt_Context.hxx> >++# else >++# include <IntTools_Context.hxx> >++# endif >+ #include <BOPTools_AlgoTools2D.hxx> >+ #include <BOPTools_AlgoTools.hxx> >+ #else >+@@ -455,7 +459,7 @@ >+ void OCCFace::replaceEdgesInternal(std::list<GEdge*> &new_edges) >+ { >+ >+-#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6) >++#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6) && (OCC_VERSION_MINOR < 8) >+ Handle(BOPInt_Context) myContext = new BOPInt_Context; >+ #elif defined(OCC_VERSION_HEX) && OCC_VERSION_HEX >= 0x060503 >+ Handle(IntTools_Context) myContext = new IntTools_Context; > >Property changes on: cad/gmsh/files/patch-Geo_OCCFace.cpp >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: cad/gmsh/pkg-plist >=================================================================== >--- cad/gmsh/pkg-plist (revision 372638) >+++ cad/gmsh/pkg-plist (working copy) >@@ -2,8 +2,8 @@ > bin/onelab.py > %%STATIC_LIB%%lib/libGmsh.a > %%SHARED_LIB%%lib/libGmsh.so >-%%SHARED_LIB%%lib/libGmsh.so.2.8 >-%%SHARED_LIB%%lib/libGmsh.so.2.8.4 >+%%SHARED_LIB%%lib/libGmsh.so.%%VE%% >+%%SHARED_LIB%%lib/libGmsh.so.%%VER%% > include/gmsh/CGNSOptions.h > include/gmsh/Cell.h > include/gmsh/CellComplex.h >@@ -50,6 +50,7 @@ > include/gmsh/MTriangle.h > include/gmsh/MVertex.h > include/gmsh/MVertexBoundaryLayerData.h >+include/gmsh/MetricBasis.h > include/gmsh/Numeric.h > include/gmsh/OS.h > include/gmsh/Octree.h >Index: cad/gmsh-occ/Makefile >=================================================================== >--- cad/gmsh-occ/Makefile (revision 372638) >+++ cad/gmsh-occ/Makefile (working copy) >@@ -2,7 +2,6 @@ > # $FreeBSD$ > > PORTNAME= gmsh >-PORTREVISION= 3 > CATEGORIES= cad > PKGNAMESUFFIX= -occ >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 195173
: 149599