summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Aznarán2023-12-21 18:54:32 -0500
committerCarlos Aznarán2023-12-21 18:54:32 -0500
commit9d36e35b118a0bcbbdb1ce559115487072b10687 (patch)
treed607ae531784580a265ce0ac99e8d0b2eb0a1427
parentf20f56f63eff4247d840f2414365d09e964dab26 (diff)
downloadaur-9d36e35b118a0bcbbdb1ce559115487072b10687.tar.gz
Fix warning when import gmsh with python
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--warning-python-bindings.patch13
3 files changed, 22 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ffbf4edcdb5..ab2d5ee06fa6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gmsh
pkgdesc = An automatic 3D finite element mesh generator with pre and post-processing facilities.
pkgver = 4.12.0
- pkgrel = 1
+ pkgrel = 2
url = https://gmsh.info
arch = x86_64
license = custom
@@ -25,9 +25,11 @@ pkgbase = gmsh
source = https://gmsh.info/src/gmsh-4.12.0-source.tgz
source = gmsh.desktop
source = gmsh.completion
+ source = warning-python-bindings.patch
sha256sums = 2a6007872ba85abd9901914826f6986a2437ab7104f564ccefa1b7a3de742c17
sha256sums = 43a8ca33ac917ee7196fdae305ff2c8cb9ae1072569ee546c0ce8ff580c966ae
sha256sums = 11605e97636a56cf51e445e65019526ee253bd2e0553fb71ba6d94488dcd34ef
+ sha256sums = 7f0bba9bfe1d636b6758af394d97778791acb0e3484098128af379219a9a9574
pkgname = gmsh
depends = fltk
diff --git a/PKGBUILD b/PKGBUILD
index 08f25b662124..511a1baf02f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: mickele <mimocciola@yahoo.com>
pkgname=('gmsh' 'gmsh-docs')
pkgver=4.12.0
-pkgrel=1
+pkgrel=2
pkgdesc="An automatic 3D finite element mesh generator with pre and post-processing facilities."
arch=('x86_64')
url="https://gmsh.info"
@@ -12,10 +12,12 @@ makedepends=('cmake' 'desktop-file-utils' 'sed' 'swig' 'texlive-meta' 'voro++'
'fltk' 'med-openmpi' 'opencascade' 'cairo' 'metis' 'alglib' 'ann'
'glu' 'cgns' 'lapack')
options=(!emptydirs)
-source=("${url}/src/${pkgname}-${pkgver}-source.tgz" gmsh.desktop gmsh.completion)
+source=("${url}/src/${pkgname}-${pkgver}-source.tgz" gmsh.desktop gmsh.completion
+warning-python-bindings.patch)
sha256sums=('2a6007872ba85abd9901914826f6986a2437ab7104f564ccefa1b7a3de742c17'
'43a8ca33ac917ee7196fdae305ff2c8cb9ae1072569ee546c0ce8ff580c966ae'
- '11605e97636a56cf51e445e65019526ee253bd2e0553fb71ba6d94488dcd34ef')
+ '11605e97636a56cf51e445e65019526ee253bd2e0553fb71ba6d94488dcd34ef'
+ '7f0bba9bfe1d636b6758af394d97778791acb0e3484098128af379219a9a9574')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}-source"
@@ -27,6 +29,7 @@ prepare() {
-i src/fltk/graphicWindow.cpp
sed -e "s|https://gmsh.info/|file:///usr/share/licenses/gmsh/|" \
-i src/fltk/helpWindow.cpp
+ patch -p1 -i ../warning-python-bindings.patch
}
build() {
diff --git a/warning-python-bindings.patch b/warning-python-bindings.patch
new file mode 100644
index 000000000000..a7b81bb736f0
--- /dev/null
+++ b/warning-python-bindings.patch
@@ -0,0 +1,13 @@
+diff --color --unified --recursive --no-dereference gmsh-4.12.0-source/api/gmsh.py gmsh/gmsh-4.12.0-source/api/gmsh.py
+--- gmsh-4.12.0-source/api/gmsh.py 2023-12-21 03:07:36.000000000 -0500
++++ gmsh/gmsh-4.12.0-source/api/gmsh.py 2023-12-21 18:46:21.232675901 -0500
+@@ -61,7 +61,8 @@
+ # second parent dir
+ os.path.join(parentdir2, libname),
+ os.path.join(parentdir2, "lib", libname),
+- os.path.join(parentdir2, "Lib", libname)
++ os.path.join(parentdir2, "Lib", libname),
++ os.path.join("/usr/lib", libname)
+ ]
+
+ for libpath_to_look in possible_libpaths: