[gmsh] Update to 2.8.5, fix doc requires
Sandro Mani
smani at fedoraproject.org
Wed Jul 23 14:03:07 UTC 2014
commit 8e301b6d20121db296d38d0b4ef559ab68fecac9
Author: Sandro Mani <manisandro at gmail.com>
Date: Wed Jul 23 16:02:11 2014 +0200
Update to 2.8.5, fix doc requires
.gitignore | 1 +
gmsh.spec | 14 ++++---
gmsh_install-dirs.patch | 36 +++++++++++++++++---
gmsh_onelab-install-dir.patch | 32 ------------------
gmsh_sign.patch | 72 ++++++++++++++++++++--------------------
gmsh_tetgen.patch | 27 +++------------
gmsh_unbundle.patch | 50 ++++++++++++++--------------
sources | 2 +-
8 files changed, 107 insertions(+), 127 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b288d2c..aa46b75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/gmsh-2.8.4-source-fedora.tar.gz
+/gmsh-2.8.5-source-fedora.tar.gz
diff --git a/gmsh.spec b/gmsh.spec
index 86500db..4925bc2 100644
--- a/gmsh.spec
+++ b/gmsh.spec
@@ -1,7 +1,7 @@
Name: gmsh
Summary: A three-dimensional finite element mesh generator
-Version: 2.8.4
-Release: 4%{?dist}
+Version: 2.8.5
+Release: 1%{?dist}
License: GPLv2+
URL: http://geuz.org/gmsh/
@@ -20,8 +20,6 @@ Patch2: gmsh_sign.patch
Patch3: gmsh_tetgen.patch
# Installation paths fixup, allow setting them from command line for MPI compilation
Patch4: gmsh_install-dirs.patch
-# Install onelab.py in %%{python2_sitelib}
-Patch5: gmsh_onelab-install-dir.patch
BuildRequires: alglib-devel
BuildRequires: ann-devel
@@ -92,8 +90,7 @@ Header files for development with %{name}.
%package doc
Summary: Documentation, demos and tutorials for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description doc
@@ -359,6 +356,11 @@ fi
%changelog
+* Wed Jul 23 2014 Sandro Mani <manisandro at gmail.com> - 2.8.5-1
+- Update to 2.8.5
+- Fix -doc requires
+- Rebase patches
+
* Tue Jul 22 2014 Sandro Mani <manisandro at gmail.com> - 2.8.4-4
- Rename gmsh-demos to gmsh-doc
- Fix scriptlets for gmsh-common
diff --git a/gmsh_install-dirs.patch b/gmsh_install-dirs.patch
index d6a79a6..aba921e 100644
--- a/gmsh_install-dirs.patch
+++ b/gmsh_install-dirs.patch
@@ -1,7 +1,7 @@
-diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
---- gmsh-2.8.4-source/CMakeLists.txt 2014-02-07 08:31:23.000000000 +0100
-+++ gmsh-2.8.4-source-new/CMakeLists.txt 2014-06-19 19:26:21.043447771 +0200
-@@ -1428,8 +1428,9 @@ elseif(APPLE AND ENABLE_OS_SPECIFIC_INST
+diff -rupN gmsh-2.8.5-source/CMakeLists.txt gmsh-2.8.5-source-new/CMakeLists.txt
+--- gmsh-2.8.5-source/CMakeLists.txt 2014-07-23 15:59:53.796858258 +0200
++++ gmsh-2.8.5-source-new/CMakeLists.txt 2014-07-23 16:00:28.435856719 +0200
+@@ -1495,8 +1495,9 @@ elseif(APPLE AND ENABLE_OS_SPECIFIC_INST
set(GMSH_DOC ../../..)
set(GMSH_MAN ../../..)
else(WIN32 OR CYGWIN)
@@ -13,8 +13,13 @@ diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
set(GMSH_DOC share/doc/gmsh)
set(GMSH_MAN share/man/man1)
endif(WIN32 OR CYGWIN)
-@@ -1482,7 +1483,7 @@ if(ENABLE_ONELAB)
- install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN})
+@@ -1546,10 +1547,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+ endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
+
+ if(ENABLE_ONELAB)
+- install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN})
++ execute_process ( COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
++ install(FILES ${ONELAB_PY} DESTINATION ${PYTHON_SITE_PACKAGES})
endif(ENABLE_ONELAB)
if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
- install(FILES ${GMSH_API} DESTINATION include/gmsh)
@@ -22,3 +27,22 @@ diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
endif(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt)
install(FILES ${LICENSE_FILE} DESTINATION ${GMSH_DOC})
+diff -rupN gmsh-2.8.5-source/Common/GmshMessage.cpp gmsh-2.8.5-source-new/Common/GmshMessage.cpp
+--- gmsh-2.8.5-source/Common/GmshMessage.cpp 2014-05-11 12:55:22.000000000 +0200
++++ gmsh-2.8.5-source-new/Common/GmshMessage.cpp 2014-07-23 16:00:28.435856719 +0200
+@@ -134,15 +134,6 @@ void Msg::Init(int argc, char **argv)
+ _commandLine += argv[i];
+ }
+
+- if(argc && argv){
+- CTX::instance()->argv0 = std::string(argv[0]);
+- // add the directory where the binary is installed to the path where Python
+- // looks for modules, and to the path for executables (this allows us to
+- // find the onelab.py module or subclients automatically)
+- addGmshPathToEnvironmentVar("PYTHONPATH");
+- addGmshPathToEnvironmentVar("PATH");
+- }
+-
+ InitializeOnelab("Gmsh");
+ }
+
diff --git a/gmsh_sign.patch b/gmsh_sign.patch
index a7e9a6f..14ee909 100644
--- a/gmsh_sign.patch
+++ b/gmsh_sign.patch
@@ -1,7 +1,7 @@
-diff -rupN gmsh-2.8.4-source/Geo/Geo.cpp gmsh-2.8.4-source-new/Geo/Geo.cpp
---- gmsh-2.8.4-source/Geo/Geo.cpp 2014-02-07 08:31:21.000000000 +0100
-+++ gmsh-2.8.4-source-new/Geo/Geo.cpp 2014-06-14 13:14:11.719968453 +0200
-@@ -4124,7 +4124,7 @@ void setSurfaceGeneratrices(Surface *s,
+diff -rupN gmsh-2.8.5-source/Geo/Geo.cpp gmsh-2.8.5-source-new/Geo/Geo.cpp
+--- gmsh-2.8.5-source/Geo/Geo.cpp 2014-07-09 09:28:07.000000000 +0200
++++ gmsh-2.8.5-source-new/Geo/Geo.cpp 2014-07-23 15:57:30.085864644 +0200
+@@ -4462,7 +4462,7 @@ void setSurfaceGeneratrices(Surface *s,
(i != 0 && iLoop < 0)){ // hole
for(int j = 0; j < List_Nbr(el->Curves); j++) {
List_Read(el->Curves, j, &ic);
@@ -10,7 +10,7 @@ diff -rupN gmsh-2.8.4-source/Geo/Geo.cpp gmsh-2.8.4-source-new/Geo/Geo.cpp
if(i != 0) ic *= -1; // hole
if(!(c = FindCurve(ic)))
fromModel.push_back(ic);
-@@ -4135,7 +4135,7 @@ void setSurfaceGeneratrices(Surface *s,
+@@ -4473,7 +4473,7 @@ void setSurfaceGeneratrices(Surface *s,
else{
for(int j = List_Nbr(el->Curves)-1; j >= 0; j--) {
List_Read(el->Curves, j, &ic);
@@ -19,7 +19,7 @@ diff -rupN gmsh-2.8.4-source/Geo/Geo.cpp gmsh-2.8.4-source-new/Geo/Geo.cpp
if(i != 0) ic *= -1; // hole
if(!(c = FindCurve(ic)))
fromModel.push_back(ic);
-@@ -4181,7 +4181,7 @@ void setVolumeSurfaces(Volume *v, List_T
+@@ -4519,7 +4519,7 @@ void setVolumeSurfaces(Volume *v, List_T
// create "negative" surfaces. So we just store the signs in
// another list
List_Add(v->Surfaces, &s);
@@ -28,10 +28,10 @@ diff -rupN gmsh-2.8.4-source/Geo/Geo.cpp gmsh-2.8.4-source-new/Geo/Geo.cpp
if(i > 0) tmp *= -1; // this is a hole
List_Add(v->SurfacesOrientations, &tmp);
}
-diff -rupN gmsh-2.8.4-source/Geo/GModelIO_GEO.cpp gmsh-2.8.4-source-new/Geo/GModelIO_GEO.cpp
---- gmsh-2.8.4-source/Geo/GModelIO_GEO.cpp 2014-02-07 08:31:21.000000000 +0100
-+++ gmsh-2.8.4-source-new/Geo/GModelIO_GEO.cpp 2014-06-14 13:12:38.557971205 +0200
-@@ -314,7 +314,7 @@ int GModel::importGEOInternals()
+diff -rupN gmsh-2.8.5-source/Geo/GModelIO_GEO.cpp gmsh-2.8.5-source-new/Geo/GModelIO_GEO.cpp
+--- gmsh-2.8.5-source/Geo/GModelIO_GEO.cpp 2014-07-09 09:28:07.000000000 +0200
++++ gmsh-2.8.5-source-new/Geo/GModelIO_GEO.cpp 2014-07-23 15:57:30.085864644 +0200
+@@ -311,7 +311,7 @@ int GModel::importGEOInternals()
case MSH_PHYSICAL_SURFACE: ge = getFaceByTag(tag); break;
case MSH_PHYSICAL_VOLUME: ge = getRegionByTag(tag); break;
}
@@ -40,9 +40,9 @@ diff -rupN gmsh-2.8.4-source/Geo/GModelIO_GEO.cpp gmsh-2.8.4-source-new/Geo/GMod
if(ge && std::find(ge->physicals.begin(), ge->physicals.end(), pnum) ==
ge->physicals.end())
ge->physicals.push_back(pnum);
-diff -rupN gmsh-2.8.4-source/Geo/gmshRegion.cpp gmsh-2.8.4-source-new/Geo/gmshRegion.cpp
---- gmsh-2.8.4-source/Geo/gmshRegion.cpp 2014-02-07 08:31:21.000000000 +0100
-+++ gmsh-2.8.4-source-new/Geo/gmshRegion.cpp 2014-06-14 13:10:10.081975592 +0200
+diff -rupN gmsh-2.8.5-source/Geo/gmshRegion.cpp gmsh-2.8.5-source-new/Geo/gmshRegion.cpp
+--- gmsh-2.8.5-source/Geo/gmshRegion.cpp 2014-02-07 08:31:21.000000000 +0100
++++ gmsh-2.8.5-source-new/Geo/gmshRegion.cpp 2014-07-23 15:57:30.086864644 +0200
@@ -32,7 +32,7 @@ gmshRegion::gmshRegion(GModel *m, ::Volu
GFace *f = m->getFaceByTag(abs(is));
if(f){
@@ -52,9 +52,21 @@ diff -rupN gmsh-2.8.4-source/Geo/gmshRegion.cpp gmsh-2.8.4-source-new/Geo/gmshRe
f->addRegion(this);
}
else
-diff -rupN gmsh-2.8.4-source/Numeric/Numeric.h gmsh-2.8.4-source-new/Numeric/Numeric.h
---- gmsh-2.8.4-source/Numeric/Numeric.h 2014-02-07 08:31:20.000000000 +0100
-+++ gmsh-2.8.4-source-new/Numeric/Numeric.h 2014-06-14 13:09:05.216977509 +0200
+diff -rupN gmsh-2.8.5-source/Mesh/meshGEdge.cpp gmsh-2.8.5-source-new/Mesh/meshGEdge.cpp
+--- gmsh-2.8.5-source/Mesh/meshGEdge.cpp 2014-05-31 10:50:55.000000000 +0200
++++ gmsh-2.8.5-source-new/Mesh/meshGEdge.cpp 2014-07-23 15:57:30.089864644 +0200
+@@ -168,7 +168,7 @@ static double F_Transfinite(GEdge *ge, d
+
+ case 1: // Geometric progression ar^i; Sum of n terms = length = a (r^n-1)/(r-1)
+ {
+- double r = (sign(type) >= 0) ? coef : 1. / coef;
++ double r = (SIGN(type) >= 0) ? coef : 1. / coef;
+ double a = length * (r - 1.) / (pow(r, nbpt - 1.) - 1.);
+ int i = (int)(log(t * length / a * (r - 1.) + 1.) / log(r));
+ val = d / (a * pow(r, (double)i));
+diff -rupN gmsh-2.8.5-source/Numeric/Numeric.h gmsh-2.8.5-source-new/Numeric/Numeric.h
+--- gmsh-2.8.5-source/Numeric/Numeric.h 2014-05-31 10:50:56.000000000 +0200
++++ gmsh-2.8.5-source-new/Numeric/Numeric.h 2014-07-23 15:57:30.086864644 +0200
@@ -13,7 +13,7 @@
#include "SVector3.h"
@@ -64,10 +76,10 @@ diff -rupN gmsh-2.8.4-source/Numeric/Numeric.h gmsh-2.8.4-source-new/Numeric/Num
#define SQU(a) ((a)*(a))
struct mean_plane
-diff -rupN gmsh-2.8.4-source/Parser/Gmsh.tab.cpp gmsh-2.8.4-source-new/Parser/Gmsh.tab.cpp
---- gmsh-2.8.4-source/Parser/Gmsh.tab.cpp 2014-02-07 08:31:16.000000000 +0100
-+++ gmsh-2.8.4-source-new/Parser/Gmsh.tab.cpp 2014-06-14 14:31:38.051831169 +0200
-@@ -8534,7 +8534,7 @@ yyreduce:
+diff -rupN gmsh-2.8.5-source/Parser/Gmsh.tab.cpp gmsh-2.8.5-source-new/Parser/Gmsh.tab.cpp
+--- gmsh-2.8.5-source/Parser/Gmsh.tab.cpp 2014-05-23 08:45:41.000000000 +0200
++++ gmsh-2.8.5-source-new/Parser/Gmsh.tab.cpp 2014-07-23 15:57:30.088864644 +0200
+@@ -8305,7 +8305,7 @@ yyreduce:
if(c){
c->Method = MESH_TRANSFINITE;
c->nbPointsTransfinite = ((yyvsp[(5) - (7)].d) > 2) ? (int)(yyvsp[(5) - (7)].d) : 2;
@@ -76,7 +88,7 @@ diff -rupN gmsh-2.8.4-source/Parser/Gmsh.tab.cpp gmsh-2.8.4-source-new/Parser/Gm
c->coeffTransfinite = coef;
}
else{
-@@ -8542,7 +8542,7 @@ yyreduce:
+@@ -8313,7 +8313,7 @@ yyreduce:
if(ge){
ge->meshAttributes.method = MESH_TRANSFINITE;
ge->meshAttributes.nbPointsTransfinite = ((yyvsp[(5) - (7)].d) > 2) ? (int)(yyvsp[(5) - (7)].d) : 2;
@@ -85,9 +97,9 @@ diff -rupN gmsh-2.8.4-source/Parser/Gmsh.tab.cpp gmsh-2.8.4-source-new/Parser/Gm
ge->meshAttributes.coeffTransfinite = coef;
}
else if(sign > 0)
-diff -rupN gmsh-2.8.4-source/Plugin/FaultZone.cpp gmsh-2.8.4-source-new/Plugin/FaultZone.cpp
---- gmsh-2.8.4-source/Plugin/FaultZone.cpp 2014-02-07 08:31:16.000000000 +0100
-+++ gmsh-2.8.4-source-new/Plugin/FaultZone.cpp 2014-06-14 14:30:14.541833636 +0200
+diff -rupN gmsh-2.8.5-source/Plugin/FaultZone.cpp gmsh-2.8.5-source-new/Plugin/FaultZone.cpp
+--- gmsh-2.8.5-source/Plugin/FaultZone.cpp 2014-02-07 08:31:16.000000000 +0100
++++ gmsh-2.8.5-source-new/Plugin/FaultZone.cpp 2014-07-23 15:57:30.089864644 +0200
@@ -418,7 +418,7 @@ void GMSH_FaultZoneMesher::ComputeHeavis
lsn = dot(vectsNor[j], vectsNor[i])*heav[i];
assert(fabs(lsn) > tolerance || heav[i] == 0);
@@ -115,15 +127,3 @@ diff -rupN gmsh-2.8.4-source/Plugin/FaultZone.cpp gmsh-2.8.4-source-new/Plugin/F
else
heav.push_back(0);
}
-diff -rupN gmsh-2.8.4-source/Mesh/meshGEdge.cpp gmsh-2.8.4-source-new/Mesh/meshGEdge.cpp
---- gmsh-2.8.4-source/Mesh/meshGEdge.cpp 2014-02-07 08:31:16.000000000 +0100
-+++ gmsh-2.8.4-source-new/Mesh/meshGEdge.cpp 2014-06-14 13:15:54.459965417 +0200
-@@ -168,7 +168,7 @@ static double F_Transfinite(GEdge *ge, d
-
- case 1: // Geometric progression ar^i; Sum of n terms = length = a (r^n-1)/(r-1)
- {
-- double r = (sign(type) >= 0) ? coef : 1. / coef;
-+ double r = (SIGN(type) >= 0) ? coef : 1. / coef;
- double a = length * (r - 1.) / (pow(r, nbpt - 1.) - 1.);
- int i = (int)(log(t * length / a * (r - 1.) + 1.) / log(r));
- val = d / (a * pow(r, (double)i));
diff --git a/gmsh_tetgen.patch b/gmsh_tetgen.patch
index c25eb14..abab221 100644
--- a/gmsh_tetgen.patch
+++ b/gmsh_tetgen.patch
@@ -1,7 +1,7 @@
-diff -rupN gmsh-2.8.4-source/Mesh/meshGRegion.cpp gmsh-2.8.4-source-new/Mesh/meshGRegion.cpp
---- gmsh-2.8.4-source/Mesh/meshGRegion.cpp 2014-02-07 08:31:16.000000000 +0100
-+++ gmsh-2.8.4-source-new/Mesh/meshGRegion.cpp 2014-06-14 13:26:02.517947451 +0200
-@@ -1091,8 +1091,10 @@ bool CreateAnEmptyVolumeMesh(GRegion *gr
+diff -rupN gmsh-2.8.5-source/Mesh/meshGRegion.cpp gmsh-2.8.5-source-new/Mesh/meshGRegion.cpp
+--- gmsh-2.8.5-source/Mesh/meshGRegion.cpp 2014-07-09 10:52:24.000000000 +0200
++++ gmsh-2.8.5-source-new/Mesh/meshGRegion.cpp 2014-07-23 15:58:11.811862790 +0200
+@@ -1156,8 +1156,10 @@ bool CreateAnEmptyVolumeMesh(GRegion *gr
sprintf(opts, "-Ype%c",
(Msg::GetVerbosity() < 3) ? 'Q':
(Msg::GetVerbosity() > 6) ? 'V': '\0');
@@ -13,7 +13,7 @@ diff -rupN gmsh-2.8.4-source/Mesh/meshGRegion.cpp gmsh-2.8.4-source-new/Mesh/mes
}
catch (int error){
Msg::Error("Self intersecting surface mesh");
-@@ -1141,6 +1143,7 @@ void MeshDelaunayVolume(std::vector<GReg
+@@ -1210,6 +1212,7 @@ void MeshDelaunayVolumeTetgen(std::vecto
// this in block, so in/out are destroyed before we refine the mesh)
splitQuadRecovery sqr;
{
@@ -21,7 +21,7 @@ diff -rupN gmsh-2.8.4-source/Mesh/meshGRegion.cpp gmsh-2.8.4-source-new/Mesh/mes
tetgenio in, out;
std::vector<MVertex*> numberedV;
char opts[128];
-@@ -1168,15 +1171,19 @@ void MeshDelaunayVolume(std::vector<GReg
+@@ -1237,15 +1240,19 @@ void MeshDelaunayVolumeTetgen(std::vecto
// sprintf(opts, "-q3.5Ype%c", (Msg::GetVerbosity() < 3) ? 'Q':
// (Msg::GetVerbosity() > 6) ? 'V': '\0');*/
}
@@ -43,18 +43,3 @@ diff -rupN gmsh-2.8.4-source/Mesh/meshGRegion.cpp gmsh-2.8.4-source-new/Mesh/mes
Msg::Info("%d intersecting faces have been saved into 'intersect.pos'",
out.numberoftrifaces);
FILE *fp = Fopen("intersect.pos", "w");
-diff -rupN gmsh-2.8.4-source/Plugin/Tetrahedralize.cpp gmsh-2.8.4-source-new/Plugin/Tetrahedralize.cpp
---- gmsh-2.8.4-source/Plugin/Tetrahedralize.cpp 2014-02-07 08:31:16.000000000 +0100
-+++ gmsh-2.8.4-source-new/Plugin/Tetrahedralize.cpp 2014-06-14 14:29:07.070835630 +0200
-@@ -106,8 +106,10 @@ PView *GMSH_TetrahedralizePlugin::execut
- in.pointlist[i * 3 + 1] = points[i].v[1];
- in.pointlist[i * 3 + 2] = points[i].v[2];
- }
-+ tetgenbehavior behaviour;
-+ behaviour.parse_commandline("Q");
- try{
-- tetrahedralize((char*)"Q", &in, &out);
-+ tetrahedralize(&behaviour, &in, &out);
- }
- catch (int error){
- Msg::Error("Could not tetrahedralize points");
diff --git a/gmsh_unbundle.patch b/gmsh_unbundle.patch
index 968b3ca..fc387e7 100644
--- a/gmsh_unbundle.patch
+++ b/gmsh_unbundle.patch
@@ -1,7 +1,7 @@
-diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
---- gmsh-2.8.4-source/CMakeLists.txt 2014-02-07 08:31:23.000000000 +0100
-+++ gmsh-2.8.4-source-new/CMakeLists.txt 2014-06-14 16:35:17.587611946 +0200
-@@ -137,8 +137,7 @@ set(GMSH_API
+diff -rupN gmsh-2.8.5-source/CMakeLists.txt gmsh-2.8.5-source-new/CMakeLists.txt
+--- gmsh-2.8.5-source/CMakeLists.txt 2014-07-09 09:27:58.000000000 +0200
++++ gmsh-2.8.5-source-new/CMakeLists.txt 2014-07-23 15:59:53.796858258 +0200
+@@ -140,8 +140,7 @@ set(GMSH_API
contrib/DiscreteIntegration/Integration3D.h
contrib/HighOrderMeshOptimizer/OptHOM.h contrib/HighOrderMeshOptimizer/OptHomMesh.h
contrib/HighOrderMeshOptimizer/OptHomRun.h contrib/HighOrderMeshOptimizer/ParamCoord.h
@@ -11,7 +11,7 @@ diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
get_property(IAMCHILD DIRECTORY PROPERTY PARENT_DIRECTORY)
if(IAMCHILD)
-@@ -590,7 +589,7 @@ endif(HAVE_FLTK OR HAVE_QT OR ENABLE_GRA
+@@ -594,7 +593,7 @@ endif(HAVE_FLTK OR HAVE_QT OR ENABLE_GRA
if(HAVE_MESH OR HAVE_PLUGINS)
if(ENABLE_ANN)
@@ -20,7 +20,7 @@ diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
find_path(ANN_INC "ANN.h" PATH_SUFFIXES src include ANN)
if(ANN_LIB AND ANN_INC)
list(APPEND EXTERNAL_LIBRARIES ${ANN_LIB})
-@@ -605,8 +604,16 @@ if(HAVE_MESH OR HAVE_PLUGINS)
+@@ -609,8 +608,16 @@ if(HAVE_MESH OR HAVE_PLUGINS)
endif(HAVE_MESH OR HAVE_PLUGINS)
if(ENABLE_BFGS)
@@ -39,7 +39,7 @@ diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
set_config_option(HAVE_BFGS "Bfgs")
endif(ENABLE_BFGS)
-@@ -648,8 +655,16 @@ if(ENABLE_KBIPACK)
+@@ -652,8 +659,16 @@ if(ENABLE_KBIPACK)
endif(ENABLE_KBIPACK)
if(ENABLE_MATHEX)
@@ -58,7 +58,7 @@ diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
set_config_option(HAVE_MATHEX "MathEx")
endif(ENABLE_MATHEX)
-@@ -680,13 +695,17 @@ endif(ENABLE_POPPLER)
+@@ -684,13 +699,17 @@ endif(ENABLE_POPPLER)
if(HAVE_MESH OR HAVE_SOLVER)
if(ENABLE_METIS)
@@ -82,7 +82,7 @@ diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
endif(ENABLE_METIS)
if(ENABLE_CHACO)
-@@ -703,8 +722,16 @@ if(HAVE_MESH)
+@@ -707,8 +726,16 @@ if(HAVE_MESH)
endif(ENABLE_RTREE)
if(ENABLE_VORO3D)
@@ -101,7 +101,7 @@ diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
set_config_option(HAVE_VORO3D "Voro3D")
endif(ENABLE_VORO3D)
-@@ -716,9 +743,22 @@ if(HAVE_MESH)
+@@ -720,9 +747,22 @@ if(HAVE_MESH)
endif(ENABLE_BLOSSOM)
if(ENABLE_NETGEN)
@@ -127,7 +127,7 @@ diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
set_config_option(HAVE_NETGEN "Netgen")
add_definitions(-DNO_PARALLEL_THREADS -DNOTCL)
endif(ENABLE_NETGEN)
-@@ -730,8 +770,8 @@ if(HAVE_MESH)
+@@ -734,8 +774,8 @@ if(HAVE_MESH)
endif(ENABLE_BAMG)
if(ENABLE_MMG3D)
@@ -138,7 +138,7 @@ diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
if(MMG3D_LIB AND MMG3D_INC)
list(APPEND EXTERNAL_LIBRARIES ${MMG3D_LIB})
list(APPEND EXTERNAL_INCLUDES ${MMG3D_INC})
-@@ -1051,19 +1091,6 @@ if(ENABLE_OCC)
+@@ -1061,19 +1101,6 @@ if(ENABLE_OCC)
endif(NOT OCC_CONFIG_H)
endif(OCC_INC)
endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
@@ -158,10 +158,10 @@ diff -rupN gmsh-2.8.4-source/CMakeLists.txt gmsh-2.8.4-source-new/CMakeLists.txt
endif(ENABLE_OCC)
if(ENABLE_ACIS)
-diff -rupN gmsh-2.8.4-source/Geo/GModelFactory.cpp gmsh-2.8.4-source-new/Geo/GModelFactory.cpp
---- gmsh-2.8.4-source/Geo/GModelFactory.cpp 2014-02-07 08:31:21.000000000 +0100
-+++ gmsh-2.8.4-source-new/Geo/GModelFactory.cpp 2014-06-14 13:11:33.603973124 +0200
-@@ -485,7 +485,7 @@ std::vector<GEntity*> GeoFactory::extrud
+diff -rupN gmsh-2.8.5-source/Geo/GModelFactory.cpp gmsh-2.8.5-source-new/Geo/GModelFactory.cpp
+--- gmsh-2.8.5-source/Geo/GModelFactory.cpp 2014-04-26 19:25:47.000000000 +0200
++++ gmsh-2.8.5-source-new/Geo/GModelFactory.cpp 2014-07-23 15:59:53.797858258 +0200
+@@ -498,7 +498,7 @@ void GeoFactory::healGeometry(GModel *gm
#include <GeomAPI_PointsToBSpline.hxx>
#include "OCC_Connect.h"
#if defined(HAVE_SALOME)
@@ -170,9 +170,9 @@ diff -rupN gmsh-2.8.4-source/Geo/GModelFactory.cpp gmsh-2.8.4-source-new/Geo/GMo
#endif
GVertex *OCCFactory::addVertex(GModel *gm, double x, double y, double z, double lc)
-diff -rupN gmsh-2.8.4-source/Geo/GModelIO_OCC.cpp gmsh-2.8.4-source-new/Geo/GModelIO_OCC.cpp
---- gmsh-2.8.4-source/Geo/GModelIO_OCC.cpp 2014-02-07 08:31:21.000000000 +0100
-+++ gmsh-2.8.4-source-new/Geo/GModelIO_OCC.cpp 2014-06-14 13:12:55.556970703 +0200
+diff -rupN gmsh-2.8.5-source/Geo/GModelIO_OCC.cpp gmsh-2.8.5-source-new/Geo/GModelIO_OCC.cpp
+--- gmsh-2.8.5-source/Geo/GModelIO_OCC.cpp 2014-05-06 01:06:33.000000000 +0200
++++ gmsh-2.8.5-source-new/Geo/GModelIO_OCC.cpp 2014-07-23 15:59:53.797858258 +0200
@@ -19,7 +19,7 @@
#if defined(HAVE_OCC)
@@ -182,9 +182,9 @@ diff -rupN gmsh-2.8.4-source/Geo/GModelIO_OCC.cpp gmsh-2.8.4-source-new/Geo/GMod
#endif
void addSimpleShapes(TopoDS_Shape theShape, TopTools_ListOfShape &theList);
-diff -rupN gmsh-2.8.4-source/Mesh/CMakeLists.txt gmsh-2.8.4-source-new/Mesh/CMakeLists.txt
---- gmsh-2.8.4-source/Mesh/CMakeLists.txt 2014-02-07 08:31:16.000000000 +0100
-+++ gmsh-2.8.4-source-new/Mesh/CMakeLists.txt 2014-06-14 03:39:27.420534679 +0200
+diff -rupN gmsh-2.8.5-source/Mesh/CMakeLists.txt gmsh-2.8.5-source-new/Mesh/CMakeLists.txt
+--- gmsh-2.8.5-source/Mesh/CMakeLists.txt 2014-07-09 10:52:24.000000000 +0200
++++ gmsh-2.8.5-source-new/Mesh/CMakeLists.txt 2014-07-23 15:59:53.798858258 +0200
@@ -39,6 +39,7 @@ set(SRC
Field.cpp
CenterlineField.cpp
@@ -193,9 +193,9 @@ diff -rupN gmsh-2.8.4-source/Mesh/CMakeLists.txt gmsh-2.8.4-source-new/Mesh/CMak
)
file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
-diff -rupN gmsh-2.8.4-source/Mesh/meshGRegionMMG3D.cpp gmsh-2.8.4-source-new/Mesh/meshGRegionMMG3D.cpp
---- gmsh-2.8.4-source/Mesh/meshGRegionMMG3D.cpp 2014-02-07 08:31:16.000000000 +0100
-+++ gmsh-2.8.4-source-new/Mesh/meshGRegionMMG3D.cpp 2014-06-14 13:28:26.613943193 +0200
+diff -rupN gmsh-2.8.5-source/Mesh/meshGRegionMMG3D.cpp gmsh-2.8.5-source-new/Mesh/meshGRegionMMG3D.cpp
+--- gmsh-2.8.5-source/Mesh/meshGRegionMMG3D.cpp 2014-03-08 07:54:09.000000000 +0100
++++ gmsh-2.8.5-source-new/Mesh/meshGRegionMMG3D.cpp 2014-07-23 15:59:53.798858258 +0200
@@ -19,7 +19,7 @@
#include "Context.h"
diff --git a/sources b/sources
index 876fa9d..178c3ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-666fbd98cb1277bbad3b837e649fbd26 gmsh-2.8.4-source-fedora.tar.gz
+d512c1ea63e3d4daec1ced9fd4dacb89 gmsh-2.8.5-source-fedora.tar.gz
More information about the scm-commits
mailing list