diff --git a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs-native/0001-native-build-encodefile-only.patch b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs-native/0001-native-build-encodefile-only.patch index ef7d5879..21925821 100644 --- a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs-native/0001-native-build-encodefile-only.patch +++ b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs-native/0001-native-build-encodefile-only.patch @@ -1,6 +1,6 @@ From d242b39515dbd268ecd4eaec63d3424497827488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 18 Dec 2016 23:02:14 +0100 +Date: Tue, 3 Dec 2019 18:11:35 +0100 Subject: [PATCH] native: build encodefile only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -19,7 +19,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 52226cd..ff8863e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -54,6 +54,7 @@ option(USE_MOLEQUEUE "Enable the MoleQueue dependent functionality" ON) +@@ -55,6 +55,7 @@ option(USE_MOLEQUEUE "Enable the MoleQueue dependent functionality" ON) option(USE_PYTHON "Use Python to wrap some of our API" OFF) add_subdirectory(utilities) @@ -27,11 +27,10 @@ index 52226cd..ff8863e 100644 add_subdirectory(thirdparty) add_subdirectory(avogadro) -@@ -107,3 +108,5 @@ install(FILES - DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/avogadrolibs") - install(EXPORT "AvogadroLibsTargets" - DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/avogadrolibs") -+ +@@ -114,3 +115,4 @@ if (NOT SKBUILD) + install(EXPORT "AvogadroLibsTargets" + DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/avogadrolibs") + endif() +endif() diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt index e459934..6a76c75 100644 diff --git a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb index 5eb4be5c..7a923d76 100644 --- a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb +++ b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb @@ -1,14 +1,16 @@ require ${BPN}.inc DEPENDS = " \ - ${BPN}-native \ - glew \ - openbabel \ - libeigen \ - molequeue \ - spglib \ - libmsym \ - libarchive \ + ${BPN}-native \ + glew \ + openbabel \ + libeigen \ + molequeue \ + spglib \ + libmsym \ + libarchive \ + msgpack-c \ + mmtf-cpp \ " inherit cmake_lib diff --git a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.inc b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.inc index 7fccf619..187928d4 100644 --- a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.inc +++ b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.inc @@ -4,9 +4,9 @@ HOMEPAGE = "http://openchemistry.org/avogadro2" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=95b8695b33e17e83db253ab07da4455a" -inherit cmake_qt5 pythonnative +inherit cmake_qt5 python3native -PV = "1.92.0" +PV = "1.92.1" SRC_URI = "git://github.com/OpenChemistry/avogadrolibs.git" -SRCREV = "c22000b59a810529ce306089d1c78e0d1ebbd6c3" +SRCREV = "fcd8bda27755fd8a817bd58307cc370f3bc0cfdf" S = "${WORKDIR}/git"