From 204eb9826f9c21f301a328d1bc6e388c04b38a35 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jul 29 2019 14:45:15 +0000 Subject: Update to 4.4.1 --- diff --git a/.gitignore b/.gitignore index ddc40a7..98b65b5 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /gmsh-4.2.3-source-fedora.tar.xz /gmsh-4.3.0-source-fedora.tar.xz /gmsh-4.4.0-source-fedora.tar.xz +/gmsh-4.4.1-source-fedora.tar.xz diff --git a/gmsh.spec b/gmsh.spec index a90584a..1e19612 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -3,8 +3,8 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.4.0 -Release: 2%{?dist} +Version: 4.4.1 +Release: 1%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -377,6 +377,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Mon Jul 29 2019 Sandro Mani - 4.4.1-1 +- Update to 4.4.1 + * Thu Jul 25 2019 Fedora Release Engineering - 4.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/gmsh_build.patch b/gmsh_build.patch index 554a65b..5244775 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.4.0-source/Common/CommandLine.cpp gmsh-4.4.0-source-new/Common/CommandLine.cpp ---- gmsh-4.4.0-source/Common/CommandLine.cpp 2019-07-01 15:32:47.772134213 +0200 -+++ gmsh-4.4.0-source-new/Common/CommandLine.cpp 2019-07-01 15:32:47.774134219 +0200 +diff -rupN gmsh-4.4.1-source/Common/CommandLine.cpp gmsh-4.4.1-source-new/Common/CommandLine.cpp +--- gmsh-4.4.1-source/Common/CommandLine.cpp 2019-07-29 16:44:32.132608978 +0200 ++++ gmsh-4.4.1-source-new/Common/CommandLine.cpp 2019-07-29 16:44:32.135608880 +0200 @@ -22,15 +22,6 @@ #include "GmshGlobal.h" #include "StringUtils.h" @@ -33,9 +33,9 @@ diff -rupN gmsh-4.4.0-source/Common/CommandLine.cpp gmsh-4.4.0-source-new/Common int GetGmshMajorVersion(){ return GMSH_MAJOR_VERSION; } int GetGmshMinorVersion(){ return GMSH_MINOR_VERSION; } int GetGmshPatchVersion(){ return GMSH_PATCH_VERSION; } -diff -rupN gmsh-4.4.0-source/Fltk/helpWindow.cpp gmsh-4.4.0-source-new/Fltk/helpWindow.cpp ---- gmsh-4.4.0-source/Fltk/helpWindow.cpp 2019-07-01 15:32:47.772134213 +0200 -+++ gmsh-4.4.0-source-new/Fltk/helpWindow.cpp 2019-07-01 15:33:24.378246646 +0200 +diff -rupN gmsh-4.4.1-source/Fltk/helpWindow.cpp gmsh-4.4.1-source-new/Fltk/helpWindow.cpp +--- gmsh-4.4.1-source/Fltk/helpWindow.cpp 2019-07-29 16:44:32.132608978 +0200 ++++ gmsh-4.4.1-source-new/Fltk/helpWindow.cpp 2019-07-29 16:44:32.136608848 +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. @@ -57,510 +57,9 @@ diff -rupN gmsh-4.4.0-source/Fltk/helpWindow.cpp gmsh-4.4.0-source-new/Fltk/help #include "FlGui.h" #include "inputValue.h" #include "helpWindow.h" -diff -rupN gmsh-4.4.0-source/Fltk/helpWindow.cpp.orig gmsh-4.4.0-source-new/Fltk/helpWindow.cpp.orig ---- gmsh-4.4.0-source/Fltk/helpWindow.cpp.orig 1970-01-01 01:00:00.000000000 +0100 -+++ gmsh-4.4.0-source-new/Fltk/helpWindow.cpp.orig 2019-07-01 15:32:47.774134219 +0200 -@@ -0,0 +1,497 @@ -+// Gmsh - Copyright (C) 1997-2019 C. Geuzaine, J.-F. Remacle -+// -+// See the LICENSE.txt file for license information. Please report all -+// issues on https://gitlab.onelab.info/gmsh/gmsh/issues. -+ -+#include -+#include -+#include -+#if __cplusplus >= 201103L -+#include -+#endif -+#include -+#include -+#include -+#include -+#include "GmshConfig.h" -+#include "FlGui.h" -+#include "inputValue.h" -+#include "helpWindow.h" -+#include "paletteWindow.h" -+#include "CommandLine.h" -+#include "StringUtils.h" -+#include "OS.h" -+#include "Options.h" -+#include "Context.h" -+#include "drawContext.h" -+ -+#if defined(HAVE_PARSER) -+#include "Parser.h" -+#endif -+ -+#if defined(HAVE_PETSC) -+#include "petsc.h" -+#endif -+ -+#if defined(HAVE_OCC) -+#include "Standard_Version.hxx" -+#endif -+ -+#if defined(HAVE_MED) -+#include -+#endif -+ -+static const char *help_link(Fl_Widget *w, const char *uri) -+{ -+ fl_open_uri(uri); -+ return 0; -+} -+ -+struct opt_data { -+ std::string category; -+ int index; -+ std::string name; -+}; -+ -+static void interactive_cb(Fl_Widget *w, void *data) -+{ -+ if(!data) return; -+ inputValueFloat *v = (inputValueFloat *)w; -+ opt_data *d = (opt_data *)data; -+ double val = v->value(); -+ NumberOption(GMSH_SET | GMSH_GUI, d->category.c_str(), d->index, -+ d->name.c_str(), val); -+ drawContext::global()->draw(); -+} -+ -+double numberOrStringOptionChooser(const std::string &category, int index, -+ const std::string &name, bool isNumber, -+ const std::string &title, bool isInteractive, -+ double minimum, double maximum, double step) -+{ -+ double valn = 0.; -+ std::string vals = ""; -+ if(isNumber) -+ NumberOption(GMSH_GET, category.c_str(), index, name.c_str(), valn); -+ else -+ StringOption(GMSH_GET, category.c_str(), index, name.c_str(), vals); -+ -+ int nn = (isInteractive ? 2 : 3); -+ int width = nn * BB + (nn + 1) * WB, height = 2 * BH + 3 * WB; -+ std::string t = title; -+ if(t.empty()) t = (isNumber ? "Number Chooser" : "String Chooser"); -+ Fl_Window *win = new paletteWindow(width, height, false, t.c_str()); -+ win->set_modal(); -+ win->hotspot(win); -+ inputValueFloat *number = 0; -+ Fl_Input *string = 0; -+ if(isNumber) { -+ number = new inputValueFloat(WB, WB, width - 2 * WB, BH); -+ number->value(valn); -+ if(isInteractive) { -+ static opt_data d; -+ d.category = category; -+ d.index = index; -+ d.name = name; -+ number->minimum(minimum); -+ number->maximum(maximum); -+ if(CTX::instance()->inputScrolling) number->step(step, 1); -+ number->callback(interactive_cb, (void *)&d); -+ number->when(FL_WHEN_RELEASE); -+ } -+ } -+ else { -+ string = new Fl_Input(WB, WB, width - 2 * WB, BH); -+ string->value(vals.c_str()); -+ } -+ Fl_Button *ok = -+ new Fl_Return_Button(width - nn * BB - nn * WB, 2 * WB + BH, BB, BH, "OK"); -+ Fl_Button *def = new Fl_Button(width - (nn - 1) * BB - (nn - 1) * WB, -+ 2 * WB + BH, BB, BH, "Default"); -+ Fl_Button *cancel = 0; -+ if(!isInteractive) -+ cancel = new Fl_Button(width - BB - WB, 2 * WB + BH, BB, BH, "Cancel"); -+ win->end(); -+ win->show(); -+ if(number) number->take_focus(); -+ if(string) string->take_focus(); -+ bool done = false; -+ while(win->shown()) { -+ if(done) break; -+ Fl::wait(); -+ for(;;) { -+ Fl_Widget *o = Fl::readqueue(); -+ if(!o) break; -+ if(o == win || o == cancel) { -+ done = true; -+ break; -+ } -+ if(o == ok) { -+ if(isNumber) { -+ valn = number->value(); -+ NumberOption(GMSH_SET | GMSH_GUI, category.c_str(), index, -+ name.c_str(), valn); -+ } -+ else { -+ vals = string->value(); -+ StringOption(GMSH_SET | GMSH_GUI, category.c_str(), index, -+ name.c_str(), vals); -+ } -+ done = true; -+ break; -+ } -+ if(o == def) { -+ if(isNumber) { -+ NumberOption(GMSH_GET_DEFAULT, category.c_str(), index, name.c_str(), -+ valn); -+ number->value(valn); -+ if(isInteractive) number->do_callback(); -+ } -+ else { -+ StringOption(GMSH_GET_DEFAULT, category.c_str(), index, name.c_str(), -+ vals); -+ string->value(vals.c_str()); -+ } -+ break; -+ } -+ } -+ } -+ delete win; -+ -+ if(isNumber) { -+ NumberOption(GMSH_GET, category.c_str(), index, name.c_str(), valn); -+ return valn; -+ } -+ else -+ return 0.; -+} -+ -+static void colorOptionChooser(const std::string &category, int index, -+ const std::string &name) -+{ -+ unsigned int col; -+ ColorOption(GMSH_GET, category.c_str(), index, name.c_str(), col); -+ uchar r = CTX::instance()->unpackRed(col); -+ uchar g = CTX::instance()->unpackGreen(col); -+ uchar b = CTX::instance()->unpackBlue(col); -+ if(fl_color_chooser("Color Chooser", r, g, b, 1)) { -+ col = CTX::instance()->packColor(r, g, b, 255); -+ ColorOption(GMSH_SET | GMSH_GUI, category.c_str(), index, name.c_str(), -+ col); -+ } -+} -+ -+static void editOption(const std::string &type, const std::string &cat, -+ const std::string &name) -+{ -+ std::string category = cat; -+ int index = 0; -+ std::string::size_type p1 = cat.find('['), p2 = cat.find(']'); -+ if(p1 != std::string::npos && p2 != std::string::npos) { -+ category = cat.substr(0, p1); -+ std::string num = cat.substr(p1 + 1, p2 - p1 - 1); -+ index = atoi(num.c_str()); -+ } -+ -+ if(type == "number") -+ numberOrStringOptionChooser(category, index, name, true); -+ else if(type == "string") -+ numberOrStringOptionChooser(category, index, name, false); -+ else if(type == "color") -+ colorOptionChooser(category, index, name); -+} -+ -+static void browser_cb(Fl_Widget *w, void *data) -+{ -+ if(Fl::event_clicks()) { -+ // edit value -+ for(int i = 1; i <= FlGui::instance()->help->browser->size(); i++) { -+ if(FlGui::instance()->help->browser->selected(i)) { -+ const char *text = FlGui::instance()->help->browser->text(i); -+ const char *data = -+ (const char *)FlGui::instance()->help->browser->data(i); -+ if(data) { -+ std::string option(text), type(data), c1, c2; -+ std::string::size_type p1 = std::string::npos, p2 = p1; -+ p1 = option.find_first_of('.'); -+ if(p1 != std::string::npos) { -+ c1 = option.substr(0, p1); -+ p2 = option.find_first_of(' ', p1); -+ if(p2 != std::string::npos) c2 = option.substr(p1 + 1, p2 - p1 - 1); -+ } -+ if(type == "color") { -+ if(c2.size() > 6) -+ c2 = c2.substr(6); -+ else -+ c2 = ""; -+ } -+ if(c1.size() && c2.size()) { -+ editOption(type, c1, c2); -+ int top = FlGui::instance()->help->browser->topline(); -+ help_options_cb(0, 0); -+ FlGui::instance()->help->browser->topline(top); -+ FlGui::instance()->help->browser->select(i); -+ drawContext::global()->draw(); -+ } -+ } -+ break; -+ } -+ } -+ } -+ else { -+ // copy to clipboard -+ std::string buff; -+ for(int i = 1; i <= FlGui::instance()->help->browser->size(); i++) { -+ if(FlGui::instance()->help->browser->selected(i)) { -+ const char *c = FlGui::instance()->help->browser->text(i); -+ if(strlen(c) > 5 && c[0] == '@') -+ buff += std::string(&c[5]); -+ else -+ buff += std::string(c); -+ buff += "\n"; -+ } -+ } -+ Fl::copy(buff.c_str(), buff.size(), 0); -+ Fl::copy(buff.c_str(), buff.size(), 1); -+ } -+} -+ -+void help_options_cb(Fl_Widget *w, void *data) -+{ -+ std::vector s0; -+ int diff = FlGui::instance()->help->modified->value(); -+ int help = FlGui::instance()->help->showhelp->value(); -+ std::string search = FlGui::instance()->help->search->value(); -+ std::transform(search.begin(), search.end(), search.begin(), ::tolower); -+ -+ PrintOptions(0, GMSH_FULLRC, diff, help, 0, &s0); -+#if defined(HAVE_PARSER) -+ PrintParserSymbols(help, s0); -+#endif -+ -+ int top = FlGui::instance()->help->browser->topline(); -+ FlGui::instance()->help->browser->clear(); -+ for(std::size_t i = 0; i < s0.size(); i++) { -+ std::string::size_type sep = s0[i].rfind('\0'); -+ void *d = 0; -+ if(sep != std::string::npos) { -+ std::string tmp = s0[i].substr(sep + 1); -+ if(tmp == "number") -+ d = (void *)"number"; -+ else if(tmp == "string") -+ d = (void *)"string"; -+ else if(tmp == "color") -+ d = (void *)"color"; -+ } -+ if(search.empty()) { -+ FlGui::instance()->help->browser->add(s0[i].c_str(), d); -+ } -+ else { -+#if __cplusplus >= 201103L -+ try{ -+ // icase for case-insensitive search -+ if(std::regex_search(s0[i], std::regex(search, std::regex_constants::icase))) -+ FlGui::instance()->help->browser->add(s0[i].c_str(), d); -+ } -+ catch(...) { -+ } -+#else -+ std::string tmp(s0[i]); -+ std::transform(tmp.begin(), tmp.end(), tmp.begin(), ::tolower); -+ if(tmp.find(search) != std::string::npos) -+ FlGui::instance()->help->browser->add(s0[i].c_str(), d); -+#endif -+ } -+ } -+ FlGui::instance()->help->browser->topline(top); -+} -+ -+helpWindow::helpWindow() -+{ -+ { -+ int width = 28 * FL_NORMAL_SIZE; -+ int height = 19 * BH; -+ -+ about = new paletteWindow(width, height, -+ CTX::instance()->nonModalWindows ? true : false, -+ "About Gmsh"); -+ about->box(GMSH_WINDOW_BOX); -+ -+ Fl_Help_View *o = new Fl_Help_View(0, 0, width, height); -+ o->textfont(FL_HELVETICA); -+ o->textsize(FL_NORMAL_SIZE); -+ o->box(FL_FLAT_BOX); -+ std::ostringstream sstream; -+ sstream -+ << "

