summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthijs Tadema2024-04-10 13:39:04 +0200
committerMatthijs Tadema2024-04-10 13:40:10 +0200
commit52f64ff3f19e442582f53bf9f4cca54029d89f9a (patch)
treefbc1a09e86d845fdb44cb796ea6a2d174948c388
parent83b557e5344d8521f8a27553b037d13c499d1d29 (diff)
downloadaur-pymol-git.tar.gz
removed patch
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--glm_exp.patch12
3 files changed, 5 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 598b46bf4f50..f83076b11f2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = pymol-git
pkgdesc = Molecular visualization system on an Open Source foundation
- pkgver = r5639.ca185848f
+ pkgver = r5647.071998658
pkgrel = 1
url = https://pymol.org
arch = x86_64
@@ -22,13 +22,11 @@ pkgbase = pymol-git
depends = python-numpy
depends = tcsh
optdepends = python-pyqt5: Qt5 based UI
- provides = pymol=r5639.ca185848f
+ provides = pymol=r5647.071998658
conflicts = pymol
source = pymol::git+https://github.com/schrodinger/pymol-open-source.git
source = pymol.png::https://c.fsdn.com/allura/p/pymol/icon
- source = glm_exp.patch
md5sums = SKIP
md5sums = a6b62ae41658a772f75b3b123a8e5c0b
- md5sums = 26b4244b871a55a83bc6f42d761bc6f9
pkgname = pymol-git
diff --git a/PKGBUILD b/PKGBUILD
index d41194f6bdeb..53f152abbb10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
_name=pymol
pkgname="${_name}-git"
-pkgver=r5639.ca185848f
+pkgver=r5647.071998658
pkgrel=1
pkgdesc='Molecular visualization system on an Open Source foundation'
arch=(x86_64)
@@ -31,11 +31,9 @@ optdepends=('python-pyqt5: Qt5 based UI')
conflicts=('pymol')
provides=("${_name}=${pkgver}")
source=(${_name}::"git+https://github.com/schrodinger/pymol-open-source.git"
- ${_name}.png::"https://c.fsdn.com/allura/p/pymol/icon"
- "glm_exp.patch")
+ ${_name}.png::"https://c.fsdn.com/allura/p/pymol/icon")
md5sums=('SKIP'
- 'a6b62ae41658a772f75b3b123a8e5c0b'
- '26b4244b871a55a83bc6f42d761bc6f9')
+ 'a6b62ae41658a772f75b3b123a8e5c0b')
pkgver() {
cd "${srcdir}/${_name}"
@@ -43,9 +41,6 @@ pkgver() {
}
prepare() {
- # Apply patch
- patch --directory="${_name}" --forward --strip=1 --input=../glm_exp.patch
-
# create desktop file
gendesk -f -n \
--pkgname "${_name}" \
diff --git a/glm_exp.patch b/glm_exp.patch
deleted file mode 100644
index 3a66e4243469..000000000000
--- a/glm_exp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/layer0/Bezier.cpp b/layer0/Bezier.cpp
-index 2d9482a66..584e5f38d 100644
---- a/layer0/Bezier.cpp
-+++ b/layer0/Bezier.cpp
-@@ -2,6 +2,7 @@
-
- #include "pymol/algorithm.h"
-
-+#define GLM_ENABLE_EXPERIMENTAL
- #include <glm/gtx/io.hpp>
-
- namespace pymol