diff --git a/gmsh.spec b/gmsh.spec index 665a5a2..516df0e 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -4,7 +4,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.5.6 -Release: 1%{?dist} +Release: 2%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -27,6 +27,8 @@ Patch3: gmsh_julia.patch Patch4: gmsh_install.patch # Fix build error caused by include ordering Patch5: gmsh_build.patch +# Unbundle gl2ps +Patch6: gmsh_unbundle_gl2ps.patch BuildRequires: alglib-devel BuildRequires: ann-devel @@ -377,6 +379,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Mon Apr 06 2020 Sandro Mani - 4.5.6-2 +- Unbundle gl2ps (#1821461) + * Mon Mar 30 2020 Sandro Mani - 4.5.6-1 - Update to 4.5.6 diff --git a/gmsh_build.patch b/gmsh_build.patch index 11ce1a6..12a56b5 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ 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 +--- gmsh-4.5.6-source/Fltk/helpWindow.cpp 2020-04-06 23:51:16.379659060 +0200 ++++ gmsh-4.5.6-source-new/Fltk/helpWindow.cpp 2020-04-06 23:51:16.642659616 +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 89576b5..4cb2a92 100644 --- a/gmsh_c++14.patch +++ b/gmsh_c++14.patch @@ -1,6 +1,6 @@ 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 +--- gmsh-4.5.6-source/CMakeLists.txt 2020-04-06 23:51:16.106658483 +0200 ++++ gmsh-4.5.6-source-new/CMakeLists.txt 2020-04-06 23:51:16.108658487 +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) diff --git a/gmsh_install.patch b/gmsh_install.patch index efa0f55..a746a5f 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ 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 +--- gmsh-4.5.6-source/CMakeLists.txt 2020-04-06 23:51:16.513659344 +0200 ++++ gmsh-4.5.6-source-new/CMakeLists.txt 2020-04-06 23:51:16.516659350 +0200 @@ -253,7 +253,7 @@ else() # when building, don't use the install RPATH already (but later on when # installing) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 78d1bb2..fa7aa12 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,6 +1,6 @@ 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 +--- gmsh-4.5.6-source/CMakeLists.txt 2020-04-06 23:51:16.248658783 +0200 ++++ gmsh-4.5.6-source-new/CMakeLists.txt 2020-04-06 23:51:16.381659064 +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}) diff --git a/gmsh_med.patch b/gmsh_med.patch index 530fee2..1c726ff 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ 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 ++++ gmsh-4.5.6-source-new/Common/CommandLine.cpp 2020-04-06 23:51:16.250658787 +0200 @@ -42,7 +42,7 @@ #endif @@ -12,7 +12,7 @@ diff -rupN --no-dereference gmsh-4.5.6-source/Common/CommandLine.cpp gmsh-4.5.6- #if defined(HAVE_POST) 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 ++++ gmsh-4.5.6-source-new/Fltk/helpWindow.cpp 2020-04-06 23:51:16.251658790 +0200 @@ -38,7 +38,7 @@ #endif @@ -24,7 +24,7 @@ diff -rupN --no-dereference gmsh-4.5.6-source/Fltk/helpWindow.cpp gmsh-4.5.6-sou static const char *help_link(Fl_Widget *w, const char *uri) 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 ++++ gmsh-4.5.6-source-new/Geo/GModelIO_MED.cpp 2020-04-06 23:51:16.251658790 +0200 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -36,7 +36,7 @@ diff -rupN --no-dereference gmsh-4.5.6-source/Geo/GModelIO_MED.cpp gmsh-4.5.6-so // To avoid too many ifdefs below we use defines for the bits of the 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 ++++ gmsh-4.5.6-source-new/Post/PViewDataGModelIO.cpp 2020-04-06 23:51:16.251658790 +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 2d3fc81..dfbea11 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,6 +1,6 @@ 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 ++++ gmsh-4.5.6-source-new/CMakeLists.txt 2020-04-06 23:51:15.965658185 +0200 @@ -1857,6 +1857,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -26,7 +26,7 @@ diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-n install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) 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 ++++ gmsh-4.5.6-source-new/Common/GmshMessage.cpp 2020-04-06 23:51:15.966658187 +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/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch new file mode 100644 index 0000000..4d447ac --- /dev/null +++ b/gmsh_unbundle_gl2ps.patch @@ -0,0 +1,23 @@ +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-04-06 23:51:16.640659612 +0200 ++++ gmsh-4.5.6-source-new/CMakeLists.txt 2020-04-06 23:51:16.777659902 +0200 +@@ -1615,6 +1615,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB + endif() + endif() + ++list(APPEND LINK_LIBRARIES -lgl2ps -lGL) ++ + # Linux-specific linking + if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + if(HAVE_OCC) +diff -rupN --no-dereference gmsh-4.5.6-source/Graphics/CMakeLists.txt gmsh-4.5.6-source-new/Graphics/CMakeLists.txt +--- gmsh-4.5.6-source/Graphics/CMakeLists.txt 2020-03-28 12:28:04.000000000 +0100 ++++ gmsh-4.5.6-source-new/Graphics/CMakeLists.txt 2020-04-06 23:51:16.777659902 +0200 +@@ -15,7 +15,6 @@ set(SRC + drawScales.cpp + drawGraph2d.cpp + drawGlyph.cpp +- gl2ps.cpp + gl2gif.cpp + gl2jpeg.cpp + gl2png.cpp