Hello community, here is the log from the commit of package gmsh for openSUSE:Factory checked in at 2020-02-05 19:42:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gmsh (Old) and /work/SRC/openSUSE:Factory/.gmsh.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gmsh" Wed Feb 5 19:42:51 2020 rev:3 rq:770099 version:4.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gmsh/gmsh.changes 2019-09-16 10:53:27.747148451 +0200 +++ /work/SRC/openSUSE:Factory/.gmsh.new.26092/gmsh.changes 2020-02-05 19:43:48.375327821 +0100 @@ -1,0 +2,69 @@ +Tue Feb 4 20:17:40 UTC 2020 - Stefan Brüns <[email protected]> + +- Move Python and Julia bindings for the public gmsh API to + separate packages. +- Remove any references to the unmaintained, swig based + bindings. + +------------------------------------------------------------------- +Mon Feb 3 22:37:06 UTC 2020 - Stefan Brüns <[email protected]> + +- Update to 4.5.2: + + periodic meshes now obey reorientation constraints + + physical group definitions now follow compound meshing + constraints + + small bug fixes and improvements +- Update to 4.5.1: + + new Min and Max commands in .geo files + + Mesh.MinimumCirclePoints now behaves the same with all + geometry kernels + + fixed issue with UTF16-encoded home directories on Windows. +- Update to 4.5.0: + + changed default 2D meshing algorithm to Frontal-Delaunay + + new compound Spline/BSpline commands + + new MeshSizeFromBoundary command + + new CGNS importer/exporter + + new X3D exporter for geometries and meshes + + improved surface mesh reclassification + + new separate option to govern curvature adapted meshes + (Mesh.MinimumElementsPerTwoPi and "-clcurv val") + + improved handling of anisotropic surface meshes in 3D Delaunay + + improved high-order periodic meshing + + improved 2D boolean unions + + file chooser type is now changeable at runtime + + FLTK GUI can now be created and destroyed at will through the api + + fixed regression in MeshAdapt for non-periodic surfaces with + singularities + + combining views now copies options + + added API support for mesh compounds, per-surface mesh algorithm + and mesh size from boundary + + renamed plugin AnalyseCurvedMesh to AnalyseMeshQuality + + fixed regression for built-in kernel BSplines on non-flat + geometries (Sphere, PolarSphere) + + small fixes and improvements. +- Add 0001-Add-two-missing-header-includes-in-GModelIO_OCC.patch +- Incompatible API changes: + + removed mesh/smooth (now handled by mesh/optimize like all + other mesh optimizers) + + renamed logger/time to logger/getWallTime and logger/cputime + to logger/getCpuTime + + new arguments to mesh/optimize, mesh/getElementProperties and + occ/healShapes + + added optional argument to mesh/classifySurfaces and view/combine. +- Enable OpenMP support +- Cleanup spec file: + + remove no longer relevant gmsh-3.0.5-doc-building.patch + + rename and rebase gmsh-3.0.5-add-shebang-to-onelib.patch to + gmsh-3.0.5-add-shebang-to-onelab.patch + + run fdupes over demos and tutorials. +- Fix license, GPL-2.0-or-later, not GPL-2.0-only +- Fix Source: URL +- Reenable LTO, no more linker segfaults + +------------------------------------------------------------------- +Mon Feb 3 04:11:24 UTC 2020 - Steve Kowalik <[email protected]> + +- Switch python-devel BuildRequires to python3-devel. +- Run spec-cleaner over the specfile. + +------------------------------------------------------------------- Old: ---- gmsh-3.0.5-add-shebang-to-onelib.patch gmsh-3.0.5-doc-building.patch gmsh-4.4.1-source.tgz New: ---- 0001-Add-two-missing-header-includes-in-GModelIO_OCC.patch gmsh-3.0.5-add-shebang-to-onelab.patch gmsh-4.5.2-source.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gmsh.spec ++++++ --- /var/tmp/diff_new_pack.yaOZMm/_old 2020-02-05 19:43:49.831328514 +0100 +++ /var/tmp/diff_new_pack.yaOZMm/_new 2020-02-05 19:43:49.831328514 +0100 @@ -1,7 +1,7 @@ # # spec file for package gmsh # -# Copyright (c) 2019 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,40 +15,38 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define libver 4_4 + +%define libver 4_5 %bcond_with static_lib -%bcond_with python_bindings %bcond_with pdf_doc - Name: gmsh +Version: 4.5.2 +Release: 0 Summary: A three-dimensional finite element mesh generator -License: GPL-2.0 +License: GPL-2.0-or-later Group: Productivity/Scientific/Math -Version: 4.4.1 -Release: 0 -Url: http://gmsh.info/ -Source0: http://gmsh.info/src/gmsh-%{version}-source.tgz - +URL: https://gmsh.info/ +Source0: https://gmsh.info/src/gmsh-%{version}-source.tgz Patch0: link_dynamic_gl2ps.patch Patch1: gmsh-2.10.1-implicit.patch -#this isn't needed to correctly compile documentation on versions after Leap_42.3 -%if 0%{?suse_version} <= 120300 -Patch5: gmsh-3.0.5-doc-building.patch -%endif -Patch6: gmsh-3.0.5-add-shebang-to-onelib.patch +Patch6: gmsh-3.0.5-add-shebang-to-onelab.patch +# PATCH-FIX-UPSTREAM -- https://gitlab.onelab.info/gmsh/gmsh/issues/739 Patch7: 0001-Fix-ODR-violations-move-private-classes-into-anonymo.patch +# PATCH-FIX-UPSTREAM -- https://gitlab.onelab.info/gmsh/gmsh/issues/740 Patch8: 0002-Fix-two-definition-mismatches-in-contrib-mmg3d.patch - -BuildRequires: bison -BuildRequires: cmake >= 2.8 -BuildRequires: flex -BuildRequires: gcc-c++ +# PATCH-FIX-UPSTREAM -- https://gitlab.onelab.info/gmsh/gmsh/issues/741 +Patch9: 0001-Add-two-missing-header-includes-in-GModelIO_OCC.patch BuildRequires: Mesa-devel -BuildRequires: glu-devel +BuildRequires: bison BuildRequires: blas-devel BuildRequires: cgns-devel >= 3.4.0 +BuildRequires: cmake >= 2.8 +BuildRequires: fdupes +BuildRequires: flex BuildRequires: fltk-devel >= 1.1.7 +BuildRequires: gcc-c++ BuildRequires: gl2ps-devel +BuildRequires: glu-devel BuildRequires: gmp-devel BuildRequires: hdf5-devel BuildRequires: lapack-devel @@ -57,20 +55,16 @@ BuildRequires: makeinfo BuildRequires: metis-devel BuildRequires: oce-devel +BuildRequires: python-rpm-macros BuildRequires: zlib-devel %if %{with pdf_doc} BuildRequires: texinfo-texlive %endif -%if %{with python_bindings} -BuildRequires: swig -BuildRequires: python-devel -%endif %description Gmsh is a 3D finite element grid generator with a build-in CAD engine and post-processor. - %package -n libgmsh%{libver} Summary: A three-dimensional finite element mesh generator Group: System/Libraries @@ -81,7 +75,6 @@ This package contains the shared libraries. - %package devel Summary: A three-dimensional finite element mesh generator Group: Development/Libraries/C and C++ @@ -128,35 +121,60 @@ This package contains demos and tutorials. +%package -n gmsh-julia +Summary: Julia API for the gmsh mesh generator +Group: Development/Libraries +Requires: julia +Requires: libgmsh%{libver} +Suggests: %{name}-demos +Supplements: packageand(julia:gmsh) + +%description -n gmsh-julia +Gmsh is a 3D finite element grid generator with a build-in CAD engine +and post-processor. + +This package contains the public gmsh API for Julia. + +%package -n python3-gmsh +Summary: Python API for the gmsh mesh generator +Group: Development/Libraries +Requires: libgmsh%{libver} +Suggests: %{name}-demos +Supplements: packageand(python3-base:gmsh) + +%description -n python3-gmsh +Gmsh is a 3D finite element grid generator with a build-in CAD engine +and post-processor. + +This package contains the public gmsh API for Python. + %prep %setup -q -n %{name}-%{version}-source %patch0 -p1 %patch1 -p1 -%if 0%{?suse_version} <= 120300 -%patch5 -p1 -%endif %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build -%global _lto_cflags %{nil} %cmake \ -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}/ \ -DENABLE_BUILD_SHARED:BOOL=ON \ -DENABLE_BUILD_DYNAMIC:BOOL=ON \ + -DENABLE_OPENMP:BOOL=ON \ -DENABLE_SYSTEM_CONTRIB:BOOL=ON \ -DENABLE_BUILD_LIB:BOOL=%{?with static_lib:ON}%{!?with static_lib:OFF} \ -DPACKAGER=OBS \ -DGMSH_HOST=OBS \ # build libs/binaries -make %{?_smp_mflags} all +%make_build all # build documentation -make %{?_smp_mflags} info html +%make_build info html %if %{with pdf_doc} -make %{?_smp_mflags} pdf +%make_build pdf %endif %install @@ -170,6 +188,14 @@ chmod 755 %{buildroot}/%{_bindir}/* +%fdupes %{buildroot}/%{_docdir}/%{name}/{demos,tutorial} + +# mv python API into python's search path, dito for julia +mkdir -p %{buildroot}%{python3_sitelib} +mv %{buildroot}%{_libdir}/gmsh.py %{buildroot}%{python3_sitelib}/gmsh.py +mkdir -p %{buildroot}%{_datadir}/julia +mv %{buildroot}%{_libdir}/gmsh.jl %{buildroot}%{_datadir}/julia/gmsh.jl + %post -n libgmsh%{libver} -p /sbin/ldconfig %post @@ -181,14 +207,19 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %files -%doc %{_mandir}/*/* -%doc %{_infodir}/%{name}.* +%{_mandir}/*/* +%{_infodir}/%{name}.* %{_bindir}/* %files -n libgmsh%{libver} %{_libdir}/libgmsh.so.* -%{_libdir}/gmsh.jl -%{_libdir}/gmsh.py + +%files -n gmsh-julia +%dir %{_datadir}/julia +%{_datadir}/julia/gmsh.jl + +%files -n python3-gmsh +%{python3_sitelib}/gmsh.py %files devel %{_includedir}/gmsh* ++++++ 0001-Add-two-missing-header-includes-in-GModelIO_OCC.patch ++++++ >From 34f26bcd64bdd35f0a0b7d89d7358563ee7126f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Tue, 4 Feb 2020 00:16:29 +0100 Subject: [PATCH] Add two missing header includes in GModelIO_OCC Fixes the following two errors: /home/abuild/rpmbuild/BUILD/gmsh-4.5.2-source/Geo/GModelIO_OCC.cpp:1620:68: error: invalid use of incomplete type 'class GeomPlate_PointConstraint' 1620 | new GeomPlate_PointConstraint(BRep_Tool::Pnt(vertex), 0, .1); | ^ In file included from /usr/include/oce/GeomPlate_BuildPlateSurface.hxx:26, from /usr/include/oce/BRepFill_Filling.hxx:13, from /usr/include/oce/BRepOffsetAPI_MakeFilling.hxx:13, from /home/abuild/rpmbuild/BUILD/gmsh-4.5.2-source/Geo/GModelIO_OCC.cpp:44: /usr/include/oce/Handle_GeomPlate_PointConstraint.hxx:16:7: note: forward declaration of 'class GeomPlate_PointConstraint' 16 | class GeomPlate_PointConstraint; /home/abuild/rpmbuild/BUILD/gmsh-4.5.2-source/Geo/GModelIO_OCC.cpp:4542:54: error: invalid use of incomplete type 'class Poly_PolygonOnTriangulation' 4542 | const TColStd_Array1OfInteger &edgeVerts = edgepoly->Nodes(); | ^~ In file included from /usr/include/oce/BRep_Tool.hxx:22, from /home/abuild/rpmbuild/BUILD/gmsh-4.5.2-source/Geo/OCCEdge.h:21, from /home/abuild/rpmbuild/BUILD/gmsh-4.5.2-source/Geo/GModelIO_OCC.cpp:11: /usr/include/oce/Handle_Poly_PolygonOnTriangulation.hxx:16:7: note: forward declaration of 'class Poly_PolygonOnTriangulation' 16 | class Poly_PolygonOnTriangulation; --- Geo/GModelIO_OCC.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp index 2e30247..16d0951 100644 --- a/Geo/GModelIO_OCC.cpp +++ b/Geo/GModelIO_OCC.cpp @@ -59,6 +59,7 @@ #include <ElCLib.hxx> #include <GProp_GProps.hxx> #include <GeomPlate_BuildPlateSurface.hxx> +#include <GeomPlate_PointConstraint.hxx> #include <GeomAPI_Interpolate.hxx> #include <Geom_BSplineCurve.hxx> #include <Geom_BSplineSurface.hxx> @@ -73,6 +74,7 @@ #include <IGESControl_Reader.hxx> #include <IGESControl_Writer.hxx> #include <Interface_Static.hxx> +#include <Poly_PolygonOnTriangulation.hxx> #include <Poly_Triangulation.hxx> #include <Poly_Triangle.hxx> #include <STEPControl_Reader.hxx> -- 2.25.0 ++++++ gmsh-3.0.5-add-shebang-to-onelib.patch -> gmsh-3.0.5-add-shebang-to-onelab.patch ++++++ --- /work/SRC/openSUSE:Factory/gmsh/gmsh-3.0.5-add-shebang-to-onelib.patch 2019-09-07 11:46:25.586333650 +0200 +++ /work/SRC/openSUSE:Factory/.gmsh.new.26092/gmsh-3.0.5-add-shebang-to-onelab.patch 2020-02-05 19:43:46.991327162 +0100 @@ -5,5 +5,5 @@ @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """ - ONELAB - Copyright (C) 2011-2019 Universite de Liege - Universite catholique + ONELAB - Copyright (C) 2011-2020 Universite de Liege - Universite catholique de Louvain ++++++ gmsh-4.4.1-source.tgz -> gmsh-4.5.2-source.tgz ++++++ /work/SRC/openSUSE:Factory/gmsh/gmsh-4.4.1-source.tgz /work/SRC/openSUSE:Factory/.gmsh.new.26092/gmsh-4.5.2-source.tgz differ: char 5, line 1
