* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/
@ 2021-12-02 18:44 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-12-02 18:44 UTC (permalink / raw
To: gentoo-commits
commit: b72907b97d61fec2c9c3c10e1cc7bced23fd6741
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 18:43:29 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 18:43:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72907b9
sci-libs/gmsh: add GCC 11 patch
Seems to build fine without this for me but it's reasonable, upstream,
and seems to help others.
Closes: https://bugs.gentoo.org/800536
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch | 80 ++++++++++++++++++++++++++++++
sci-libs/gmsh/gmsh-4.8.4.ebuild | 4 ++
2 files changed, 84 insertions(+)
diff --git a/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch b/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch
new file mode 100644
index 000000000000..3f16ef476d7f
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch
@@ -0,0 +1,80 @@
+https://gitlab.onelab.info/gmsh/gmsh/-/commit/e7cd675083f72c6c01701cb0f16d1639aca121ba
+https://bugs.gentoo.org/800536
+
+From: Tristan Carel <tristan.carel@epfl.ch>
+Date: Wed, 28 Jul 2021 10:55:40 +0200
+Subject: [PATCH] Fix symbol conflict in picojson with GCC 11 internal macro
+
+Build issue on MacOS with GCC 11 from brew:
+```
+/usr/local/Cellar/gcc/11.1.0_1/lib/gcc/11/gcc/x86_64-apple-darwin20/11.1.0/include/serializeintrin.h:37: note: macro "_serialize" defined here
+ 37 | #define _serialize() __builtin_ia32_serialize ()
+ |
+```
+--- a/Common/picojson.h
++++ b/Common/picojson.h
+@@ -186,8 +186,8 @@ public:
+ private:
+ template <typename T> value(const T *); // intentionally defined to block implicit conversion of pointer to bool
+ template <typename Iter> static void _indent(Iter os, int indent);
+- template <typename Iter> void _serialize(Iter os, int indent) const;
+- std::string _serialize(int indent) const;
++ template <typename Iter> void serialize_(Iter os, int indent) const;
++ std::string serialize_(int indent) const;
+ void clear();
+ };
+
+@@ -549,11 +549,11 @@ template <typename Iter> void serialize_str(const std::string &s, Iter oi) {
+ }
+
+ template <typename Iter> void value::serialize(Iter oi, bool prettify) const {
+- return _serialize(oi, prettify ? 0 : -1);
++ return serialize_(oi, prettify ? 0 : -1);
+ }
+
+ inline std::string value::serialize(bool prettify) const {
+- return _serialize(prettify ? 0 : -1);
++ return serialize_(prettify ? 0 : -1);
+ }
+
+ template <typename Iter> void value::_indent(Iter oi, int indent) {
+@@ -563,7 +563,7 @@ template <typename Iter> void value::_indent(Iter oi, int indent) {
+ }
+ }
+
+-template <typename Iter> void value::_serialize(Iter oi, int indent) const {
++template <typename Iter> void value::serialize_(Iter oi, int indent) const {
+ switch (type_) {
+ case string_type:
+ serialize_str(*u_.string_, oi);
+@@ -580,7 +580,7 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
+ if (indent != -1) {
+ _indent(oi, indent);
+ }
+- i->_serialize(oi, indent);
++ i->serialize_(oi, indent);
+ }
+ if (indent != -1) {
+ --indent;
+@@ -608,7 +608,7 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
+ if (indent != -1) {
+ *oi++ = ' ';
+ }
+- i->second._serialize(oi, indent);
++ i->second.serialize_(oi, indent);
+ }
+ if (indent != -1) {
+ --indent;
+@@ -628,9 +628,9 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
+ }
+ }
+
+-inline std::string value::_serialize(int indent) const {
++inline std::string value::serialize_(int indent) const {
+ std::string s;
+- _serialize(std::back_inserter(s), indent);
++ serialize_(std::back_inserter(s), indent);
+ return s;
+ }
+
+GitLab
diff --git a/sci-libs/gmsh/gmsh-4.8.4.ebuild b/sci-libs/gmsh/gmsh-4.8.4.ebuild
index df5ea5533a0a..0c32a563f7a1 100644
--- a/sci-libs/gmsh/gmsh-4.8.4.ebuild
+++ b/sci-libs/gmsh/gmsh-4.8.4.ebuild
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${P}-source
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc11.patch
+)
+
pkg_setup() {
fortran-2_pkg_setup
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/
@ 2022-06-06 5:49 Matthias Maier
0 siblings, 0 replies; 6+ messages in thread
From: Matthias Maier @ 2022-06-06 5:49 UTC (permalink / raw
To: gentoo-commits
commit: 7124c42f8e7ff9926f8474f49cc0c9a3870391d7
Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Tue May 24 11:57:04 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 05:49:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7124c42f
sci-libs/gmsh: various improvements
* removed deprecated dep
* fixed installation with USE=examples
* fixed detection of opencascade
* now the private API is also exported with USE=shared
Signed-off-by: Fabio Rossi <rossi.f <AT> inwind.it>
Bug: https://bugs.gentoo.org/835702
Bug: https://bugs.gentoo.org/835194
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/gmsh/files/gmsh-4.9.5-opencascade.patch | 20 ++++++
sci-libs/gmsh/gmsh-4.9.5-r2.ebuild | 80 ++++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/sci-libs/gmsh/files/gmsh-4.9.5-opencascade.patch b/sci-libs/gmsh/files/gmsh-4.9.5-opencascade.patch
new file mode 100644
index 000000000000..63281d42e1f2
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-4.9.5-opencascade.patch
@@ -0,0 +1,20 @@
+--- ./CMakeLists.txt 2022-05-24 12:36:43.084752081 +0200
++++ ./CMakeLists.txt.new 2022-05-24 12:44:08.895710126 +0200
+@@ -1282,7 +1282,7 @@
+ else()
+ set(OCC_LIBS)
+ foreach(OCC ${OCC_LIBS_REQUIRED})
+- find_library(OCC_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES
++ find_library(OCC_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES opencascade
+ lib ${OCC_SYS_NAME}/vc8/lib ${OCC_SYS_NAME}/vc9/lib
+ ${OCC_SYS_NAME}/vc10/lib ${OCC_SYS_NAME}/vc11/lib
+ ${OCC_SYS_NAME}/vc12/lib ${OCC_SYS_NAME}/vc14/lib
+@@ -1308,7 +1308,7 @@
+ list(LENGTH OCC_CAF_LIBS_REQUIRED NUM_OCC_CAF_LIBS_REQUIRED)
+ set(OCC_CAF_LIBS)
+ foreach(OCC ${OCC_CAF_LIBS_REQUIRED})
+- find_library(OCC_CAF_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES
++ find_library(OCC_CAF_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES opencascade
+ lib ${OCC_SYS_NAME}/vc8/lib ${OCC_SYS_NAME}/vc9/lib
+ ${OCC_SYS_NAME}/vc10/lib ${OCC_SYS_NAME}/vc11/lib
+ ${OCC_SYS_NAME}/vc12/lib ${OCC_SYS_NAME}/vc14/lib
diff --git a/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild b/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
new file mode 100644
index 000000000000..ece42634909b
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake fortran-2 python-any-r1 toolchain-funcs
+
+DESCRIPTION="A three-dimensional finite element mesh generator"
+HOMEPAGE="http://www.geuz.org/gmsh/"
+SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
+
+LICENSE="GPL-3 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+## cgns is not compiling ATM, maybe fix cgns lib first
+IUSE="blas cgns examples jpeg med metis mpi netgen opencascade petsc png python shared X zlib"
+
+REQUIRED_USE="med? ( mpi )"
+
+RDEPEND="
+ virtual/fortran
+ X? ( x11-libs/fltk:1[xft] )
+ blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
+ cgns? ( sci-libs/cgnslib )
+ jpeg? ( media-libs/libjpeg-turbo )
+ med? ( sci-libs/med[mpi] )
+ opencascade? ( sci-libs/opencascade:* )
+ png? ( media-libs/libpng:0 )
+ petsc? ( sci-mathematics/petsc[mpi=] )
+ zlib? ( sys-libs/zlib )
+ mpi? ( virtual/mpi[cxx] )"
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ python? ( dev-lang/swig:0 )
+ "
+
+S="${WORKDIR}"/${P}-source
+
+PATCHES=( "${FILESDIR}"/$P-opencascade.patch )
+
+pkg_setup() {
+ fortran-2_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=( )
+
+ use blas && \
+ mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
+
+ mycmakeargs+=(
+ -DENABLE_BLAS_LAPACK="$(usex blas)"
+ -DENABLE_BUILD_DYNAMIC="$(usex shared)"
+ -DENABLE_CGNS="$(usex cgns)"
+ -DENABLE_FLTK="$(usex X)"
+ -DENABLE_GRAPHICS="$(usex X)"
+ -DENABLE_MED="$(usex med)"
+ -DENABLE_MPI="$(usex mpi)"
+ -DENABLE_METIS="$(usex metis)"
+ -DENABLE_NETGEN="$(usex netgen)"
+ -DENABLE_OCC="$(usex opencascade)"
+ -DENABLE_PETSC="$(usex petsc)"
+ -DENABLE_PRIVATE_API="$(usex shared)"
+ -DENABLE_WRAP_PYTHON="$(usex python)")
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use examples ; then
+ dodoc -r examples tutorials
+ docompress -x /usr/share/doc/${PF}/{examples,tutorials}
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/
@ 2023-05-02 17:45 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-05-02 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 020a22ee51f59b72936943e69953b0971acf127f
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Tue May 2 17:14:21 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 2 17:44:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020a22ee
sci-libs/gmsh: 4.11.1 fix GCC-13 compatibility
Closes: https://bugs.gentoo.org/905445
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/30839
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gmsh-4.11.1_gcc13_fix_cstdint_include.patch | 29 ++++++++++++++++++++++
sci-libs/gmsh/gmsh-4.11.1.ebuild | 5 +++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch b/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch
new file mode 100644
index 000000000000..2b1b491ef81f
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch
@@ -0,0 +1,29 @@
+# Based on upstream patches:
+# https://gitlab.onelab.info/gmsh/gmsh/-/commit/fb81a9c90
+# https://gitlab.onelab.info/gmsh/gmsh/-/commit/aceb09c80
+#
+# Upstream issue: https://gitlab.onelab.info/gmsh/gmsh/-/issues/2416
+# Gentoo issue: https://bugs.gentoo.org/905445
+
+diff -Naur a/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h b/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h
+--- a/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h
++++ b/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h
+@@ -8,6 +8,7 @@
+ #pragma once
+
+ #include <float.h>
++#include <cstdint>
+ #include "qmtMeshUtils.h"
+
+ class SurfaceProjector;
+diff -Naur a/src/mesh/meshGFacePack.cpp b/src/mesh/meshGFacePack.cpp
+--- a/src/mesh/meshGFacePack.cpp
++++ b/src/mesh/meshGFacePack.cpp
+@@ -8,6 +8,7 @@
+ #include <queue>
+ #include <map>
+ #include <vector>
++#include <cstdint>
+ #include "gmsh.h"
+ #include "SPoint2.h"
+ #include "SVector3.h"
diff --git a/sci-libs/gmsh/gmsh-4.11.1.ebuild b/sci-libs/gmsh/gmsh-4.11.1.ebuild
index 5bbf22a1c4b1..faf9c16b04ea 100644
--- a/sci-libs/gmsh/gmsh-4.11.1.ebuild
+++ b/sci-libs/gmsh/gmsh-4.11.1.ebuild
@@ -68,7 +68,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}"/${P}-source
-PATCHES=( "${FILESDIR}"/${PN}-4.9.5-opencascade.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.9.5-opencascade.patch
+ "${FILESDIR}"/${P}_gcc13_fix_cstdint_include.patch
+)
pkg_setup() {
fortran-2_pkg_setup
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/
@ 2023-05-03 14:52 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2023-05-03 14:52 UTC (permalink / raw
To: gentoo-commits
commit: b62ee8825bd6ac801dc982d5850b222c9eb0c37c
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed May 3 14:50:55 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed May 3 14:52:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62ee882
sci-libs/gmsh: fix build with metis-5.2
Closes: https://bugs.gentoo.org/905650
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/gmsh/files/gmsh-4.11.1-metis-5-2.patch | 19 +++++++++++++++++++
.../{gmsh-4.10.3.ebuild => gmsh-4.10.3-r1.ebuild} | 7 ++++---
.../{gmsh-4.11.1.ebuild => gmsh-4.11.1-r1.ebuild} | 8 +++++---
.../{gmsh-4.9.5-r2.ebuild => gmsh-4.9.5-r3.ebuild} | 7 ++++---
4 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/sci-libs/gmsh/files/gmsh-4.11.1-metis-5-2.patch b/sci-libs/gmsh/files/gmsh-4.11.1-metis-5-2.patch
new file mode 100644
index 000000000000..c7413e6e4bf4
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-4.11.1-metis-5-2.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 63fb873..2563850 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -860,11 +860,12 @@ endif()
+
+ if(HAVE_MESH OR HAVE_SOLVER)
+ if(ENABLE_METIS)
+- find_library(METIS_LIB metis PATH_SUFFIXES lib)
++ find_library(METIS_LIB metis PATH_SUFFIXES lib64 REQUIRED)
++ find_library(GKLIB_LIB GKlib PATH_SUFFIXES lib64 REQUIRED)
+ find_path(METIS_INC "metis.h" PATH_SUFFIXES include)
+ if(ENABLE_SYSTEM_CONTRIB AND METIS_LIB AND METIS_INC)
+ message(STATUS "Using system version of METIS")
+- list(APPEND EXTERNAL_LIBRARIES ${METIS_LIB})
++ list(APPEND EXTERNAL_LIBRARIES ${METIS_LIB} ${GKLIB_LIB})
+ list(APPEND EXTERNAL_INCLUDES ${METIS_INC})
+ set_config_option(HAVE_METIS "Metis")
+ elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/metis)
diff --git a/sci-libs/gmsh/gmsh-4.10.3.ebuild b/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild
similarity index 96%
rename from sci-libs/gmsh/gmsh-4.10.3.ebuild
rename to sci-libs/gmsh/gmsh-4.10.3-r1.ebuild
index 11602e174471..3e5432701c03 100644
--- a/sci-libs/gmsh/gmsh-4.10.3.ebuild
+++ b/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild
@@ -10,6 +10,7 @@ inherit cmake fortran-2 python-any-r1 toolchain-funcs
DESCRIPTION="Three-dimensional finite element mesh generator"
HOMEPAGE="https://gmsh.info"
SRC_URI="https://gmsh.info/src/${P}-source.tgz"
+S="${WORKDIR}/${P}-source"
LICENSE="
GPL-2+ free-noncomm
@@ -50,6 +51,7 @@ RDEPEND="
sci-libs/med[mpi=]
sci-libs/hdf5[mpi=]
)
+ metis? ( <sci-libs/metis-5.2.0 )
mpi? ( virtual/mpi[cxx] )
mumps? ( sci-libs/mumps[mpi=] )
opencascade? ( sci-libs/opencascade:* )
@@ -58,7 +60,8 @@ RDEPEND="
petsc? ( sci-mathematics/petsc[mpi=] )
slepc? ( sci-mathematics/slepc[mpi=] )
voro? ( sci-libs/voro++ )
- zlib? ( sys-libs/zlib )"
+ zlib? ( sys-libs/zlib )
+ "
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -66,8 +69,6 @@ DEPEND="${RDEPEND}
python? ( dev-lang/swig:0 )
"
-S="${WORKDIR}"/${P}-source
-
PATCHES=( "${FILESDIR}"/${PN}-4.9.5-opencascade.patch )
pkg_setup() {
diff --git a/sci-libs/gmsh/gmsh-4.11.1.ebuild b/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild
similarity index 95%
rename from sci-libs/gmsh/gmsh-4.11.1.ebuild
rename to sci-libs/gmsh/gmsh-4.11.1-r1.ebuild
index faf9c16b04ea..ee7ff513289d 100644
--- a/sci-libs/gmsh/gmsh-4.11.1.ebuild
+++ b/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild
@@ -10,6 +10,7 @@ inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils
DESCRIPTION="Three-dimensional finite element mesh generator"
HOMEPAGE="https://gmsh.info"
SRC_URI="https://gmsh.info/src/${P}-source.tgz"
+S="${WORKDIR}/${P}-source"
LICENSE="
GPL-2+ free-noncomm
@@ -50,6 +51,7 @@ RDEPEND="
sci-libs/med[mpi=]
sci-libs/hdf5[mpi=]
)
+ metis? ( >=sci-libs/metis-5.2.0 )
mpi? ( virtual/mpi[cxx] )
mumps? ( sci-libs/mumps[mpi=] )
opencascade? ( sci-libs/opencascade:* )
@@ -58,7 +60,8 @@ RDEPEND="
petsc? ( sci-mathematics/petsc[mpi=] )
slepc? ( sci-mathematics/slepc[mpi=] )
voro? ( sci-libs/voro++ )
- zlib? ( sys-libs/zlib )"
+ zlib? ( sys-libs/zlib )
+ "
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -66,11 +69,10 @@ DEPEND="${RDEPEND}
python? ( dev-lang/swig:0 )
"
-S="${WORKDIR}"/${P}-source
-
PATCHES=(
"${FILESDIR}"/${PN}-4.9.5-opencascade.patch
"${FILESDIR}"/${P}_gcc13_fix_cstdint_include.patch
+ "${FILESDIR}"/${P}-metis-5-2.patch
)
pkg_setup() {
diff --git a/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild b/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild
similarity index 95%
rename from sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
rename to sci-libs/gmsh/gmsh-4.9.5-r3.ebuild
index c41d139ad3b4..9f6486414bc6 100644
--- a/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
+++ b/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild
@@ -10,6 +10,7 @@ inherit cmake fortran-2 python-any-r1 toolchain-funcs
DESCRIPTION="Three-dimensional finite element mesh generator"
HOMEPAGE="https://gmsh.info/"
SRC_URI="https://gmsh.info/src/${P}-source.tgz"
+S="${WORKDIR}/${P}-source"
LICENSE="GPL-3 free-noncomm"
SLOT="0"
@@ -26,11 +27,13 @@ RDEPEND="
cgns? ( sci-libs/cgnslib )
jpeg? ( media-libs/libjpeg-turbo )
med? ( sci-libs/med[mpi] )
+ metis? ( <sci-libs/metis-5.2.0 )
opencascade? ( sci-libs/opencascade:* )
png? ( media-libs/libpng:0 )
petsc? ( sci-mathematics/petsc[mpi=] )
zlib? ( sys-libs/zlib )
- mpi? ( virtual/mpi[cxx] )"
+ mpi? ( virtual/mpi[cxx] )
+ "
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -38,8 +41,6 @@ DEPEND="${RDEPEND}
python? ( dev-lang/swig:0 )
"
-S="${WORKDIR}"/${P}-source
-
PATCHES=( "${FILESDIR}"/${P}-opencascade.patch )
pkg_setup() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/
@ 2025-08-31 20:34 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2025-08-31 20:34 UTC (permalink / raw
To: gentoo-commits
commit: 983aceed80dd850188fb3145b3e98f7fbc35e127
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 27 21:24:12 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 31 20:32:05 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=983aceed
sci-libs/gmsh: drop 4.11.1-r3, 4.12.2-r2, 4.13.1-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/gmsh/Manifest | 2 -
.../gmsh-4.11.1_gcc13_fix_cstdint_include.patch | 29 -----
sci-libs/gmsh/gmsh-4.11.1-r3.ebuild | 138 ---------------------
sci-libs/gmsh/gmsh-4.12.2-r2.ebuild | 137 --------------------
sci-libs/gmsh/gmsh-4.13.1-r1.ebuild | 137 --------------------
5 files changed, 443 deletions(-)
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 8600a02c436d..8a9c58bde9a0 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,4 +1,2 @@
-DIST gmsh-4.11.1-source.tgz 17985611 BLAKE2B 087664cfbfec758eaa3740a65920ccf673dbcc97a1ef8010222da64b8c586334ed1a77904e94061bdf34e714aae34311ee4f6fb38740473046f99ad6c1e0984c SHA512 8f2a71d6db80dd6bacde6dc1ccd120c7f83609dd69a84a910455a21a43b7392cd7e0e7b4d37aaa6a1b1cbfdb816646cd4828d2ac6d784edba072167280432e4c
-DIST gmsh-4.12.2-source.tgz 18150293 BLAKE2B 16f8048d8962d2a8e41d813713c147a691d24c7fabdcc7f3787bff804b1dfa477d4853b4b366a409c2ed9649e8c83710b4f73ac23a0c5885d0e65cd25bb88d6f SHA512 935148aff89b608f9d671d5fd4f12aed52b5c8ba4453e978d0febcc6934c045f2bba0078b13a64b2cbf4e852b413bbd05873335099ea7a967cc81ef58a7f8367
DIST gmsh-4.13.1-source.tgz 18383962 BLAKE2B bf0d002b7d0fa187b47440f167fc02ad41acc327745d0fcdfce8e78877c794696f5e84c5fa6d36664be00c92219d3a338a817832b22edf8baec2954ac39d2f82 SHA512 273067b0d20b4afaa84aa8729f670a3d0666a9ffebe6c802f3b5e6e58daac68300aff6be7973ad7c272e22c0db0473a8ee2ad1e3ddda2d37f2cc208f18fcbdc5
DIST gmsh-4.14.0-source.tgz 18458158 BLAKE2B 02af538c094fb7fa1033f3d5821dab3e1554ca10e0bc7a0ab87cca3079e119c5fec149c4af2f4c12d213776f36d8b9734631fd5a3240a9e938c2330dd6bc8989 SHA512 130104088e6ba195a4bdc14ef4c79b28872996fa58690161bf304e267d02b21247a3f7865d4c08eadc87cd686657a7fea52379b5ec0a8d67280b237c2a2647bc
diff --git a/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch b/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch
deleted file mode 100644
index 2b1b491ef81f..000000000000
--- a/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# Based on upstream patches:
-# https://gitlab.onelab.info/gmsh/gmsh/-/commit/fb81a9c90
-# https://gitlab.onelab.info/gmsh/gmsh/-/commit/aceb09c80
-#
-# Upstream issue: https://gitlab.onelab.info/gmsh/gmsh/-/issues/2416
-# Gentoo issue: https://bugs.gentoo.org/905445
-
-diff -Naur a/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h b/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h
---- a/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h
-+++ b/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h
-@@ -8,6 +8,7 @@
- #pragma once
-
- #include <float.h>
-+#include <cstdint>
- #include "qmtMeshUtils.h"
-
- class SurfaceProjector;
-diff -Naur a/src/mesh/meshGFacePack.cpp b/src/mesh/meshGFacePack.cpp
---- a/src/mesh/meshGFacePack.cpp
-+++ b/src/mesh/meshGFacePack.cpp
-@@ -8,6 +8,7 @@
- #include <queue>
- #include <map>
- #include <vector>
-+#include <cstdint>
- #include "gmsh.h"
- #include "SPoint2.h"
- #include "SVector3.h"
diff --git a/sci-libs/gmsh/gmsh-4.11.1-r3.ebuild b/sci-libs/gmsh/gmsh-4.11.1-r3.ebuild
deleted file mode 100644
index 4e4a7f91927f..000000000000
--- a/sci-libs/gmsh/gmsh-4.11.1-r3.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Three-dimensional finite element mesh generator"
-HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh"
-SRC_URI="https://gmsh.info/src/${P}-source.tgz"
-S="${WORKDIR}/${P}-source"
-
-LICENSE="
- GPL-2+ free-noncomm
- alglib? ( MIT )
- gmm? ( LGPL-2.1+ )
- metis? ( Apache-2.0 )
- netgen? ( LGPL-2.1+ )
- voro? ( BSD )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-## cgns is not compiling ATM, maybe fix cgns lib first
-IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib"
-
-REQUIRED_USE="
- ^^ ( blas eigen )
- mumps? ( blas )
- slepc? ( petsc )
- "
-
-RDEPEND="
- virtual/fortran
- X? ( x11-libs/fltk:1=[xft(+)] )
- alglib? ( sci-libs/alglib )
- blas? (
- virtual/blas
- virtual/lapack
- sci-libs/fftw:3.0
- )
- cgns? (
- sci-libs/cgnslib
- sci-libs/hdf5:=[mpi=]
- )
- eigen? ( dev-cpp/eigen )
- gmm? ( sci-mathematics/gmm )
- jpeg? ( media-libs/libjpeg-turbo )
- med? (
- sci-libs/med[mpi=]
- sci-libs/hdf5:=[mpi=]
- )
- metis? ( >=sci-libs/metis-5.2.0 )
- mpi? ( virtual/mpi )
- mumps? ( sci-libs/mumps[mpi=] )
- opencascade? ( sci-libs/opencascade:* )
- pdf? ( app-text/poppler:= )
- png? ( media-libs/libpng:0 )
- petsc? ( sci-mathematics/petsc[mpi=] )
- slepc? ( sci-mathematics/slepc[mpi=] )
- voro? ( sci-libs/voro++ )
- zlib? ( sys-libs/zlib )
- "
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- python? ( dev-lang/swig:0 )
- "
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.9.5-opencascade.patch
- "${FILESDIR}"/${P}_gcc13_fix_cstdint_include.patch
- "${FILESDIR}"/${P}-metis-5-2.patch
-)
-
-pkg_setup() {
- fortran-2_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=( )
-
- use blas && \
- mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
-
- mycmakeargs+=(
- -DENABLE_ALGLIB="$(usex alglib)"
- -DENABLE_BLAS_LAPACK="$(usex blas)"
- -DENABLE_BUILD_DYNAMIC="$(usex shared)"
- -DENABLE_CGNS="$(usex cgns)"
- -DENABLE_EIGEN="$(usex eigen)"
- -DENABLE_FLTK="$(usex X)"
- -DENABLE_GMM="$(usex gmm)"
- -DENABLE_GRAPHICS="$(usex X)"
- -DENABLE_MED="$(usex med)"
- -DENABLE_MPI="$(usex mpi)"
- -DENABLE_METIS="$(usex metis)"
- -DENABLE_MUMPS="$(usex mumps)"
- -DENABLE_NETGEN="$(usex netgen)"
- -DENABLE_OCC="$(usex opencascade)"
- -DENABLE_PETSC="$(usex petsc)"
- -DENABLE_POPPLER="$(usex pdf)"
- -DENABLE_SLEPC="$(usex slepc)"
- -DENABLE_PRIVATE_API="$(usex shared)"
- -DENABLE_SYSTEM_CONTRIB="YES"
- -DENABLE_VOROPP="$(usex voro)"
- -DENABLE_WRAP_PYTHON="$(usex python)")
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use examples ; then
- dodoc -r examples tutorials
- docompress -x /usr/share/doc/${PF}/{examples,tutorials}
- fi
-
- if use X ; then
- newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png
- make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math"
- fi
-}
-
-pkg_postinst() {
- if use X ; then
- xdg_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use X ; then
- xdg_icon_cache_update
- fi
-}
diff --git a/sci-libs/gmsh/gmsh-4.12.2-r2.ebuild b/sci-libs/gmsh/gmsh-4.12.2-r2.ebuild
deleted file mode 100644
index db3b599e0707..000000000000
--- a/sci-libs/gmsh/gmsh-4.12.2-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Three-dimensional finite element mesh generator"
-HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh"
-SRC_URI="https://gmsh.info/src/${P}-source.tgz"
-S="${WORKDIR}/${P}-source"
-
-LICENSE="
- GPL-2+ free-noncomm
- alglib? ( MIT )
- gmm? ( LGPL-2.1+ )
- metis? ( Apache-2.0 )
- netgen? ( LGPL-2.1+ )
- voro? ( BSD )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-## cgns is not compiling ATM, maybe fix cgns lib first
-IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib"
-
-REQUIRED_USE="
- ^^ ( blas eigen )
- mumps? ( blas )
- slepc? ( petsc )
- "
-
-RDEPEND="
- virtual/fortran
- X? ( x11-libs/fltk:1=[xft(+)] )
- alglib? ( sci-libs/alglib )
- blas? (
- virtual/blas
- virtual/lapack
- sci-libs/fftw:3.0
- )
- cgns? (
- sci-libs/cgnslib
- sci-libs/hdf5:=[mpi=]
- )
- eigen? ( dev-cpp/eigen )
- gmm? ( sci-mathematics/gmm )
- jpeg? ( media-libs/libjpeg-turbo )
- med? (
- sci-libs/med[mpi=]
- sci-libs/hdf5:=[mpi=]
- )
- metis? ( >=sci-libs/metis-5.2.0 )
- mpi? ( virtual/mpi )
- mumps? ( sci-libs/mumps[mpi=] )
- opencascade? ( sci-libs/opencascade:* )
- pdf? ( app-text/poppler:= )
- png? ( media-libs/libpng:0 )
- petsc? ( sci-mathematics/petsc[mpi=] )
- slepc? ( sci-mathematics/slepc[mpi=] )
- voro? ( sci-libs/voro++ )
- zlib? ( sys-libs/zlib )
- "
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- python? ( dev-lang/swig:0 )
- "
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.9.5-opencascade.patch
- "${FILESDIR}"/${PN}-4.11.1-metis-5-2.patch
-)
-
-pkg_setup() {
- fortran-2_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=( )
-
- use blas && \
- mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
-
- mycmakeargs+=(
- -DENABLE_ALGLIB="$(usex alglib)"
- -DENABLE_BLAS_LAPACK="$(usex blas)"
- -DENABLE_BUILD_DYNAMIC="$(usex shared)"
- -DENABLE_CGNS="$(usex cgns)"
- -DENABLE_EIGEN="$(usex eigen)"
- -DENABLE_FLTK="$(usex X)"
- -DENABLE_GMM="$(usex gmm)"
- -DENABLE_GRAPHICS="$(usex X)"
- -DENABLE_MED="$(usex med)"
- -DENABLE_MPI="$(usex mpi)"
- -DENABLE_METIS="$(usex metis)"
- -DENABLE_MUMPS="$(usex mumps)"
- -DENABLE_NETGEN="$(usex netgen)"
- -DENABLE_OCC="$(usex opencascade)"
- -DENABLE_PETSC="$(usex petsc)"
- -DENABLE_POPPLER="$(usex pdf)"
- -DENABLE_SLEPC="$(usex slepc)"
- -DENABLE_PRIVATE_API="$(usex shared)"
- -DENABLE_SYSTEM_CONTRIB="YES"
- -DENABLE_VOROPP="$(usex voro)"
- -DENABLE_WRAP_PYTHON="$(usex python)")
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use examples ; then
- dodoc -r examples tutorials
- docompress -x /usr/share/doc/${PF}/{examples,tutorials}
- fi
-
- if use X ; then
- newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png
- make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math"
- fi
-}
-
-pkg_postinst() {
- if use X ; then
- xdg_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use X ; then
- xdg_icon_cache_update
- fi
-}
diff --git a/sci-libs/gmsh/gmsh-4.13.1-r1.ebuild b/sci-libs/gmsh/gmsh-4.13.1-r1.ebuild
deleted file mode 100644
index 6d1e265c1bcf..000000000000
--- a/sci-libs/gmsh/gmsh-4.13.1-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Three-dimensional finite element mesh generator"
-HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh"
-SRC_URI="https://gmsh.info/src/${P}-source.tgz"
-S="${WORKDIR}/${P}-source"
-
-LICENSE="
- GPL-2+ free-noncomm
- alglib? ( MIT )
- gmm? ( LGPL-2.1+ )
- metis? ( Apache-2.0 )
- netgen? ( LGPL-2.1+ )
- voro? ( BSD )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-## cgns is not compiling ATM, maybe fix cgns lib first
-IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib"
-
-REQUIRED_USE="
- ^^ ( blas eigen )
- mumps? ( blas )
- slepc? ( petsc )
- "
-
-RDEPEND="
- virtual/fortran
- X? ( x11-libs/fltk:1=[xft(+)] )
- alglib? ( sci-libs/alglib )
- blas? (
- virtual/blas
- virtual/lapack
- sci-libs/fftw:3.0
- )
- cgns? (
- sci-libs/cgnslib
- sci-libs/hdf5:=[mpi=]
- )
- eigen? ( dev-cpp/eigen )
- gmm? ( sci-mathematics/gmm )
- jpeg? ( media-libs/libjpeg-turbo )
- med? (
- sci-libs/med[mpi=]
- sci-libs/hdf5:=[mpi=]
- )
- metis? ( >=sci-libs/metis-5.2.0 )
- mpi? ( virtual/mpi )
- mumps? ( sci-libs/mumps[mpi=] )
- opencascade? ( sci-libs/opencascade:* )
- pdf? ( app-text/poppler:= )
- png? ( media-libs/libpng:0 )
- petsc? ( sci-mathematics/petsc[mpi=] )
- slepc? ( sci-mathematics/slepc[mpi=] )
- voro? ( sci-libs/voro++ )
- zlib? ( sys-libs/zlib )
- "
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- python? ( dev-lang/swig:0 )
- "
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.9.5-opencascade.patch
- "${FILESDIR}"/${PN}-4.11.1-metis-5-2.patch
-)
-
-pkg_setup() {
- fortran-2_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=( )
-
- use blas && \
- mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
-
- mycmakeargs+=(
- -DENABLE_ALGLIB="$(usex alglib)"
- -DENABLE_BLAS_LAPACK="$(usex blas)"
- -DENABLE_BUILD_DYNAMIC="$(usex shared)"
- -DENABLE_CGNS="$(usex cgns)"
- -DENABLE_EIGEN="$(usex eigen)"
- -DENABLE_FLTK="$(usex X)"
- -DENABLE_GMM="$(usex gmm)"
- -DENABLE_GRAPHICS="$(usex X)"
- -DENABLE_MED="$(usex med)"
- -DENABLE_MPI="$(usex mpi)"
- -DENABLE_METIS="$(usex metis)"
- -DENABLE_MUMPS="$(usex mumps)"
- -DENABLE_NETGEN="$(usex netgen)"
- -DENABLE_OCC="$(usex opencascade)"
- -DENABLE_PETSC="$(usex petsc)"
- -DENABLE_POPPLER="$(usex pdf)"
- -DENABLE_SLEPC="$(usex slepc)"
- -DENABLE_PRIVATE_API="$(usex shared)"
- -DENABLE_SYSTEM_CONTRIB="YES"
- -DENABLE_VOROPP="$(usex voro)"
- -DENABLE_WRAP_PYTHON="$(usex python)")
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use examples ; then
- dodoc -r examples tutorials
- docompress -x /usr/share/doc/${PF}/{examples,tutorials}
- fi
-
- if use X ; then
- newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png
- make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math"
- fi
-}
-
-pkg_postinst() {
- if use X ; then
- xdg_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use X ; then
- xdg_icon_cache_update
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/
@ 2025-09-30 4:53 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2025-09-30 4:53 UTC (permalink / raw
To: gentoo-commits
commit: f4a4e42c5e50466c17c318341a5e2a875e53104a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 29 18:10:14 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 30 04:53:09 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a4e42c
sci-libs/gmsh: add 4.14.1, fix finding system alglib, add slot op
rm bundled libs to make sure they are not used.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/gmsh/Manifest | 1 +
sci-libs/gmsh/files/gmsh-4.14.1-alglib.patch | 14 +++
sci-libs/gmsh/gmsh-4.14.1.ebuild | 153 +++++++++++++++++++++++++++
3 files changed, 168 insertions(+)
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 4fcf3284eb81..f3404d2a12fb 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1 +1,2 @@
DIST gmsh-4.14.0-source.tgz 18458158 BLAKE2B 02af538c094fb7fa1033f3d5821dab3e1554ca10e0bc7a0ab87cca3079e119c5fec149c4af2f4c12d213776f36d8b9734631fd5a3240a9e938c2330dd6bc8989 SHA512 130104088e6ba195a4bdc14ef4c79b28872996fa58690161bf304e267d02b21247a3f7865d4c08eadc87cd686657a7fea52379b5ec0a8d67280b237c2a2647bc
+DIST gmsh-4.14.1-source.tgz 18458428 BLAKE2B 5a38e166b52c68f2880d4d0d649719800844289cf8b2e8377b6579bb1b91e5b1e7c0adfb528371ab92ed761f1a4433ecc73d1220c6e35d8c731b233f36fd6143 SHA512 746be1fcbb6b39d1b77df0ee47a3080b34de90f859ca6c31ef7331d7a3d56ec129b35c4383f909dbf47c80199764ea2a2cbffa4f09b018c131f6c97158d05a1c
diff --git a/sci-libs/gmsh/files/gmsh-4.14.1-alglib.patch b/sci-libs/gmsh/files/gmsh-4.14.1-alglib.patch
new file mode 100644
index 000000000000..d56215d28ab4
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-4.14.1-alglib.patch
@@ -0,0 +1,14 @@
+Partially reverts https://gitlab.onelab.info/gmsh/gmsh/-/commit/8becbc0bca57e5f823a36327a400d2d3688b3dba
+which could not possibly have worked with system alglib.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -774,7 +774,7 @@
+
+ if(ENABLE_ALGLIB)
+ find_library(ALGLIB_LIB alglib)
+- find_path(ALGLIB_INC "stdafx.h" PATH_SUFFIXES libalglib)
++ find_path(ALGLIB_INC "stdafx.h" PATH_SUFFIXES alglib)
+ if(ENABLE_SYSTEM_CONTRIB AND ALGLIB_LIB AND ALGLIB_INC)
+ list(APPEND EXTERNAL_LIBRARIES ${ALGLIB_LIB})
+ list(APPEND EXTERNAL_INCLUDES ${ALGLIB_INC})
diff --git a/sci-libs/gmsh/gmsh-4.14.1.ebuild b/sci-libs/gmsh/gmsh-4.14.1.ebuild
new file mode 100644
index 000000000000..eb8200ee4029
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-4.14.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit cmake desktop fortran-2 python-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Three-dimensional finite element mesh generator"
+HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh"
+SRC_URI="https://gmsh.info/src/${P}-source.tgz"
+S="${WORKDIR}/${P}-source"
+
+LICENSE="
+ GPL-2+ free-noncomm
+ alglib? ( MIT )
+ gmm? ( LGPL-2.1+ )
+ metis? ( Apache-2.0 )
+ netgen? ( LGPL-2.1+ )
+ voro? ( BSD )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+## cgns is not compiling ATM, maybe fix cgns lib first
+IUSE="+alglib +blas cgns eigen examples +gmm gui jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc voro zlib"
+
+REQUIRED_USE="
+ ^^ ( blas eigen )
+ mumps? ( blas )
+ slepc? ( petsc )
+ python? ( shared ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+ virtual/fortran
+ gui? ( x11-libs/fltk:1=[xft(+)] )
+ alglib? ( sci-libs/alglib:= )
+ blas? (
+ sci-libs/fftw:3.0
+ virtual/blas
+ virtual/lapack
+ )
+ cgns? (
+ sci-libs/cgnslib
+ sci-libs/hdf5:=[mpi=]
+ )
+ eigen? ( dev-cpp/eigen )
+ gmm? ( sci-mathematics/gmm )
+ jpeg? ( media-libs/libjpeg-turbo )
+ med? (
+ sci-libs/hdf5:=[mpi=]
+ sci-libs/med[mpi=]
+ )
+ metis? ( >=sci-libs/metis-5.2.0 )
+ mpi? ( virtual/mpi )
+ mumps? ( sci-libs/mumps[mpi=] )
+ opencascade? ( sci-libs/opencascade:* )
+ pdf? ( app-text/poppler:= )
+ png? ( media-libs/libpng:0 )
+ petsc? ( sci-mathematics/petsc[mpi=] )
+ python? ( ${PYTHON_DEPS} )
+ slepc? ( sci-mathematics/slepc[mpi=] )
+ voro? ( sci-libs/voro++ )
+ zlib? ( sys-libs/zlib )
+"
+
+DEPEND="
+ ${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ python? ( dev-lang/swig )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.9.5-opencascade.patch
+ "${FILESDIR}"/${PN}-4.11.1-metis-5-2.patch
+ "${FILESDIR}"/${PN}-4.14.1-alglib.patch # downstream; find it in include subdir
+)
+
+src_prepare() {
+ # ensure we don't let automagic detect bundled libs
+ # for pkgs supposed to be in system
+ einfo "Cleanup bundled libs:"
+ local contrib
+ for contrib in ALGLIB eigen gmm metis Netgen voro++; do
+ rm -rv contrib/${contrib} || die
+ done
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=( -DENABLE_SYSTEM_CONTRIB="YES" )
+
+ use blas && \
+ mycmakeargs+=( -DCMAKE_Fortran_COMPILER=$(tc-getF77) )
+
+ mycmakeargs+=(
+ -DENABLE_ALGLIB="$(usex alglib)"
+ -DENABLE_BLAS_LAPACK="$(usex blas)"
+ -DENABLE_BUILD_DYNAMIC="$(usex shared)"
+ -DENABLE_CGNS="$(usex cgns)"
+ -DENABLE_EIGEN="$(usex eigen)"
+ -DENABLE_FLTK="$(usex gui)"
+ -DENABLE_GMM="$(usex gmm)"
+ -DENABLE_GRAPHICS="$(usex gui)"
+ -DENABLE_MED="$(usex med)"
+ -DENABLE_MPI="$(usex mpi)"
+ -DENABLE_METIS="$(usex metis)"
+ -DENABLE_MUMPS="$(usex mumps)"
+ -DENABLE_NETGEN="$(usex netgen)"
+ -DENABLE_OCC="$(usex opencascade)"
+ -DENABLE_PETSC="$(usex petsc)"
+ -DENABLE_POPPLER="$(usex pdf)"
+ -DENABLE_SLEPC="$(usex slepc)"
+ -DENABLE_PRIVATE_API="$(usex shared)"
+ -DENABLE_VOROPP="$(usex voro)"
+ -DENABLE_WRAP_PYTHON="$(usex python)"
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use examples ; then
+ dodoc -r examples tutorials
+ docompress -x /usr/share/doc/${PF}/{examples,tutorials}
+ fi
+
+ if use python; then
+ python_foreach_impl python_domodule api/gmsh.py
+ fi
+
+ if use gui ; then
+ newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png
+ make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math"
+ fi
+}
+
+pkg_postinst() {
+ if use gui ; then
+ xdg_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use gui ; then
+ xdg_icon_cache_update
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-09-30 4:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-31 20:34 [gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-09-30 4:53 Andreas Sturmlechner
2023-05-03 14:52 Andrew Ammerlaan
2023-05-02 17:45 Sam James
2022-06-06 5:49 Matthias Maier
2021-12-02 18:44 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox