summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHector Mtz-Seara2022-03-18 17:35:06 +0100
committerHector Mtz-Seara2022-03-18 17:35:06 +0100
commit69cbfa1d3f2ced02a0f183d87c8930036a55389d (patch)
treedc46ab16f409e0da80182fb4f0c5277895afa4d7
parentfc54d29be34d3f4f9777be29f3d01bac2d60c671 (diff)
downloadaur-69cbfa1d3f2ced02a0f183d87c8930036a55389d.tar.gz
Updated v2021_09_05
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD15
-rw-r--r--patch-catch2.diff17
3 files changed, 34 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dae991b59917..7be086a144af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rdkit
pkgdesc = RDKit - A collection of cheminformatics and machine-learning software written in C++ and Python.
- pkgver = 2021_09_4
- pkgrel = 1
+ pkgver = 2021_09_5
+ pkgrel = 2
url = http://rdkit.org/
arch = i686
arch = x86_64
@@ -20,7 +20,9 @@ pkgbase = rdkit
provides = rdkit
conflicts = rdkit-python2
conflicts = rdkit-git
- source = https://github.com/rdkit/rdkit/archive/Release_2021_09_4.tar.gz
- sha256sums = ce192e85bbdc1dcf24d327197229099c8625ee20ef022fcbd980791fdbfc7203
+ source = https://github.com/rdkit/rdkit/archive/Release_2021_09_5.tar.gz
+ source = patch-catch2.diff
+ sha256sums = f720b3f6292c4cd0a412a073d848ffac01a43960082e33ee54b68798de0cbfa1
+ sha256sums = a06c6cf2fd30546ae8fa5896fdb846207c3a712a81163de8c7be75a105ccab0e
pkgname = rdkit
diff --git a/PKGBUILD b/PKGBUILD
index aaf4bd806420..17242dceed43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,27 @@
# Old Maintainer: Samo Turk <samo.turk@gmail.com>
# Maintainer: Hector Mtz-Seara <hseara # gmail.com>
pkgname=rdkit
-pkgver=2021_09_4
-pkgrel=1
+pkgver=2021_09_5
+pkgrel=2
pkgdesc="RDKit - A collection of cheminformatics and machine-learning software written in C++ and Python."
arch=("i686" "x86_64" "armv7h")
url="http://rdkit.org/"
license=('BSD')
depends=(python python-numpy python-cairocffi python-pillow boost boost-libs sqlite cairo eigen)
makedepends=('cmake>=3.1')
-source=("https://github.com/rdkit/rdkit/archive/Release_${pkgver}.tar.gz")
-sha256sums=('ce192e85bbdc1dcf24d327197229099c8625ee20ef022fcbd980791fdbfc7203')
+source=("https://github.com/rdkit/rdkit/archive/Release_${pkgver}.tar.gz"
+ "patch-catch2.diff")
+sha256sums=('f720b3f6292c4cd0a412a073d848ffac01a43960082e33ee54b68798de0cbfa1'
+ 'a06c6cf2fd30546ae8fa5896fdb846207c3a712a81163de8c7be75a105ccab0e')
conflicts=('rdkit-python2' 'rdkit-git')
provides=(rdkit)
+prepare() {
+ cd ${srcdir}/${pkgname}-Release_${pkgver}
+ patch -p1 --input="${srcdir}/patch-catch2.diff"
+ rm -rf External/catch/*.tar.gz External/catch/catch
+}
build() {
cd ${srcdir}/${pkgname}-Release_${pkgver}
diff --git a/patch-catch2.diff b/patch-catch2.diff
new file mode 100644
index 000000000000..bba79c45f756
--- /dev/null
+++ b/patch-catch2.diff
@@ -0,0 +1,17 @@
+diff --git a/External/catch/CMakeLists.txt b/External/catch/CMakeLists.txt
+index c3cad01993..5a7ed5c1b7 100644
+--- a/External/catch/CMakeLists.txt
++++ b/External/catch/CMakeLists.txt
+@@ -12,10 +12,10 @@ elseif(EXISTS "${CATCH_DIR}/single_include/catch2/catch.hpp")
+ else()
+ message("-- Catch not found in ${CATCH_DIR}")
+ include(RDKitUtils)
+- set(RELEASE_NO "2.12.4")
++ set(RELEASE_NO "2.13.8")
+ downloadAndCheckMD5("https://github.com/catchorg/Catch2/archive/v${RELEASE_NO}.tar.gz"
+ "${CMAKE_CURRENT_SOURCE_DIR}/v${RELEASE_NO}.tar.gz"
+- "dbe4fa691e37dd51256876641a821ec8")
++ "3639fb4cb8020de0dcf1fd5addb39418")
+ execute_process(COMMAND ${CMAKE_COMMAND} -E tar zxf
+ ${CMAKE_CURRENT_SOURCE_DIR}/v${RELEASE_NO}.tar.gz
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})