From 26d29d98a9bc4026b04b303bf3a39a4e4ec3813e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mar 31 2020 09:04:14 +0000 Subject: Update to 4.5.6 --- diff --git a/.gitignore b/.gitignore index 4a13fa6..06a39db 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /gmsh-4.5.3-source-fedora.tar.xz /gmsh-4.5.4-source-fedora.tar.xz /gmsh-4.5.5-source-fedora.tar.xz +/gmsh-4.5.6-source-fedora.tar.xz diff --git a/gmsh.spec b/gmsh.spec index a192a47..665a5a2 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -3,7 +3,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.5.5 +Version: 4.5.6 Release: 1%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt @@ -377,6 +377,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Mon Mar 30 2020 Sandro Mani - 4.5.6-1 +- Update to 4.5.6 + * Sat Mar 21 2020 Sandro Mani - 4.5.5-1 - Update to 4.5.5 diff --git a/gmsh_build.patch b/gmsh_build.patch index 4e9a4e2..11ce1a6 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.5.5-source/Fltk/helpWindow.cpp gmsh-4.5.5-source-new/Fltk/helpWindow.cpp ---- gmsh-4.5.5-source/Fltk/helpWindow.cpp 2020-03-21 12:29:14.573143163 +0100 -+++ gmsh-4.5.5-source-new/Fltk/helpWindow.cpp 2020-03-21 12:29:14.822143366 +0100 +diff -rupN --no-dereference gmsh-4.5.6-source/Fltk/helpWindow.cpp gmsh-4.5.6-source-new/Fltk/helpWindow.cpp +--- gmsh-4.5.6-source/Fltk/helpWindow.cpp 2020-03-30 21:37:17.637647264 +0200 ++++ gmsh-4.5.6-source-new/Fltk/helpWindow.cpp 2020-03-30 21:37:17.883647266 +0200 @@ -3,6 +3,12 @@ // See the LICENSE.txt file for license information. Please report all // issues on https://gitlab.onelab.info/gmsh/gmsh/issues. diff --git a/gmsh_c++14.patch b/gmsh_c++14.patch index 49f21d3..89576b5 100644 --- a/gmsh_c++14.patch +++ b/gmsh_c++14.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.5.5-source/CMakeLists.txt gmsh-4.5.5-source-new/CMakeLists.txt ---- gmsh-4.5.5-source/CMakeLists.txt 2020-03-21 12:29:14.312142951 +0100 -+++ gmsh-4.5.5-source-new/CMakeLists.txt 2020-03-21 12:29:14.315142954 +0100 +diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-new/CMakeLists.txt +--- gmsh-4.5.6-source/CMakeLists.txt 2020-03-30 21:37:17.385647263 +0200 ++++ gmsh-4.5.6-source-new/CMakeLists.txt 2020-03-30 21:37:17.388647263 +0200 @@ -44,7 +44,7 @@ opt(BUILD_IOS "Enable iOS library target opt(CGNS "Enable CGNS import/export (experimental)" ${DEFAULT}) opt(CGNS_CPEX0045 "Enable high-order CGNS import/export following CPEX0045 (experimental)" OFF) @@ -44,7 +44,7 @@ diff -rupN --no-dereference gmsh-4.5.5-source/CMakeLists.txt gmsh-4.5.5-source-n endif() else() message(WARNING "Revoropt requires Eigen3, Mesh, Plugins, ANN and ALGLIB") -@@ -1719,7 +1719,7 @@ if(ENABLE_BUILD_ANDROID) +@@ -1722,7 +1722,7 @@ if(ENABLE_BUILD_ANDROID) message(FATAL_ERROR "Cannot compile Gmsh for android without android-cmake") endif() add_definitions(-D_GLIBCXX_USE_C99_MATH=1) diff --git a/gmsh_install.patch b/gmsh_install.patch index 7858e59..efa0f55 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.5.5-source/CMakeLists.txt gmsh-4.5.5-source-new/CMakeLists.txt ---- gmsh-4.5.5-source/CMakeLists.txt 2020-03-21 12:29:14.698143265 +0100 -+++ gmsh-4.5.5-source-new/CMakeLists.txt 2020-03-21 12:29:14.701143267 +0100 +diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-new/CMakeLists.txt +--- gmsh-4.5.6-source/CMakeLists.txt 2020-03-30 21:37:17.760647265 +0200 ++++ gmsh-4.5.6-source-new/CMakeLists.txt 2020-03-30 21:37:17.762647265 +0200 @@ -253,7 +253,7 @@ else() # when building, don't use the install RPATH already (but later on when # installing) @@ -10,12 +10,3 @@ diff -rupN --no-dereference gmsh-4.5.5-source/CMakeLists.txt gmsh-4.5.5-source-n # add the automatically determined parts of the RPATH which point to # directories outside the build tree to the install RPATH -@@ -1865,7 +1865,7 @@ endif() - if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) - install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL) - # FIXME once we cleanup the installation of the python module -- install(TARGETS shared DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/api OPTIONAL) -+ # install(TARGETS shared DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/api OPTIONAL) - endif() - - if(ENABLE_ONELAB) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index a45d92f..78d1bb2 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.5.5-source/CMakeLists.txt gmsh-4.5.5-source-new/CMakeLists.txt ---- gmsh-4.5.5-source/CMakeLists.txt 2020-03-21 12:29:14.449143063 +0100 -+++ gmsh-4.5.5-source-new/CMakeLists.txt 2020-03-21 12:29:14.575143165 +0100 -@@ -1874,7 +1874,7 @@ endif() +diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-new/CMakeLists.txt +--- gmsh-4.5.6-source/CMakeLists.txt 2020-03-30 21:37:17.515647264 +0200 ++++ gmsh-4.5.6-source-new/CMakeLists.txt 2020-03-30 21:37:17.640647264 +0200 +@@ -1883,7 +1883,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) install(FILES ${GMSH_PY} DESTINATION ${PYTHON3_SITE_PACKAGES}) diff --git a/gmsh_med.patch b/gmsh_med.patch index 41d4a8e..530fee2 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.5.5-source/Common/CommandLine.cpp gmsh-4.5.5-source-new/Common/CommandLine.cpp ---- gmsh-4.5.5-source/Common/CommandLine.cpp 2020-03-21 08:33:06.000000000 +0100 -+++ gmsh-4.5.5-source-new/Common/CommandLine.cpp 2020-03-21 12:29:14.451143064 +0100 +diff -rupN --no-dereference gmsh-4.5.6-source/Common/CommandLine.cpp gmsh-4.5.6-source-new/Common/CommandLine.cpp +--- gmsh-4.5.6-source/Common/CommandLine.cpp 2020-03-30 16:09:59.000000000 +0200 ++++ gmsh-4.5.6-source-new/Common/CommandLine.cpp 2020-03-30 21:37:17.517647264 +0200 @@ -42,7 +42,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.5.5-source/Common/CommandLine.cpp gmsh-4.5.5- #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.5.5-source/Fltk/helpWindow.cpp gmsh-4.5.5-source-new/Fltk/helpWindow.cpp ---- gmsh-4.5.5-source/Fltk/helpWindow.cpp 2020-02-07 14:15:26.000000000 +0100 -+++ gmsh-4.5.5-source-new/Fltk/helpWindow.cpp 2020-03-21 12:29:14.451143064 +0100 +diff -rupN --no-dereference gmsh-4.5.6-source/Fltk/helpWindow.cpp gmsh-4.5.6-source-new/Fltk/helpWindow.cpp +--- gmsh-4.5.6-source/Fltk/helpWindow.cpp 2020-03-28 12:28:04.000000000 +0100 ++++ gmsh-4.5.6-source-new/Fltk/helpWindow.cpp 2020-03-30 21:37:17.517647264 +0200 @@ -38,7 +38,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.5.5-source/Fltk/helpWindow.cpp gmsh-4.5.5-sou #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.5.5-source/Geo/GModelIO_MED.cpp gmsh-4.5.5-source-new/Geo/GModelIO_MED.cpp ---- gmsh-4.5.5-source/Geo/GModelIO_MED.cpp 2020-03-10 15:55:36.000000000 +0100 -+++ gmsh-4.5.5-source-new/Geo/GModelIO_MED.cpp 2020-03-21 12:29:14.451143064 +0100 +diff -rupN --no-dereference gmsh-4.5.6-source/Geo/GModelIO_MED.cpp gmsh-4.5.6-source-new/Geo/GModelIO_MED.cpp +--- gmsh-4.5.6-source/Geo/GModelIO_MED.cpp 2020-03-28 12:28:04.000000000 +0100 ++++ gmsh-4.5.6-source-new/Geo/GModelIO_MED.cpp 2020-03-30 21:37:17.517647264 +0200 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.5.5-source/Geo/GModelIO_MED.cpp gmsh-4.5.5-so #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.5.5-source/Post/PViewDataGModelIO.cpp gmsh-4.5.5-source-new/Post/PViewDataGModelIO.cpp ---- gmsh-4.5.5-source/Post/PViewDataGModelIO.cpp 2020-02-07 14:15:27.000000000 +0100 -+++ gmsh-4.5.5-source-new/Post/PViewDataGModelIO.cpp 2020-03-21 12:29:14.452143065 +0100 +diff -rupN --no-dereference gmsh-4.5.6-source/Post/PViewDataGModelIO.cpp gmsh-4.5.6-source-new/Post/PViewDataGModelIO.cpp +--- gmsh-4.5.6-source/Post/PViewDataGModelIO.cpp 2020-03-28 12:28:04.000000000 +0100 ++++ gmsh-4.5.6-source-new/Post/PViewDataGModelIO.cpp 2020-03-30 21:37:17.518647264 +0200 @@ -471,7 +471,7 @@ void PViewDataGModel::importLists(int N[ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 239a5b6..2d3fc81 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.5.5-source/CMakeLists.txt gmsh-4.5.5-source-new/CMakeLists.txt ---- gmsh-4.5.5-source/CMakeLists.txt 2020-03-21 08:33:06.000000000 +0100 -+++ gmsh-4.5.5-source-new/CMakeLists.txt 2020-03-21 12:29:14.187142850 +0100 -@@ -1846,6 +1846,8 @@ else() +diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-new/CMakeLists.txt +--- gmsh-4.5.6-source/CMakeLists.txt 2020-03-30 16:09:59.000000000 +0200 ++++ gmsh-4.5.6-source-new/CMakeLists.txt 2020-03-30 21:37:17.262647262 +0200 +@@ -1857,6 +1857,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -10,7 +10,7 @@ diff -rupN --no-dereference gmsh-4.5.5-source/CMakeLists.txt gmsh-4.5.5-source-n # FIXME: change this once we understand rpaths if(APPLE) if(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED) -@@ -1867,11 +1869,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D +@@ -1876,11 +1878,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D endif() if(ENABLE_ONELAB) @@ -24,9 +24,9 @@ diff -rupN --no-dereference gmsh-4.5.5-source/CMakeLists.txt gmsh-4.5.5-source-n install(FILES ${GMSH_JL} DESTINATION ${GMSH_LIB}) if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) -diff -rupN --no-dereference gmsh-4.5.5-source/Common/GmshMessage.cpp gmsh-4.5.5-source-new/Common/GmshMessage.cpp ---- gmsh-4.5.5-source/Common/GmshMessage.cpp 2020-03-16 19:54:44.000000000 +0100 -+++ gmsh-4.5.5-source-new/Common/GmshMessage.cpp 2020-03-21 12:29:14.187142850 +0100 +diff -rupN --no-dereference gmsh-4.5.6-source/Common/GmshMessage.cpp gmsh-4.5.6-source-new/Common/GmshMessage.cpp +--- gmsh-4.5.6-source/Common/GmshMessage.cpp 2020-03-28 12:28:04.000000000 +0100 ++++ gmsh-4.5.6-source-new/Common/GmshMessage.cpp 2020-03-30 21:37:17.263647262 +0200 @@ -158,12 +158,6 @@ void Msg::Init(int argc, char **argv) if(CTX::instance()->exeFileName.empty() && argc && argv) CTX::instance()->exeFileName = argv[0]; diff --git a/sources b/sources index 1c51f4c..a9a3016 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.5.5-source-fedora.tar.xz) = 57961966d9ea4885fcd37916426214b74e20ea1d64f54e78f4a96d1f63d0cf39cf17b5f9f0fbe0f676c860a5e051b09fabc3f12e140d128c5dd9591571a81a69 +SHA512 (gmsh-4.5.6-source-fedora.tar.xz) = 282cd0f07310ad1be7fffc3ce84b3a5880138bb784fdb4fcf770c6033c8197d16fe2c799d54b80dec5189b49f2805b5851249ef6d5e1cea660c6f8c34f85997b