Gmsh


version " << GetGmshVersion() -+ << "

Copyright (C) 1997-2019" -+ << "
Christophe Geuzaine and Jean-Francois Remacle" -+ << "

Credits " -+ << "and licensing " -+ << "information" -+ << "

Please report all issues on " -+ << "" -+ << "https://gitlab.onelab.info/gmsh/gmsh/issues

" -+ << "
    " -+ << "
  • Build OS: " << GetGmshBuildOS() -+ << "
  • Build date: " << GetGmshBuildDate() -+ << "
  • Build host: " << GetGmshBuildHost() -+ << "
  • Build options:" << GetGmshBuildOptions() -+ << "
  • FLTK version: " << FL_MAJOR_VERSION << "." -+ << FL_MINOR_VERSION << "." << FL_PATCH_VERSION -+#if defined(HAVE_PETSC) -+ << "
  • PETSc version: " << PETSC_VERSION_MAJOR << "." -+ << PETSC_VERSION_MINOR << "." << PETSC_VERSION_SUBMINOR -+#if defined(PETSC_USE_COMPLEX) -+ << " (complex arithmetic)" -+#else -+ << " (real arithmetic)" -+#endif -+#endif -+#if defined(HAVE_OCC) -+ << "
  • OCC version: " << OCC_VERSION_MAJOR << "." -+ << OCC_VERSION_MINOR << "." << OCC_VERSION_MAINTENANCE -+#endif -+#if defined(HAVE_MED) -+ << "
  • MED version: " << MED_NUM_MAJEUR << "." << MED_NUM_MINEUR -+ << "." << MED_NUM_RELEASE -+#endif -+ << "
  • Packaged by: " << GetGmshPackager() << "
