summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Kudelin2021-12-13 11:35:39 +0200
committerAnton Kudelin2021-12-13 11:35:39 +0200
commitc345f19c5d6a480f43c5384067c00ce6c64e2d75 (patch)
tree5f25dfeb897e62e0ed1c68f05607150dab41941b
parent997acee6cffc1598279de381f5066566aec65a35 (diff)
downloadaur-c345f19c5d6a480f43c5384067c00ce6c64e2d75.tar.gz
Python 3.10 update
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--configure.patch10
3 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2cb0ba0cccc4..ba78dfb36d26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = vmd-src
pkgdesc = Visual Molecular Dynamics
pkgver = 1.9.4a55
- pkgrel = 1
+ pkgrel = 2
url = http://www.ks.uiuc.edu/Research/vmd/
arch = x86_64
arch = aarch64
@@ -25,6 +25,6 @@ pkgbase = vmd-src
source = local://vmd-1.9.4a55.src.tar.gz
source = configure.patch
sha256sums = cc8aef24cb61d8f9973e1b8d71c6356668456c115a846c47621b2edcd080508b
- sha256sums = 0494d263458014886068276b0d72ea8c93bc3a05466d554aaf7f1ab027768a15
+ sha256sums = 51f0f26b246ab4b9cf561ae7bdb9c636fb1a8963766299e711d121df21152cbd
pkgname = vmd-src
diff --git a/PKGBUILD b/PKGBUILD
index 6a7893435eee..27bf856fce52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=vmd-src
_pkgname=vmd
pkgver=1.9.4a55
-pkgrel=1
+pkgrel=2
pkgdesc="Visual Molecular Dynamics"
url="http://www.ks.uiuc.edu/Research/vmd/"
license=('custom')
@@ -25,7 +25,7 @@ conflicts=("$_pkgname" "$_pkgname-bin")
source=("local://$_pkgname-${pkgver}.src.tar.gz"
"configure.patch")
sha256sums=('cc8aef24cb61d8f9973e1b8d71c6356668456c115a846c47621b2edcd080508b'
- '0494d263458014886068276b0d72ea8c93bc3a05466d554aaf7f1ab027768a15')
+ '51f0f26b246ab4b9cf561ae7bdb9c636fb1a8963766299e711d121df21152cbd')
prepare() {
sed -i 's/ltcl8.5/ltcl/g' plugins/Make-arch
diff --git a/configure.patch b/configure.patch
index b701c8421f90..81faa2c7da53 100644
--- a/configure.patch
+++ b/configure.patch
@@ -123,16 +123,16 @@
- $stock_numpy_include_dir=$ENV{"NUMPY_INCLUDE_DIR"} || "$vmd_library_dir/numpy/lib_$config_arch/include";
- $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "$vmd_library_dir/python/lib_$config_arch/lib/python2.5/site-packages/numpy/core/include";
- $python_libs = "-lpython2.5 -lpthread";
-+ $stock_python_include_dir=$ENV{"PYTHON_INCLUDE_DIR"} || "/usr/include/python3.9";
-+ $stock_python_library_dir=$ENV{"PYTHON_LIBRARY_DIR"} || "/usr/lib/python3.9/config-3.9-x86_64-linux-gnu";
++ $stock_python_include_dir=$ENV{"PYTHON_INCLUDE_DIR"} || "/usr/include/python3.10";
++ $stock_python_library_dir=$ENV{"PYTHON_LIBRARY_DIR"} || "/usr/lib/python3.10/config-3.10-x86_64-linux-gnu";
+# $stock_python_include_dir=$ENV{"PYTHON_INCLUDE_DIR"} || "$vmd_library_dir/python/lib_$config_arch/include/python2.5";
+# $stock_python_library_dir=$ENV{"PYTHON_LIBRARY_DIR"} || "$vmd_library_dir/python/lib_$config_arch/lib/python2.5/config";
+
-+ $stock_numpy_include_dir=$ENV{"NUMPY_INCLUDE_DIR"} || "/usr/lib/python3.9/site-packages/numpy/core/include/numpy";
-+ $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "/usr/lib/python3.9/site-packages/numpy/core/include";
++ $stock_numpy_include_dir=$ENV{"NUMPY_INCLUDE_DIR"} || "/usr/lib/python3.10/site-packages/numpy/core/include/numpy";
++ $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "/usr/lib/python3.10/site-packages/numpy/core/include";
+# $stock_numpy_include_dir=$ENV{"NUMPY_INCLUDE_DIR"} || "$vmd_library_dir/numpy/lib_$config_arch/include";
+# $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "$vmd_library_dir/python/lib_$config_arch/lib/python2.5/site-packages/numpy/core/include";
-+ $python_libs = "-lpython3.9 -lpthread";
++ $python_libs = "-lpython3.10 -lpthread";
}
$python_defines = "-DVMDPYTHON";