summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHector Mtz-Seara2022-08-25 09:14:55 +0200
committerHector Mtz-Seara2022-08-25 09:14:55 +0200
commit998b84a274bb8ecf8eae4fe75e302aebee0601dd (patch)
treed9d6b3b0c8aa3fe5ebd461445f8134841ce9970f
parent69cbfa1d3f2ced02a0f183d87c8930036a55389d (diff)
downloadaur-998b84a274bb8ecf8eae4fe75e302aebee0601dd.tar.gz
Release_2022_03_5 - No patches needed
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--patch-catch2.diff17
3 files changed, 6 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7be086a144af..70ef14115371 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = rdkit
pkgdesc = RDKit - A collection of cheminformatics and machine-learning software written in C++ and Python.
- pkgver = 2021_09_5
+ pkgver = 2022_03_5
pkgrel = 2
url = http://rdkit.org/
arch = i686
@@ -20,9 +20,7 @@ pkgbase = rdkit
provides = rdkit
conflicts = rdkit-python2
conflicts = rdkit-git
- source = https://github.com/rdkit/rdkit/archive/Release_2021_09_5.tar.gz
- source = patch-catch2.diff
- sha256sums = f720b3f6292c4cd0a412a073d848ffac01a43960082e33ee54b68798de0cbfa1
- sha256sums = a06c6cf2fd30546ae8fa5896fdb846207c3a712a81163de8c7be75a105ccab0e
+ source = https://github.com/rdkit/rdkit/archive/Release_2022_03_5.tar.gz
+ sha256sums = 38e6fb9f063b6132310f17e654f2c4350876f9164b0a17b49fe3df7d0555a744
pkgname = rdkit
diff --git a/PKGBUILD b/PKGBUILD
index 17242dceed43..129a12b1cdbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Old Maintainer: Samo Turk <samo.turk@gmail.com>
# Maintainer: Hector Mtz-Seara <hseara # gmail.com>
pkgname=rdkit
-pkgver=2021_09_5
+pkgver=2022_03_5
pkgrel=2
pkgdesc="RDKit - A collection of cheminformatics and machine-learning software written in C++ and Python."
arch=("i686" "x86_64" "armv7h")
@@ -9,23 +9,14 @@ 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"
- "patch-catch2.diff")
-sha256sums=('f720b3f6292c4cd0a412a073d848ffac01a43960082e33ee54b68798de0cbfa1'
- 'a06c6cf2fd30546ae8fa5896fdb846207c3a712a81163de8c7be75a105ccab0e')
+source=("https://github.com/rdkit/rdkit/archive/Release_${pkgver}.tar.gz")
+sha256sums=('38e6fb9f063b6132310f17e654f2c4350876f9164b0a17b49fe3df7d0555a744')
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}
- sed -i 's/23ed3f833c1ae0adb141a26b4a30d73e/850b0df852f1cda4970887b540f8f333/' ${srcdir}/${pkgname}-Release_${pkgver}/Code/GraphMol/MolDraw2D/CMakeLists.txt
mkdir -p build
cd build
diff --git a/patch-catch2.diff b/patch-catch2.diff
deleted file mode 100644
index bba79c45f756..000000000000
--- a/patch-catch2.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-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})