" -+ << "
Visit http://gmsh.info " -+ << "for more information
"; -+ o->value(sstream.str().c_str()); -+ o->link(help_link); -+ about->position(Fl::x() + Fl::w() / 2 - width / 2, -+ Fl::y() + Fl::h() / 2 - height / 2); -+ about->end(); -+ } -+ -+ { -+ int width = 40 * FL_NORMAL_SIZE; -+ int height = 18 * BH; -+ -+ basic = new paletteWindow(width, height, -+ CTX::instance()->nonModalWindows ? true : false, -+ "Keyboard and Mouse Usage"); -+ basic->box(GMSH_WINDOW_BOX); -+ -+ Fl_Help_View *o = new Fl_Help_View(0, 0, width, height); -+ o->textfont(FL_HELVETICA); -+ o->textsize(FL_NORMAL_SIZE - 1); -+ o->box(FL_FLAT_BOX); -+ -+ std::string s; -+ s += "

Keyboard Shortcuts

"; -+ s += ""; -+ { -+ std::vector > s0 = -+ GetShortcutsUsage(); -+ for(std::size_t i = 0; i < s0.size(); i++) -+ s += -+ ""; -+ } -+ s += "
" + s0[i].first + "" + s0[i].second + "
"; -+ -+ s += "

Mouse Actions

