summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthijs Tadema2024-03-12 11:09:39 +0100
committerMatthijs Tadema2024-03-12 11:10:10 +0100
commit83b557e5344d8521f8a27553b037d13c499d1d29 (patch)
tree91d7fdca6bfb8be33b0e3cf549c33b6e05cf1ba2
parente2e0009f87751bd880d8ed54626117e756edba56 (diff)
downloadaur-83b557e5344d8521f8a27553b037d13c499d1d29.tar.gz
Include patch to enable glm experimental features
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
-rw-r--r--glm_exp.patch12
3 files changed, 21 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 783c2c162cb6..598b46bf4f50 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,7 +26,9 @@ pkgbase = pymol-git
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 e603e9a3ca3f..d41194f6bdeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,9 +31,11 @@ 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")
+ ${_name}.png::"https://c.fsdn.com/allura/p/pymol/icon"
+ "glm_exp.patch")
md5sums=('SKIP'
- 'a6b62ae41658a772f75b3b123a8e5c0b')
+ 'a6b62ae41658a772f75b3b123a8e5c0b'
+ '26b4244b871a55a83bc6f42d761bc6f9')
pkgver() {
cd "${srcdir}/${_name}"
@@ -41,6 +43,9 @@ 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
new file mode 100644
index 000000000000..3a66e4243469
--- /dev/null
+++ b/glm_exp.patch
@@ -0,0 +1,12 @@
+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