[gmsh] Update to 2.9.0, use %%license, fix -Wl,--as-needed
Sandro Mani
smani at fedoraproject.org
Sat Mar 14 20:05:52 UTC 2015
commit 5dbec05ca774131fc2614a82086da975d885fda0
Author: Sandro Mani <manisandro at gmail.com>
Date: Thu Mar 12 10:22:45 2015 +0100
Update to 2.9.0, use %%license, fix -Wl,--as-needed
.gitignore | 1 +
gmsh.spec | 31 +++++++----
gmsh_alglib.patch | 144 +++++++++++++++++++++++++++++++++---------------
gmsh_install-dirs.patch | 18 +++---
gmsh_sign.patch | 78 +++++++++++++-------------
gmsh_tetgen.patch | 38 +++++--------
gmsh_unbundle.patch | 64 ++++++++++-----------
sources | 2 +-
8 files changed, 216 insertions(+), 160 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aa46b75..b510b93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/gmsh-2.8.4-source-fedora.tar.gz
/gmsh-2.8.5-source-fedora.tar.gz
+/gmsh-2.9.0-source-fedora.tar.xz
diff --git a/gmsh.spec b/gmsh.spec
index fce8bb0..87c8da3 100644
--- a/gmsh.spec
+++ b/gmsh.spec
@@ -1,13 +1,13 @@
Name: gmsh
Summary: A three-dimensional finite element mesh generator
-Version: 2.8.5
-Release: 8%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
License: GPLv2+
URL: http://geuz.org/gmsh/
# Download source from http://geuz.org/gmsh/src/%%{name}-%%{version}-source.tgz
# Delete contrib/blossoms and contrib/mpeg_encode from source archive
-Source0: %{name}-%{version}-source-fedora.tar.gz
+Source0: %{name}-%{version}-source-fedora.tar.xz
Source1: %{name}.desktop
# Unbundle most of the bundled libraries, see comments in %%prep
@@ -194,7 +194,7 @@ sed -i 's|\r||g' demos/component8.step
### serial version ###
mkdir build-serial
pushd build-serial
-LD_FLAGS="-Wl,--as-needed" %cmake .. \
+LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake .. \
-DENABLE_BUILD_LIB=YES \
-DENABLE_BUILD_SHARED=YES \
-DENABLE_BUILD_DYNAMIC=YES \
@@ -212,7 +212,7 @@ popd
export CXX=mpicxx
mkdir build-openmpi
pushd build-openmpi
-LD_FLAGS="-Wl,--as-needed" %cmake .. \
+LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake .. \
-DENABLE_BUILD_LIB=YES \
-DENABLE_BUILD_SHARED=YES \
-DENABLE_BUILD_DYNAMIC=YES \
@@ -235,7 +235,7 @@ popd
export CXX=mpicxx
mkdir build-mpich
pushd build-mpich
-LD_FLAGS="-Wl,--as-needed" %cmake .. \
+LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake .. \
-DENABLE_BUILD_LIB=YES \
-DENABLE_BUILD_SHARED=YES \
-DENABLE_BUILD_DYNAMIC=YES \
@@ -275,6 +275,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
# Add API demo to documentation
install -Dpm 0644 utils/api_demos/mainSimple.cpp %{buildroot}%{_defaultdocdir}/%{name}/api/mainSimple.cpp
+# Install License.txt via %%license
+rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
+
%post common
/usr/bin/update-desktop-database &> /dev/null || :
@@ -308,14 +311,15 @@ fi
%files common
%doc %{_defaultdocdir}/%{name}/CREDITS.txt
-%doc %{_defaultdocdir}/%{name}/LICENSE.txt
%doc %{_defaultdocdir}/%{name}/README.txt
+%license doc/LICENSE.txt
%{_mandir}/man1/gmsh.1.gz
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{python2_sitelib}/onelab.py*
%files doc
+%license doc/LICENSE.txt
%doc %{_defaultdocdir}/%{name}/tutorial
%doc %{_defaultdocdir}/%{name}/demos
%doc %{_defaultdocdir}/%{name}/api
@@ -328,7 +332,7 @@ fi
%{_libdir}/libGmsh.so
%files libs
-%doc doc/LICENSE.txt
+%license doc/LICENSE.txt
%{_libdir}/libGmsh.so.*
%files openmpi
@@ -339,7 +343,7 @@ fi
%{_libdir}/openmpi/lib/libGmsh.so
%files openmpi-libs
-%doc doc/LICENSE.txt
+%license doc/LICENSE.txt
%{_libdir}/openmpi/lib/libGmsh.so.*
%files mpich
@@ -351,18 +355,23 @@ fi
%{_libdir}/mpich/lib/libGmsh.so
%files mpich-libs
-%doc doc/LICENSE.txt
+%license doc/LICENSE.txt
%{_libdir}/mpich/lib/libGmsh.so.*
%changelog
+* Sat Mar 14 2015 Sandro Mani <manisandro at gmail.com> - 2.9.0-1
+- Update to 2.9.0
+- Use %%license
+- Fix -Wl,--as-needed clearing default LDFLAGS
+
* Thu Feb 19 2015 Rex Dieter <rdieter at fedoraproject.org> 2.8.5-8
- rebuild (fltk)
* Wed Jan 07 2015 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-7
- Rebuild for hdf5 1.8.14
-* Sat Dec 13 2014 Sandro Mani <manisandro at gmail.com> - 2.8.5-6
+* Sat Dec 13 2014 Sandro Mani <manisandro at gmail.com> - 2.8.5-6
- Rebuild (alglib)
* Tue Oct 07 2014 Sandro Mani <manisandro at gmail.com> - 2.8.5-5
diff --git a/gmsh_alglib.patch b/gmsh_alglib.patch
index 23a343d..79cc24b 100644
--- a/gmsh_alglib.patch
+++ b/gmsh_alglib.patch
@@ -1,6 +1,94 @@
-diff -rupN gmsh-2.8.4-source/Geo/GFace.cpp gmsh-2.8.4-source-new/Geo/GFace.cpp
---- gmsh-2.8.4-source/Geo/GFace.cpp 2014-02-07 08:31:21.000000000 +0100
-+++ gmsh-2.8.4-source-new/Geo/GFace.cpp 2014-06-14 03:58:59.651500043 +0200
+diff -rupN gmsh-2.9.0-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp gmsh-2.9.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp
+--- gmsh-2.9.0-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp 2015-01-05 09:42:50.000000000 +0100
++++ gmsh-2.9.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp 2015-03-14 00:50:16.890042054 +0100
+@@ -44,11 +44,11 @@ static int NEVAL = 0;
+
+ #if defined(HAVE_BFGS)
+
+-#include "ap.h"
+-#include "alglibinternal.h"
+-#include "alglibmisc.h"
+-#include "linalg.h"
+-#include "optimization.h"
++#include <alglib/ap.h>
++#include <alglib/alglibinternal.h>
++#include <alglib/alglibmisc.h>
++#include <alglib/linalg.h>
++#include <alglib/optimization.h>
+
+ static inline double compute_f(double v, double barrier)
+ {
+diff -rupN gmsh-2.9.0-source/contrib/HighOrderMeshOptimizer/OptHOM.h gmsh-2.9.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h
+--- gmsh-2.9.0-source/contrib/HighOrderMeshOptimizer/OptHOM.h 2015-01-05 09:42:50.000000000 +0100
++++ gmsh-2.9.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h 2015-03-14 00:50:16.891042073 +0100
+@@ -38,7 +38,7 @@
+
+ #if defined(HAVE_BFGS)
+
+-#include "ap.h"
++#include <alglib/ap.h>
+
+ class OptHOM
+ {
+diff -rupN gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOpt.cpp gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOpt.cpp
+--- gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOpt.cpp 2015-01-05 09:42:50.000000000 +0100
++++ gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOpt.cpp 2015-03-14 00:52:02.676089780 +0100
+@@ -38,11 +38,11 @@
+
+ #if defined(HAVE_BFGS)
+
+-#include "ap.h"
+-#include "alglibinternal.h"
+-#include "alglibmisc.h"
+-#include "linalg.h"
+-#include "optimization.h"
++#include <alglib/ap.h>
++#include <alglib/alglibinternal.h>
++#include <alglib/alglibmisc.h>
++#include <alglib/linalg.h>
++#include <alglib/optimization.h>
+
+
+ namespace {
+diff -rupN gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOpt.h gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOpt.h
+--- gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOpt.h 2015-01-05 09:42:50.000000000 +0100
++++ gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOpt.h 2015-03-14 00:51:32.175497694 +0100
+@@ -37,7 +37,7 @@
+
+ #if defined(HAVE_BFGS)
+
+-#include "ap.h"
++#include <alglib/ap.h>
+
+
+ class MeshOptParameters;
+diff -rupN gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOptObjContrib.h gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOptObjContrib.h
+--- gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOptObjContrib.h 2014-10-24 09:37:44.000000000 +0200
++++ gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOptObjContrib.h 2015-03-14 00:50:46.526614036 +0100
+@@ -4,7 +4,7 @@
+ #define _MESHOPTOBJCONTRIB_H_
+
+ #include <string>
+-#include "ap.h"
++#include <alglib/ap.h>
+ #include "MeshOptCommon.h"
+
+
+diff -rupN gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOptObjectiveFunction.h
+--- gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h 2014-10-24 09:37:44.000000000 +0200
++++ gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOptObjectiveFunction.h 2015-03-14 00:51:25.975377494 +0100
+@@ -5,7 +5,7 @@
+
+ #include <string>
+ #include <vector>
+-#include "ap.h"
++#include <alglib/ap.h>
+
+ class ObjContrib;
+ class Patch;
+diff -rupN gmsh-2.9.0-source/Geo/GFace.cpp gmsh-2.9.0-source-new/Geo/GFace.cpp
+--- gmsh-2.9.0-source/Geo/GFace.cpp 2015-03-08 14:03:26.000000000 +0100
++++ gmsh-2.9.0-source-new/Geo/GFace.cpp 2015-03-14 00:50:16.891042073 +0100
@@ -26,8 +26,8 @@
#endif
@@ -12,9 +100,9 @@ diff -rupN gmsh-2.8.4-source/Geo/GFace.cpp gmsh-2.8.4-source-new/Geo/GFace.cpp
#endif
#define SQU(a) ((a)*(a))
-diff -rupN gmsh-2.8.4-source/Mesh/Levy3D.cpp gmsh-2.8.4-source-new/Mesh/Levy3D.cpp
---- gmsh-2.8.4-source/Mesh/Levy3D.cpp 2014-02-07 08:31:16.000000000 +0100
-+++ gmsh-2.8.4-source-new/Mesh/Levy3D.cpp 2014-06-14 13:36:11.456929459 +0200
+diff -rupN gmsh-2.9.0-source/Mesh/Levy3D.cpp gmsh-2.9.0-source-new/Mesh/Levy3D.cpp
+--- gmsh-2.9.0-source/Mesh/Levy3D.cpp 2015-03-08 14:03:14.000000000 +0100
++++ gmsh-2.9.0-source-new/Mesh/Levy3D.cpp 2015-03-14 00:50:16.892042092 +0100
@@ -19,11 +19,11 @@
#include "directions3D.h"
@@ -32,9 +120,9 @@ diff -rupN gmsh-2.8.4-source/Mesh/Levy3D.cpp gmsh-2.8.4-source-new/Mesh/Levy3D.c
#endif
/*********definitions*********/
-diff -rupN gmsh-2.8.4-source/Mesh/meshGFaceLloyd.cpp gmsh-2.8.4-source-new/Mesh/meshGFaceLloyd.cpp
---- gmsh-2.8.4-source/Mesh/meshGFaceLloyd.cpp 2014-02-07 08:31:16.000000000 +0100
-+++ gmsh-2.8.4-source-new/Mesh/meshGFaceLloyd.cpp 2014-06-14 13:17:49.104962030 +0200
+diff -rupN gmsh-2.9.0-source/Mesh/meshGFaceLloyd.cpp gmsh-2.9.0-source-new/Mesh/meshGFaceLloyd.cpp
+--- gmsh-2.9.0-source/Mesh/meshGFaceLloyd.cpp 2015-03-08 14:03:14.000000000 +0100
++++ gmsh-2.9.0-source-new/Mesh/meshGFaceLloyd.cpp 2015-03-14 00:50:16.893042112 +0100
@@ -22,11 +22,11 @@
#if defined(HAVE_BFGS)
@@ -52,9 +140,9 @@ diff -rupN gmsh-2.8.4-source/Mesh/meshGFaceLloyd.cpp gmsh-2.8.4-source-new/Mesh/
#include "polynomialBasis.h"
#include "MElementOctree.h"
#include "GModel.h"
-diff -rupN gmsh-2.8.4-source/Mesh/meshGFaceOptimize.cpp gmsh-2.8.4-source-new/Mesh/meshGFaceOptimize.cpp
---- gmsh-2.8.4-source/Mesh/meshGFaceOptimize.cpp 2014-02-07 08:31:16.000000000 +0100
-+++ gmsh-2.8.4-source-new/Mesh/meshGFaceOptimize.cpp 2014-06-14 13:18:10.555961396 +0200
+diff -rupN gmsh-2.9.0-source/Mesh/meshGFaceOptimize.cpp gmsh-2.9.0-source-new/Mesh/meshGFaceOptimize.cpp
+--- gmsh-2.9.0-source/Mesh/meshGFaceOptimize.cpp 2015-03-08 14:03:14.000000000 +0100
++++ gmsh-2.9.0-source-new/Mesh/meshGFaceOptimize.cpp 2015-03-14 00:50:16.895042150 +0100
@@ -26,8 +26,8 @@
#include "robustPredicates.h"
@@ -66,35 +154,3 @@ diff -rupN gmsh-2.8.4-source/Mesh/meshGFaceOptimize.cpp gmsh-2.8.4-source-new/Me
#endif
#if defined(HAVE_POST)
-diff -rupN gmsh-2.8.4-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp gmsh-2.8.4-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp
---- gmsh-2.8.4-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp 2014-02-07 08:31:18.000000000 +0100
-+++ gmsh-2.8.4-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp 2014-06-14 17:41:43.537494175 +0200
-@@ -37,11 +37,11 @@
-
- #if defined(HAVE_BFGS)
-
--#include "ap.h"
--#include "alglibinternal.h"
--#include "alglibmisc.h"
--#include "linalg.h"
--#include "optimization.h"
-+#include <alglib/ap.h>
-+#include <alglib/alglibinternal.h>
-+#include <alglib/alglibmisc.h>
-+#include <alglib/linalg.h>
-+#include <alglib/optimization.h>
-
- static inline double compute_f(double v, double barrier)
- {
-diff -rupN gmsh-2.8.4-source/contrib/HighOrderMeshOptimizer/OptHOM.h gmsh-2.8.4-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h
---- gmsh-2.8.4-source/contrib/HighOrderMeshOptimizer/OptHOM.h 2013-11-04 19:08:40.000000000 +0100
-+++ gmsh-2.8.4-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h 2014-06-14 17:41:28.652494615 +0200
-@@ -37,7 +37,7 @@
-
- #if defined(HAVE_BFGS)
-
--#include "ap.h"
-+#include <alglib/ap.h>
-
- class OptHOM
- {
diff --git a/gmsh_install-dirs.patch b/gmsh_install-dirs.patch
index aba921e..af1f8ca 100644
--- a/gmsh_install-dirs.patch
+++ b/gmsh_install-dirs.patch
@@ -1,7 +1,7 @@
-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
+diff -rupN gmsh-2.9.0-source/CMakeLists.txt gmsh-2.9.0-source-new/CMakeLists.txt
+--- gmsh-2.9.0-source/CMakeLists.txt 2015-03-12 12:14:16.000000000 +0100
++++ gmsh-2.9.0-source-new/CMakeLists.txt 2015-03-14 00:07:48.064549932 +0100
+@@ -1551,8 +1551,9 @@ elseif(APPLE AND ENABLE_OS_SPECIFIC_INST
set(GMSH_DOC ../../..)
set(GMSH_MAN ../../..)
else(WIN32 OR CYGWIN)
@@ -13,7 +13,7 @@ diff -rupN gmsh-2.8.5-source/CMakeLists.txt gmsh-2.8.5-source-new/CMakeLists.txt
set(GMSH_DOC share/doc/gmsh)
set(GMSH_MAN share/man/man1)
endif(WIN32 OR CYGWIN)
-@@ -1546,10 +1547,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1602,10 +1603,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(ENABLE_ONELAB)
@@ -27,10 +27,10 @@ diff -rupN gmsh-2.8.5-source/CMakeLists.txt gmsh-2.8.5-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)
+diff -rupN gmsh-2.9.0-source/Common/GmshMessage.cpp gmsh-2.9.0-source-new/Common/GmshMessage.cpp
+--- gmsh-2.9.0-source/Common/GmshMessage.cpp 2015-03-11 13:30:58.000000000 +0100
++++ gmsh-2.9.0-source-new/Common/GmshMessage.cpp 2015-03-14 00:07:48.064549932 +0100
+@@ -151,15 +151,6 @@ void Msg::Init(int argc, char **argv)
_commandLine += argv[i];
}
diff --git a/gmsh_sign.patch b/gmsh_sign.patch
index 73dd128..0b439bf 100644
--- a/gmsh_sign.patch
+++ b/gmsh_sign.patch
@@ -1,6 +1,6 @@
-diff -rupN gmsh-2.8.5-source/Geo/GEdge.cpp gmsh-2.8.5-source-new/Geo/GEdge.cpp
---- gmsh-2.8.5-source/Geo/GEdge.cpp 2014-05-06 01:06:33.000000000 +0200
-+++ gmsh-2.8.5-source-new/Geo/GEdge.cpp 2014-07-23 16:30:15.732777298 +0200
+diff -rupN gmsh-2.9.0-source/Geo/GEdge.cpp gmsh-2.9.0-source-new/Geo/GEdge.cpp
+--- gmsh-2.9.0-source/Geo/GEdge.cpp 2015-03-08 14:03:26.000000000 +0100
++++ gmsh-2.9.0-source-new/Geo/GEdge.cpp 2015-03-13 23:54:27.754151246 +0100
@@ -182,7 +182,7 @@ std::string GEdge::getAdditionalInfoStri
sstream << " transfinite (" << meshAttributes.nbPointsTransfinite;
int type = meshAttributes.typeTransfinite;
@@ -10,10 +10,10 @@ diff -rupN gmsh-2.8.5-source/Geo/GEdge.cpp gmsh-2.8.5-source-new/Geo/GEdge.cpp
else if(std::abs(type) == 2)
sstream << ", bump " << meshAttributes.coeffTransfinite;
sstream << ")";
-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 16:26:26.099787502 +0200
-@@ -4462,7 +4462,7 @@ void setSurfaceGeneratrices(Surface *s,
+diff -rupN gmsh-2.9.0-source/Geo/Geo.cpp gmsh-2.9.0-source-new/Geo/Geo.cpp
+--- gmsh-2.9.0-source/Geo/Geo.cpp 2015-03-12 12:14:16.000000000 +0100
++++ gmsh-2.9.0-source-new/Geo/Geo.cpp 2015-03-13 23:54:27.755151267 +0100
+@@ -4498,7 +4498,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);
@@ -22,7 +22,7 @@ diff -rupN gmsh-2.8.5-source/Geo/Geo.cpp gmsh-2.8.5-source-new/Geo/Geo.cpp
if(i != 0) ic *= -1; // hole
if(!(c = FindCurve(ic)))
fromModel.push_back(ic);
-@@ -4473,7 +4473,7 @@ void setSurfaceGeneratrices(Surface *s,
+@@ -4509,7 +4509,7 @@ void setSurfaceGeneratrices(Surface *s,
else{
for(int j = List_Nbr(el->Curves)-1; j >= 0; j--) {
List_Read(el->Curves, j, &ic);
@@ -31,7 +31,7 @@ diff -rupN gmsh-2.8.5-source/Geo/Geo.cpp gmsh-2.8.5-source-new/Geo/Geo.cpp
if(i != 0) ic *= -1; // hole
if(!(c = FindCurve(ic)))
fromModel.push_back(ic);
-@@ -4519,7 +4519,7 @@ void setVolumeSurfaces(Volume *v, List_T
+@@ -4555,7 +4555,7 @@ void setVolumeSurfaces(Volume *v, List_T
// create "negative" surfaces. So we just store the signs in
// another list
List_Add(v->Surfaces, &s);
@@ -40,10 +40,10 @@ diff -rupN gmsh-2.8.5-source/Geo/Geo.cpp gmsh-2.8.5-source-new/Geo/Geo.cpp
if(i > 0) tmp *= -1; // this is a hole
List_Add(v->SurfacesOrientations, &tmp);
}
-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 16:26:26.100787502 +0200
-@@ -311,7 +311,7 @@ int GModel::importGEOInternals()
+diff -rupN gmsh-2.9.0-source/Geo/GModelIO_GEO.cpp gmsh-2.9.0-source-new/Geo/GModelIO_GEO.cpp
+--- gmsh-2.9.0-source/Geo/GModelIO_GEO.cpp 2015-03-08 14:03:26.000000000 +0100
++++ gmsh-2.9.0-source-new/Geo/GModelIO_GEO.cpp 2015-03-13 23:54:27.756151288 +0100
+@@ -325,7 +325,7 @@ int GModel::importGEOInternals()
case MSH_PHYSICAL_SURFACE: ge = getFaceByTag(tag); break;
case MSH_PHYSICAL_VOLUME: ge = getRegionByTag(tag); break;
}
@@ -52,9 +52,9 @@ diff -rupN gmsh-2.8.5-source/Geo/GModelIO_GEO.cpp gmsh-2.8.5-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.5-source/Geo/gmshEdge.cpp gmsh-2.8.5-source-new/Geo/gmshEdge.cpp
---- gmsh-2.8.5-source/Geo/gmshEdge.cpp 2014-07-09 09:28:07.000000000 +0200
-+++ gmsh-2.8.5-source-new/Geo/gmshEdge.cpp 2014-07-23 16:29:59.807778006 +0200
+diff -rupN gmsh-2.9.0-source/Geo/gmshEdge.cpp gmsh-2.9.0-source-new/Geo/gmshEdge.cpp
+--- gmsh-2.9.0-source/Geo/gmshEdge.cpp 2015-03-08 14:03:26.000000000 +0100
++++ gmsh-2.9.0-source-new/Geo/gmshEdge.cpp 2015-03-13 23:54:27.757151309 +0100
@@ -97,7 +97,7 @@ std::string gmshEdge::getAdditionalInfoS
sstream << " transfinite (" << meshAttributes.nbPointsTransfinite;
int type = meshAttributes.typeTransfinite;
@@ -64,9 +64,9 @@ diff -rupN gmsh-2.8.5-source/Geo/gmshEdge.cpp gmsh-2.8.5-source-new/Geo/gmshEdge
else if(std::abs(type) == 2)
sstream << ", bump " << meshAttributes.coeffTransfinite;
sstream << ")";
-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 16:26:26.100787502 +0200
+diff -rupN gmsh-2.9.0-source/Geo/gmshRegion.cpp gmsh-2.9.0-source-new/Geo/gmshRegion.cpp
+--- gmsh-2.9.0-source/Geo/gmshRegion.cpp 2015-03-08 14:03:26.000000000 +0100
++++ gmsh-2.9.0-source-new/Geo/gmshRegion.cpp 2015-03-13 23:54:27.757151309 +0100
@@ -32,7 +32,7 @@ gmshRegion::gmshRegion(GModel *m, ::Volu
GFace *f = m->getFaceByTag(abs(is));
if(f){
@@ -76,9 +76,9 @@ diff -rupN gmsh-2.8.5-source/Geo/gmshRegion.cpp gmsh-2.8.5-source-new/Geo/gmshRe
f->addRegion(this);
}
else
-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 16:26:26.100787502 +0200
+diff -rupN gmsh-2.9.0-source/Mesh/meshGEdge.cpp gmsh-2.9.0-source-new/Mesh/meshGEdge.cpp
+--- gmsh-2.9.0-source/Mesh/meshGEdge.cpp 2015-03-08 14:03:14.000000000 +0100
++++ gmsh-2.9.0-source-new/Mesh/meshGEdge.cpp 2015-03-13 23:54:27.757151309 +0100
@@ -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)
@@ -88,10 +88,10 @@ diff -rupN gmsh-2.8.5-source/Mesh/meshGEdge.cpp gmsh-2.8.5-source-new/Mesh/meshG
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 16:26:26.100787502 +0200
-@@ -13,7 +13,7 @@
+diff -rupN gmsh-2.9.0-source/Numeric/Numeric.h gmsh-2.9.0-source-new/Numeric/Numeric.h
+--- gmsh-2.9.0-source/Numeric/Numeric.h 2015-03-08 14:03:21.000000000 +0100
++++ gmsh-2.9.0-source-new/Numeric/Numeric.h 2015-03-13 23:54:27.758151330 +0100
+@@ -14,7 +14,7 @@
#include "SVector3.h"
#define myhypot(a,b) (sqrt((a)*(a)+(b)*(b)))
@@ -100,10 +100,10 @@ diff -rupN gmsh-2.8.5-source/Numeric/Numeric.h gmsh-2.8.5-source-new/Numeric/Num
#define SQU(a) ((a)*(a))
struct mean_plane
-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 16:26:26.102787502 +0200
-@@ -8305,7 +8305,7 @@ yyreduce:
+diff -rupN gmsh-2.9.0-source/Parser/Gmsh.tab.cpp gmsh-2.9.0-source-new/Parser/Gmsh.tab.cpp
+--- gmsh-2.9.0-source/Parser/Gmsh.tab.cpp 2015-03-12 12:14:08.000000000 +0100
++++ gmsh-2.9.0-source-new/Parser/Gmsh.tab.cpp 2015-03-13 23:54:27.761151394 +0100
+@@ -8846,7 +8846,7 @@ yyreduce:
if(c){
c->Method = MESH_TRANSFINITE;
c->nbPointsTransfinite = ((yyvsp[(5) - (7)].d) > 2) ? (int)(yyvsp[(5) - (7)].d) : 2;
@@ -112,7 +112,7 @@ diff -rupN gmsh-2.8.5-source/Parser/Gmsh.tab.cpp gmsh-2.8.5-source-new/Parser/Gm
c->coeffTransfinite = coef;
}
else{
-@@ -8313,7 +8313,7 @@ yyreduce:
+@@ -8854,7 +8854,7 @@ yyreduce:
if(ge){
ge->meshAttributes.method = MESH_TRANSFINITE;
ge->meshAttributes.nbPointsTransfinite = ((yyvsp[(5) - (7)].d) > 2) ? (int)(yyvsp[(5) - (7)].d) : 2;
@@ -121,10 +121,10 @@ diff -rupN gmsh-2.8.5-source/Parser/Gmsh.tab.cpp gmsh-2.8.5-source-new/Parser/Gm
ge->meshAttributes.coeffTransfinite = coef;
}
else if(sign > 0)
-diff -rupN gmsh-2.8.5-source/Parser/Gmsh.y gmsh-2.8.5-source-new/Parser/Gmsh.y
---- gmsh-2.8.5-source/Parser/Gmsh.y 2014-05-23 08:45:41.000000000 +0200
-+++ gmsh-2.8.5-source-new/Parser/Gmsh.y 2014-07-23 16:30:23.377776958 +0200
-@@ -3499,7 +3499,7 @@ Constraints :
+diff -rupN gmsh-2.9.0-source/Parser/Gmsh.y gmsh-2.9.0-source-new/Parser/Gmsh.y
+--- gmsh-2.9.0-source/Parser/Gmsh.y 2015-03-12 12:14:08.000000000 +0100
++++ gmsh-2.9.0-source-new/Parser/Gmsh.y 2015-03-13 23:54:27.762151415 +0100
+@@ -3582,7 +3582,7 @@ Constraints :
if(c){
c->Method = MESH_TRANSFINITE;
c->nbPointsTransfinite = ($5 > 2) ? (int)$5 : 2;
@@ -133,7 +133,7 @@ diff -rupN gmsh-2.8.5-source/Parser/Gmsh.y gmsh-2.8.5-source-new/Parser/Gmsh.y
c->coeffTransfinite = coef;
}
else{
-@@ -3507,7 +3507,7 @@ Constraints :
+@@ -3590,7 +3590,7 @@ Constraints :
if(ge){
ge->meshAttributes.method = MESH_TRANSFINITE;
ge->meshAttributes.nbPointsTransfinite = ($5 > 2) ? (int)$5 : 2;
@@ -142,9 +142,9 @@ diff -rupN gmsh-2.8.5-source/Parser/Gmsh.y gmsh-2.8.5-source-new/Parser/Gmsh.y
ge->meshAttributes.coeffTransfinite = coef;
}
else if(sign > 0)
-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 16:26:26.103787502 +0200
+diff -rupN gmsh-2.9.0-source/Plugin/FaultZone.cpp gmsh-2.9.0-source-new/Plugin/FaultZone.cpp
+--- gmsh-2.9.0-source/Plugin/FaultZone.cpp 2015-03-08 14:03:17.000000000 +0100
++++ gmsh-2.9.0-source-new/Plugin/FaultZone.cpp 2015-03-13 23:54:27.763151436 +0100
@@ -418,7 +418,7 @@ void GMSH_FaultZoneMesher::ComputeHeavis
lsn = dot(vectsNor[j], vectsNor[i])*heav[i];
assert(fabs(lsn) > tolerance || heav[i] == 0);
diff --git a/gmsh_tetgen.patch b/gmsh_tetgen.patch
index abab221..f17fc92 100644
--- a/gmsh_tetgen.patch
+++ b/gmsh_tetgen.patch
@@ -1,34 +1,24 @@
-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');
-+ tetgenbehavior behaviour;
-+ behaviour.parse_commandline(opts);
+diff -rupN gmsh-2.9.0-source/Mesh/meshGRegion.cpp gmsh-2.9.0-source-new/Mesh/meshGRegion.cpp
+--- gmsh-2.9.0-source/Mesh/meshGRegion.cpp 2015-03-08 14:03:14.000000000 +0100
++++ gmsh-2.9.0-source-new/Mesh/meshGRegion.cpp 2015-03-14 00:40:04.389714746 +0100
+@@ -1157,7 +1157,9 @@ bool CreateAnEmptyVolumeMesh(GRegion *gr
+ (Msg::GetVerbosity() < 3) ? "Q" : (Msg::GetVerbosity() > 6) ? "V" : "",
+ CTX::instance()->mesh.toleranceInitialDelaunay);
try{
- tetrahedralize(opts, &in, &out);
++ tetgenbehavior behaviour;
++ behaviour.parse_commandline(opts);
+ tetrahedralize(&behaviour, &in, &out);
}
catch (int error){
Msg::Error("Self intersecting surface mesh");
-@@ -1210,6 +1212,7 @@ void MeshDelaunayVolumeTetgen(std::vecto
- // this in block, so in/out are destroyed before we refine the mesh)
- splitQuadRecovery sqr;
- {
-+ tetgenbehavior behaviour;
- tetgenio in, out;
- std::vector<MVertex*> numberedV;
- char opts[128];
-@@ -1237,15 +1240,19 @@ void MeshDelaunayVolumeTetgen(std::vecto
- // sprintf(opts, "-q3.5Ype%c", (Msg::GetVerbosity() < 3) ? 'Q':
- // (Msg::GetVerbosity() > 6) ? 'V': '\0');*/
- }
-+ behaviour = tetgenbehavior();
-+ behaviour.parse_commandline(opts);
+@@ -1219,14 +1221,18 @@ void MeshDelaunayVolumeTetgen(std::vecto
+ (Msg::GetVerbosity() < 3) ? "Q" : (Msg::GetVerbosity() > 6) ? "V" : "",
+ CTX::instance()->mesh.toleranceInitialDelaunay);
try{
- tetrahedralize(opts, &in, &out);
++ tetgenbehavior behaviour;
++ behaviour.parse_commandline(opts);
+ tetrahedralize(&behaviour, &in, &out);
}
catch (int error){
@@ -37,7 +27,7 @@ diff -rupN gmsh-2.8.5-source/Mesh/meshGRegion.cpp gmsh-2.8.5-source-new/Mesh/mes
sprintf(opts, "dV");
try{
- tetrahedralize(opts, &in, &out);
-+ behaviour = tetgenbehavior();
++ tetgenbehavior behaviour;
+ behaviour.parse_commandline(opts);
+ tetrahedralize(&behaviour, &in, &out);
Msg::Info("%d intersecting faces have been saved into 'intersect.pos'",
diff --git a/gmsh_unbundle.patch b/gmsh_unbundle.patch
index fc387e7..315b190 100644
--- a/gmsh_unbundle.patch
+++ b/gmsh_unbundle.patch
@@ -1,17 +1,17 @@
-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
-- contrib/HighOrderMeshOptimizer/OptHomFastCurving.h contrib/HighOrderMeshOptimizer/SuperEl.h
+diff -rupN gmsh-2.9.0-source/CMakeLists.txt gmsh-2.9.0-source-new/CMakeLists.txt
+--- gmsh-2.9.0-source/CMakeLists.txt 2015-03-12 12:14:16.000000000 +0100
++++ gmsh-2.9.0-source-new/CMakeLists.txt 2015-03-13 23:52:54.804192621 +0100
+@@ -160,8 +160,7 @@ set(GMSH_API
+ contrib/MeshOptimizer/MeshOptObjectiveFunction.h contrib/MeshOptimizer/MeshOptVertexCoord.h
+ contrib/MeshQualityOptimizer/MeshQualityObjContribIdealJac.h
+ contrib/MeshQualityOptimizer/MeshQualityObjContribInvCond.h
+- contrib/MeshQualityOptimizer/MeshQualityOptimizer.h
- contrib/MathEx/mathex.h)
-+ contrib/HighOrderMeshOptimizer/OptHomFastCurving.h contrib/HighOrderMeshOptimizer/SuperEl.h)
++ contrib/MeshQualityOptimizer/MeshQualityOptimizer.h)
get_property(IAMCHILD DIRECTORY PROPERTY PARENT_DIRECTORY)
if(IAMCHILD)
-@@ -594,7 +593,7 @@ endif(HAVE_FLTK OR HAVE_QT OR ENABLE_GRA
+@@ -645,7 +644,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.5-source/CMakeLists.txt gmsh-2.8.5-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})
-@@ -609,8 +608,16 @@ if(HAVE_MESH OR HAVE_PLUGINS)
+@@ -660,8 +659,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.5-source/CMakeLists.txt gmsh-2.8.5-source-new/CMakeLists.txt
set_config_option(HAVE_BFGS "Bfgs")
endif(ENABLE_BFGS)
-@@ -652,8 +659,16 @@ if(ENABLE_KBIPACK)
+@@ -707,8 +714,16 @@ if(ENABLE_KBIPACK)
endif(ENABLE_KBIPACK)
if(ENABLE_MATHEX)
@@ -58,7 +58,7 @@ diff -rupN gmsh-2.8.5-source/CMakeLists.txt gmsh-2.8.5-source-new/CMakeLists.txt
set_config_option(HAVE_MATHEX "MathEx")
endif(ENABLE_MATHEX)
-@@ -684,13 +699,17 @@ endif(ENABLE_POPPLER)
+@@ -739,13 +754,17 @@ endif(ENABLE_POPPLER)
if(HAVE_MESH OR HAVE_SOLVER)
if(ENABLE_METIS)
@@ -82,9 +82,9 @@ diff -rupN gmsh-2.8.5-source/CMakeLists.txt gmsh-2.8.5-source-new/CMakeLists.txt
endif(ENABLE_METIS)
if(ENABLE_CHACO)
-@@ -707,8 +726,16 @@ if(HAVE_MESH)
- endif(ENABLE_RTREE)
+@@ -757,8 +776,16 @@ endif(HAVE_MESH OR HAVE_SOLVER)
+ if(HAVE_MESH)
if(ENABLE_VORO3D)
- add_subdirectory(contrib/voro++)
- include_directories(contrib/voro++/src)
@@ -101,7 +101,7 @@ diff -rupN gmsh-2.8.5-source/CMakeLists.txt gmsh-2.8.5-source-new/CMakeLists.txt
set_config_option(HAVE_VORO3D "Voro3D")
endif(ENABLE_VORO3D)
-@@ -720,9 +747,22 @@ if(HAVE_MESH)
+@@ -770,9 +797,22 @@ if(HAVE_MESH)
endif(ENABLE_BLOSSOM)
if(ENABLE_NETGEN)
@@ -114,7 +114,7 @@ diff -rupN gmsh-2.8.5-source/CMakeLists.txt gmsh-2.8.5-source-new/CMakeLists.txt
+ list(APPEND EXTERNAL_LIBRARIES ${NETGEN_LIB})
+ list(APPEND EXTERNAL_INCLUDES ${NETGEN_INC})
+ # Netgen private headers contain what contrib/Salome does
-+ list(APPEND EXTERNAL_LIBRARIES -lngocc -lngmesh)
++ list(APPEND EXTERNAL_LIBRARIES -lngocc -lngcsg -lngmesh)
+ list(APPEND EXTERNAL_INCLUDES ${NETGEN_INC}/private ${NETGEN_INC} ${NETGEN_INC}/private/include)
+ add_definitions(-DOCCGEOMETRY)
+ set_config_option(HAVE_SALOME "Salome")
@@ -127,7 +127,7 @@ diff -rupN gmsh-2.8.5-source/CMakeLists.txt gmsh-2.8.5-source-new/CMakeLists.txt
set_config_option(HAVE_NETGEN "Netgen")
add_definitions(-DNO_PARALLEL_THREADS -DNOTCL)
endif(ENABLE_NETGEN)
-@@ -734,8 +774,8 @@ if(HAVE_MESH)
+@@ -784,8 +824,8 @@ if(HAVE_MESH)
endif(ENABLE_BAMG)
if(ENABLE_MMG3D)
@@ -138,7 +138,7 @@ diff -rupN gmsh-2.8.5-source/CMakeLists.txt gmsh-2.8.5-source-new/CMakeLists.txt
if(MMG3D_LIB AND MMG3D_INC)
list(APPEND EXTERNAL_LIBRARIES ${MMG3D_LIB})
list(APPEND EXTERNAL_INCLUDES ${MMG3D_INC})
-@@ -1061,19 +1101,6 @@ if(ENABLE_OCC)
+@@ -1127,19 +1167,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.5-source/CMakeLists.txt gmsh-2.8.5-source-new/CMakeLists.txt
endif(ENABLE_OCC)
if(ENABLE_ACIS)
-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
+diff -rupN gmsh-2.9.0-source/Geo/GModelFactory.cpp gmsh-2.9.0-source-new/Geo/GModelFactory.cpp
+--- gmsh-2.9.0-source/Geo/GModelFactory.cpp 2015-03-08 14:03:26.000000000 +0100
++++ gmsh-2.9.0-source-new/Geo/GModelFactory.cpp 2015-03-13 23:52:22.325508412 +0100
+@@ -496,7 +496,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.5-source/Geo/GModelFactory.cpp gmsh-2.8.5-source-new/Geo/GMo
#endif
GVertex *OCCFactory::addVertex(GModel *gm, double x, double y, double z, double lc)
-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
+diff -rupN gmsh-2.9.0-source/Geo/GModelIO_OCC.cpp gmsh-2.9.0-source-new/Geo/GModelIO_OCC.cpp
+--- gmsh-2.9.0-source/Geo/GModelIO_OCC.cpp 2015-03-08 14:03:26.000000000 +0100
++++ gmsh-2.9.0-source-new/Geo/GModelIO_OCC.cpp 2015-03-13 23:52:22.326508433 +0100
@@ -19,7 +19,7 @@
#if defined(HAVE_OCC)
@@ -182,9 +182,9 @@ diff -rupN gmsh-2.8.5-source/Geo/GModelIO_OCC.cpp gmsh-2.8.5-source-new/Geo/GMod
#endif
void addSimpleShapes(TopoDS_Shape theShape, TopTools_ListOfShape &theList);
-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
+diff -rupN gmsh-2.9.0-source/Mesh/CMakeLists.txt gmsh-2.9.0-source-new/Mesh/CMakeLists.txt
+--- gmsh-2.9.0-source/Mesh/CMakeLists.txt 2015-03-08 14:03:14.000000000 +0100
++++ gmsh-2.9.0-source-new/Mesh/CMakeLists.txt 2015-03-13 23:52:22.327508454 +0100
@@ -39,6 +39,7 @@ set(SRC
Field.cpp
CenterlineField.cpp
@@ -193,9 +193,9 @@ diff -rupN gmsh-2.8.5-source/Mesh/CMakeLists.txt gmsh-2.8.5-source-new/Mesh/CMak
)
file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
-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
+diff -rupN gmsh-2.9.0-source/Mesh/meshGRegionMMG3D.cpp gmsh-2.9.0-source-new/Mesh/meshGRegionMMG3D.cpp
+--- gmsh-2.9.0-source/Mesh/meshGRegionMMG3D.cpp 2015-03-08 14:03:14.000000000 +0100
++++ gmsh-2.9.0-source-new/Mesh/meshGRegionMMG3D.cpp 2015-03-13 23:52:22.327508454 +0100
@@ -19,7 +19,7 @@
#include "Context.h"
diff --git a/sources b/sources
index 178c3ad..d60a948 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d512c1ea63e3d4daec1ced9fd4dacb89 gmsh-2.8.5-source-fedora.tar.gz
+33c35ba24794502f45277be2f7d8bb23 gmsh-2.9.0-source-fedora.tar.xz
More information about the scm-commits
mailing list