4 files changed, 17 insertions, 28 deletions

diff --git a/cad/gmsh/files/patch-Common::AdaptiveViews.cpp b/cad/gmsh/files/patch-Common::AdaptiveViews.cpp
deleted file mode 100644
index 339a5ef1221d..000000000000
--- a/cad/gmsh/files/patch-Common::AdaptiveViews.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- Common/AdaptiveViews.cpp.orig	Thu Nov 11 07:45:16 2004
-+++ Common/AdaptiveViews.cpp	Thu Nov 11 16:11:29 2004
-@@ -23,6 +23,7 @@
- 				       
- #include <stdio.h>
- #include <math.h>
-+#include <time.h>
- #include <list>
- #include <set>
- #include "Views.h"
diff --git a/cad/gmsh/files/patch-Post_AdaptiveViews.cpp b/cad/gmsh/files/patch-Post_AdaptiveViews.cpp
new file mode 100644
index 000000000000..5c0c58378686
--- /dev/null
+++ b/cad/gmsh/files/patch-Post_AdaptiveViews.cpp
@@ -0,0 +1,10 @@
+--- ./Post/AdaptiveViews.cpp.orig	Mon Jul  9 15:54:37 2007
++++ ./Post/AdaptiveViews.cpp	Mon Jul 23 22:42:06 2007
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <math.h>
++#include <time.h>
+ #include <list>
+ #include <set>
+ #include "AdaptiveViews.h"
diff --git a/cad/gmsh/files/patch-configure b/cad/gmsh/files/patch-configure
index 169777176897..d1729b700667 100644
--- a/cad/gmsh/files/patch-configure
+++ b/cad/gmsh/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	Sat Mar 31 11:38:03 2007
-+++ configure	Sun Apr  1 10:24:31 2007
-@@ -3174,7 +3174,7 @@
+--- configure.orig	Thu Jul 12 18:08:39 2007
++++ configure	Mon Jul 23 22:45:54 2007
+@@ -3192,7 +3192,7 @@
    GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
    GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo"
-   GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshCommon -lGmshDataStr -lGmshNumeric"
+   GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr -lGmshNumeric"
 -  GMSH_LIBS="${GMSH_LIBS} -lGmshParallel"
 +  GMSH_LIBS="${GMSH_LIBS} -lGmshParallel ${LDFLAGS}"
    FLAGS="-DHAVE_FLTK ${FLAGS}"
  
    if test "x${FLTK_PREFIX}" != "x" ; then
-@@ -4521,7 +4521,7 @@
+@@ -4541,7 +4541,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -18,7 +18,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4584,7 +4584,7 @@
+@@ -4604,7 +4604,7 @@
        GMSH_LIBS="${GMSH_LIBS} -lcgns"
        FLAGS="${FLAGS} -DHAVE_LIBCGNS"
      else
@@ -27,7 +27,7 @@
        FLAGS="${FLAGS} -DHAVE_LIBCGNS -I${CGNS_PREFIX}/include"
      fi
    fi
-@@ -4678,7 +4678,7 @@
+@@ -4698,7 +4698,7 @@
        FLAGS="${FLAGS} -DHAVE_OCC"
      else
        GMSH_LIBS="${GMSH_LIBS} -L${OCC_PREFIX}/lib ${OCC_LIBS}"
diff --git a/cad/gmsh/files/patch-utils_converters_autocad_message.c b/cad/gmsh/files/patch-utils_converters_autocad_message.c
deleted file mode 100644
index 550c1d1eb817..000000000000
--- a/cad/gmsh/files/patch-utils_converters_autocad_message.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/converters/autocad/message.c.orig	Fri May  9 23:58:55 2003
-+++ utils/converters/autocad/message.c	Mon Feb  5 21:47:50 2007
-@@ -3,7 +3,7 @@
- #include <signal.h>
- #include <stdarg.h>
- 
--void Msg(int level, char *fmt, ...)
-+void Msg(int level, const char *fmt, ...)
- {
-   va_list args;
-   va_start(args, fmt);