+patches applied to SALOME master on February 15th, 2019, October 15th, with their size and sha1sum :
-patches applied to SALOME master on October 15th, with their sha1sum :
+ 16a744c44edd656313518a2c4395faf3c2231b29 4784 freeimage-3.16.0_gcc6.patch (~ occt/freeimage.004_gcc66.patch)
+ patch to build freeimage with gcc 6 version
- 64c74ba409992518c6c639dd3a5a19bde88cbc1f doxygen-1.8.3.1.patch
- 046eefd38729b4d9f8fe2d90116cc5889e61399d doxygen_compatibility_flex260.patch
- 16a744c44edd656313518a2c4395faf3c2231b29 freeimage-3.16.0_gcc6.patch
- 0f7a3ede54223bcf9e8fd02fb3a70cdfc3feadd3 gl2ps-1.4.0-GLUT.patch
- 584680046919e11e5fa521a68b098a926542c0e3 metis-use_cat_not_more.patch
- ab660d036e7f761e6c8d0df1cc994c5d2c9ec2db netgen-5.3.1-for-SALOME-OCCT-7.2.0.patch
+ 0f7a3ede54223bcf9e8fd02fb3a70cdfc3feadd3 699 gl2ps-1.4.0-GLUT.patch
+ cmake option to activate/desactivate GLUT
+
+
+ e8c95d6e325c42be00349a72eaede02c188db9bb 1181 hdf5-1.10.3.patch (~ occt/hdf5.001_threads_threads.patch)
+ fix problem with Threads::Threads library for CMake build procedure
+
+
+ 584680046919e11e5fa521a68b098a926542c0e3 348 metis-use_cat_not_more.patch
+ replace more command by a cat command
+
+
+ ab660d036e7f761e6c8d0df1cc994c5d2c9ec2db 57810 netgen-5.3.1-for-SALOME-OCCT-7.2.0.patch
+ compatibility patch provided by OCC
+++ /dev/null
-diff -Naur doxygen-1.8.3.1_SRC_INIT/src/resize.js doxygen-1.8.3.1_SRC_MODIF/src/resize.js
---- doxygen-1.8.3.1_SRC_INIT/src/resize.js 2013-01-05 19:17:43.000000000 +0400
-+++ doxygen-1.8.3.1_SRC_MODIF/src/resize.js 2013-03-15 18:23:33.000000000 +0400
-@@ -1,5 +1,6 @@
- var cookie_namespace = 'doxygen';
- var sidenav,navtree,content,header;
-+var navrows = new Array();
-
- function readCookie(cookie)
- {
-@@ -39,24 +40,42 @@
- var windowWidth = $(window).width() + "px";
- var sidenavWidth = $(sidenav).outerWidth();
- content.css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar
-+ for(var i = 1; i <= 4;i++) {
-+ if(navrows[i] != null)
-+ navrows[i].css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar
-+ navrows[i].css({width:windowWidth-parseInt(sidenavWidth) - 6 + "px"});
-+ }
- writeCookie('width',sidenavWidth, null);
- }
-
- function restoreWidth(navWidth)
- {
-- var windowWidth = $(window).width() + "px";
-+ var windowWidth = $(window).width() + "px";
- content.css({marginLeft:parseInt(navWidth)+6+"px"});
- sidenav.css({width:navWidth + "px"});
-+ for(var i = 1; i <= 4;i++) {
-+ if(navrows[i] != null)
-+ navrows[i].css({marginLeft:parseInt(navWidth)+6+"px"});
-+ navrows[i].css({width:windowWidth-parseInt(navWidth) - 6 + "px"});
-+ }
- }
-
- function resizeHeight()
- {
- var headerHeight = header.outerHeight();
- var footerHeight = footer.outerHeight();
-+ var navrowsH = 0;
-+ for(var i = 1; i <= 4;i++) {
-+ if(navrows[i] != null)
-+ navrowsH = navrowsH + navrows[i].height();
-+ }
- var windowHeight = $(window).height() - headerHeight - footerHeight;
-+ var treeH = windowHeight + navrowsH;
- content.css({height:windowHeight + "px"});
- navtree.css({height:windowHeight + "px"});
- sidenav.css({height:windowHeight + "px",top: headerHeight+"px"});
-+ navtree.css({height:treeH +"px"});
-+ sidenav.css({height:treeH +"px", top: headerHeight+"px"});
- }
-
- function initResizable()
-@@ -66,6 +85,10 @@
- content = $("#doc-content");
- navtree = $("#nav-tree");
- footer = $("#nav-path");
-+ for(var i = 1; i <= 4;i++) {
-+ navrows[i] = $("#navrow"+i);
-+ }
-+
- $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
- $(window).resize(function() { resizeHeight(); });
- var width = readCookie('width');
+++ /dev/null
-diff -rupN doxygen_old/src/code.l doxygen_new/src/code.l
---- doxygen_old/src/code.l 2013-01-05 16:17:40.000000000 +0100
-+++ doxygen_new/src/code.l 2016-07-18 09:58:52.775994675 +0200
-@@ -3659,7 +3659,7 @@ void codeFreeScanner()
- extern "C" { // some bogus code to keep the compiler happy
- void codeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #endif
-
-diff -rupN doxygen_old/src/commentscan.l doxygen_new/src/commentscan.l
---- doxygen_old/src/commentscan.l 2013-01-18 22:14:15.000000000 +0100
-+++ doxygen_new/src/commentscan.l 2016-07-18 10:01:12.471994525 +0200
-@@ -1049,8 +1049,8 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
- // but we need to know the position in the input buffer where this
- // rule matched.
- // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
--#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-- inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
-+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-+ inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
- #else
- inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
- #endif
-@@ -1111,8 +1111,8 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
- g_memberGroupHeader.resize(0);
- parseMore=TRUE;
- needNewEntry = TRUE;
--#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-- inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
-+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-+ inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
- #else
- inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
- #endif
-diff -rupN doxygen_old/src/fortrancode.l doxygen_new/src/fortrancode.l
---- doxygen_old/src/fortrancode.l 2013-01-15 21:14:20.000000000 +0100
-+++ doxygen_new/src/fortrancode.l 2016-07-18 10:01:55.319994479 +0200
-@@ -1184,7 +1184,7 @@ void parseFortranCode(CodeOutputInterfac
- extern "C" { // some bogus code to keep the compiler happy
- void fcodeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #else
- extern "C" { // some bogus code to keep the compiler happy
-diff -rupN doxygen_old/src/pycode.l doxygen_new/src/pycode.l
---- doxygen_old/src/pycode.l 2013-01-05 16:17:43.000000000 +0100
-+++ doxygen_new/src/pycode.l 2016-07-18 10:19:39.687993338 +0200
-@@ -1502,11 +1502,9 @@ void parsePythonCode(CodeOutputInterface
- }
-
-
--#if !defined(YY_FLEX_SUBMINOR_VERSION)
-+#if YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- extern "C" { // some bogus code to keep the compiler happy
- void pycodeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
--#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
- #endif
-
-diff -rupN doxygen_old/src/vhdlcode.l doxygen_new/src/vhdlcode.l
---- doxygen_old/src/vhdlcode.l 2013-01-05 16:17:44.000000000 +0100
-+++ doxygen_new/src/vhdlcode.l 2016-07-18 10:03:28.055994379 +0200
-@@ -1606,7 +1606,7 @@ void codeFreeVhdlScanner()
- extern "C" { // some bogus code to keep the compiler happy
- void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #endif
-
--- /dev/null
+diff -Naur --exclude=CVS --exclude=.git hdf5-1.10.3_orig/src/CMakeLists.txt hdf5-1.10.3_patched/src/CMakeLists.txt\r
+--- hdf5-1.10.3_orig/src/CMakeLists.txt 2018-08-10 00:36:31.000000000 +0300\r
++++ hdf5-1.10.3_patched/src/CMakeLists.txt 2018-10-10 16:25:28.196773245 +0300\r
+@@ -954,9 +954,10 @@\r
+ $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG>\r
+ )\r
+ TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED)\r
++ get_property(_threads_libs TARGET Threads::Threads PROPERTY INTERFACE_LINK_LIBRARIES)\r
+ target_link_libraries (${HDF5_LIBSH_TARGET}\r
+ PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>"\r
+- PUBLIC $<$<NOT:$<PLATFORM_ID:Windows>>:${CMAKE_DL_LIBS}> $<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:Threads::Threads>\r
++ PUBLIC $<$<NOT:$<PLATFORM_ID:Windows>>:${CMAKE_DL_LIBS}> $<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:${_threads_libs}>\r
+ )\r
+ set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_LIBSH_TARGET}")\r
+ H5_SET_LIB_OPTIONS (${HDF5_LIBSH_TARGET} ${HDF5_LIB_NAME} SHARED "LIB")\r