"; -+ s += ""; -+ { -+ std::vector > s0 = GetMouseUsage(); -+ for(std::size_t i = 0; i < s0.size(); i++) -+ s += -+ ""; -+ } -+ s += "
" + s0[i].first + "" + s0[i].second + "
"; -+ s += "For a 2 button mouse, Middle button = Shift+Left button.

"; -+ s += "For a 1 button mouse, Middle button = Shift+Left button, " -+ "Right button = Alt+Left button."; -+ -+ s += "

Command Line Switches

"; -+ s += ""; -+ { -+ std::vector > s0 = GetUsage(); -+ for(std::size_t i = 0; i < s0.size(); i++) -+ if(s0[i].first.size() && s0[i].second.size()) -+ s += ""; -+ else if(s0[i].first.size() && s0[i].second.empty()) -+ s += "
" + s0[i].first + "" + s0[i].second + -+ "
" + s0[i].first + ""; -+ } -+ s += "
"; -+ -+ o->value(s.c_str()); -+ -+ basic->resizable(o); -+ basic->position(Fl::x() + Fl::w() / 2 - width / 2, -+ Fl::y() + Fl::h() / 2 - height / 2); -+ basic->end(); -+ } -+ -+ { -+ int width = 40 * FL_NORMAL_SIZE; -+ int height = 18 * BH; -+ -+ options = new paletteWindow(width, height, -+ CTX::instance()->nonModalWindows ? true : false, -+ "Current Options and Workspace"); -+ options->box(GMSH_WINDOW_BOX); -+ -+ int BW = (width - 4 * WB) / 3; -+ -+ modified = new Fl_Check_Button(WB, WB, BW, BH, "Only show modified"); -+ modified->type(FL_TOGGLE_BUTTON); -+ modified->callback(help_options_cb); -+ modified->tooltip("Show only values different from defaults"); -+ -+ showhelp = new Fl_Check_Button(2 * WB + BW, WB, BW, BH, "Show help"); -+ showhelp->type(FL_TOGGLE_BUTTON); -+ showhelp->callback(help_options_cb); -+ showhelp->tooltip("Show help strings"); -+ -+ Fl_Group *o = new Fl_Group(3 * WB + 2 * BW, WB, BW, BH); -+#if __cplusplus >= 201103L -+ o->tooltip("Filter list using regular expression"); -+#else -+ o->tooltip("Filter list"); -+#endif -+ o->box(FL_DOWN_BOX); -+ o->color(FL_BACKGROUND2_COLOR); -+ search = new Fl_Input(3 * WB + 2 * BW + BH, WB + 2, BW - BH - 2, BH - 4, -+ "@gmsh_search"); -+ search->box(FL_FLAT_BOX); -+ search->callback(help_options_cb); -+ search->when(FL_WHEN_CHANGED); -+ // search->take_focus(); cannot call this here - it triggers show() on Linux -+ // in fltk 1.3.3 -+ o->resizable(search); -+ o->end(); -+ -+ browser = new Fl_Browser(0, BH + 2 * WB, width, height - 2 * BH - 4 * WB); -+ browser->box(GMSH_SIMPLE_TOP_BOX); -+#if defined(WIN32) // FL_SCREEN seems to be too tiny on most Windows setups -+ browser->textfont(FL_COURIER); -+#else -+ browser->textfont(FL_SCREEN); -+#endif -+ browser->textsize(FL_NORMAL_SIZE - 2); -+ browser->type(FL_MULTI_BROWSER); -+ browser->callback(browser_cb); -+ browser->tooltip("Double-click to edit value"); -+ -+ { -+ Fl_Group *g = new Fl_Group(0, height - BH - WB, width, BH); -+ Fl_Group *g2 = new Fl_Group(0, height - BH - WB, BB, BH); -+ g->resizable(g2); -+ g2->end(); -+ Fl_Return_Button *o = new Fl_Return_Button( -+ width - BB - WB, height - BH - WB, BB, BH, "Update"); -+ o->callback(help_options_cb); -+ g->end(); -+ } -+ -+ options->resizable(browser); -+ options->position(Fl::x() + Fl::w() / 2 - width / 2, -+ Fl::y() + Fl::h() / 2 - height / 2); -+ options->size_range(width, height); -+ options->end(); -+ } -+} -diff -rupN gmsh-4.4.0-source/Fltk/helpWindow.cpp.rej gmsh-4.4.0-source-new/Fltk/helpWindow.cpp.rej ---- gmsh-4.4.0-source/Fltk/helpWindow.cpp.rej 1970-01-01 01:00:00.000000000 +0100 -+++ gmsh-4.4.0-source-new/Fltk/helpWindow.cpp.rej 2019-07-01 15:32:47.774134219 +0200 +diff -rupN gmsh-4.4.1-source/Fltk/helpWindow.cpp.rej gmsh-4.4.1-source-new/Fltk/helpWindow.cpp.rej +--- gmsh-4.4.1-source/Fltk/helpWindow.cpp.rej 1970-01-01 01:00:00.000000000 +0100 ++++ gmsh-4.4.1-source-new/Fltk/helpWindow.cpp.rej 2019-07-29 16:44:32.136608848 +0200 @@ -0,0 +1,22 @@ +--- Fltk/helpWindow.cpp 2019-04-19 22:52:22.064137747 +0200 ++++ Fltk/helpWindow.cpp 2019-04-19 22:52:22.067137724 +0200 diff --git a/gmsh_c++14.patch b/gmsh_c++14.patch index 5f0beee..a8f3d0d 100644 --- a/gmsh_c++14.patch +++ b/gmsh_c++14.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.4.0-source/CMakeLists.txt gmsh-4.4.0-source-new/CMakeLists.txt ---- gmsh-4.4.0-source/CMakeLists.txt 2019-07-01 15:32:47.549133537 +0200 -+++ gmsh-4.4.0-source-new/CMakeLists.txt 2019-07-01 15:32:47.551133543 +0200 +diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt +--- gmsh-4.4.1-source/CMakeLists.txt 2019-07-29 16:44:31.843618424 +0200 ++++ gmsh-4.4.1-source-new/CMakeLists.txt 2019-07-29 16:44:31.845618358 +0200 @@ -43,7 +43,7 @@ opt(BUILD_ANDROID "Enable Android NDK li opt(BUILD_IOS "Enable iOS library target (experimental)" OFF) opt(CGNS "Enable CGNS mesh import (experimental)" ${DEFAULT}) diff --git a/gmsh_install.patch b/gmsh_install.patch index 21068f6..72589f4 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.4.0-source/CMakeLists.txt gmsh-4.4.0-source-new/CMakeLists.txt ---- gmsh-4.4.0-source/CMakeLists.txt 2019-07-01 15:20:58.945929400 +0200 -+++ gmsh-4.4.0-source-new/CMakeLists.txt 2019-07-01 15:20:58.947929399 +0200 +diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt +--- gmsh-4.4.1-source/CMakeLists.txt 2019-07-29 16:44:32.383600789 +0200 ++++ gmsh-4.4.1-source-new/CMakeLists.txt 2019-07-29 16:44:32.385600723 +0200 @@ -1838,7 +1838,7 @@ endif() if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index ddeca7c..3bea278 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.4.0-source/CMakeLists.txt gmsh-4.4.0-source-new/CMakeLists.txt ---- gmsh-4.4.0-source/CMakeLists.txt 2019-07-01 15:20:58.731929487 +0200 -+++ gmsh-4.4.0-source-new/CMakeLists.txt 2019-07-01 15:20:58.840929443 +0200 +diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt +--- gmsh-4.4.1-source/CMakeLists.txt 2019-07-29 16:44:31.974614136 +0200 ++++ gmsh-4.4.1-source-new/CMakeLists.txt 2019-07-29 16:44:32.251605096 +0200 @@ -1847,7 +1847,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 3d9d227..6dbe524 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.4.0-source/Common/CommandLine.cpp gmsh-4.4.0-source-new/Common/CommandLine.cpp ---- gmsh-4.4.0-source/Common/CommandLine.cpp 2019-06-20 18:20:21.000000000 +0200 -+++ gmsh-4.4.0-source-new/Common/CommandLine.cpp 2019-07-01 15:32:47.667133894 +0200 +diff -rupN gmsh-4.4.1-source/Common/CommandLine.cpp gmsh-4.4.1-source-new/Common/CommandLine.cpp +--- gmsh-4.4.1-source/Common/CommandLine.cpp 2019-07-14 22:16:04.000000000 +0200 ++++ gmsh-4.4.1-source-new/Common/CommandLine.cpp 2019-07-29 16:44:31.994613481 +0200 @@ -40,7 +40,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN gmsh-4.4.0-source/Common/CommandLine.cpp gmsh-4.4.0-source-new/Common #endif #if defined(HAVE_POST) -diff -rupN gmsh-4.4.0-source/Fltk/helpWindow.cpp gmsh-4.4.0-source-new/Fltk/helpWindow.cpp ---- gmsh-4.4.0-source/Fltk/helpWindow.cpp 2019-06-29 08:54:15.000000000 +0200 -+++ gmsh-4.4.0-source-new/Fltk/helpWindow.cpp 2019-07-01 15:32:47.667133894 +0200 +diff -rupN gmsh-4.4.1-source/Fltk/helpWindow.cpp gmsh-4.4.1-source-new/Fltk/helpWindow.cpp +--- gmsh-4.4.1-source/Fltk/helpWindow.cpp 2019-07-14 22:16:04.000000000 +0200 ++++ gmsh-4.4.1-source-new/Fltk/helpWindow.cpp 2019-07-29 16:44:32.004613155 +0200 @@ -38,7 +38,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN gmsh-4.4.0-source/Fltk/helpWindow.cpp gmsh-4.4.0-source-new/Fltk/help #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN gmsh-4.4.0-source/Geo/GModelIO_MED.cpp gmsh-4.4.0-source-new/Geo/GModelIO_MED.cpp ---- gmsh-4.4.0-source/Geo/GModelIO_MED.cpp 2019-04-11 22:55:54.000000000 +0200 -+++ gmsh-4.4.0-source-new/Geo/GModelIO_MED.cpp 2019-07-01 15:32:47.667133894 +0200 +diff -rupN gmsh-4.4.1-source/Geo/GModelIO_MED.cpp gmsh-4.4.1-source-new/Geo/GModelIO_MED.cpp +--- gmsh-4.4.1-source/Geo/GModelIO_MED.cpp 2019-07-14 23:15:09.000000000 +0200 ++++ gmsh-4.4.1-source-new/Geo/GModelIO_MED.cpp 2019-07-29 16:44:32.004613155 +0200 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN gmsh-4.4.0-source/Geo/GModelIO_MED.cpp gmsh-4.4.0-source-new/Geo/GMod #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN gmsh-4.4.0-source/Post/PViewDataGModelIO.cpp gmsh-4.4.0-source-new/Post/PViewDataGModelIO.cpp ---- gmsh-4.4.0-source/Post/PViewDataGModelIO.cpp 2019-05-14 21:27:31.000000000 +0200 -+++ gmsh-4.4.0-source-new/Post/PViewDataGModelIO.cpp 2019-07-01 15:32:47.667133894 +0200 +diff -rupN gmsh-4.4.1-source/Post/PViewDataGModelIO.cpp gmsh-4.4.1-source-new/Post/PViewDataGModelIO.cpp +--- gmsh-4.4.1-source/Post/PViewDataGModelIO.cpp 2019-05-14 21:27:31.000000000 +0200 ++++ gmsh-4.4.1-source-new/Post/PViewDataGModelIO.cpp 2019-07-29 16:44:32.005613122 +0200 @@ -469,7 +469,7 @@ void PViewDataGModel::importLists(int N[ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 9272a00..6209fce 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.4.0-source/CMakeLists.txt gmsh-4.4.0-source-new/CMakeLists.txt ---- gmsh-4.4.0-source/CMakeLists.txt 2019-06-18 17:25:27.000000000 +0200 -+++ gmsh-4.4.0-source-new/CMakeLists.txt 2019-07-01 15:32:47.437133197 +0200 +diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt +--- gmsh-4.4.1-source/CMakeLists.txt 2019-07-14 22:16:04.000000000 +0200 ++++ gmsh-4.4.1-source-new/CMakeLists.txt 2019-07-29 16:44:31.726622254 +0200 @@ -1819,6 +1819,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -24,9 +24,9 @@ diff -rupN gmsh-4.4.0-source/CMakeLists.txt gmsh-4.4.0-source-new/CMakeLists.txt install(FILES ${GMSH_JL} DESTINATION ${GMSH_LIB}) if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) -diff -rupN gmsh-4.4.0-source/Common/GmshMessage.cpp gmsh-4.4.0-source-new/Common/GmshMessage.cpp ---- gmsh-4.4.0-source/Common/GmshMessage.cpp 2019-05-29 20:40:55.000000000 +0200 -+++ gmsh-4.4.0-source-new/Common/GmshMessage.cpp 2019-07-01 15:32:47.438133200 +0200 +diff -rupN gmsh-4.4.1-source/Common/GmshMessage.cpp gmsh-4.4.1-source-new/Common/GmshMessage.cpp +--- gmsh-4.4.1-source/Common/GmshMessage.cpp 2019-07-14 22:16:04.000000000 +0200 ++++ gmsh-4.4.1-source-new/Common/GmshMessage.cpp 2019-07-29 16:44:31.726622254 +0200 @@ -154,12 +154,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 bf8864e..d7fd881 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.4.0-source-fedora.tar.xz) = 78fd0e70b2ef8f7d212617e4eb10b3d405bb71b09fdda1a983fb1ee955ae47962a31ecf10c7fbb124ba80b35e3cb3640f5f9b05baaa6dec651cf25f2fc2dd5b4 +SHA512 (gmsh-4.4.1-source-fedora.tar.xz) = b8e2210c80a3309232f3b4a6353eaec57704b0a2705a9b181b83aa6282bb4ae7fe07365047d88c3c772f31dcdf60347720fe84ec8621fea9bb06b1f2c377ca3e