From c3214cc91a73bf9d322b020cc8824f5bef71ba2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 25 Apr 2021 16:12:18 +0200
Subject: [PATCH] avogadrolibs: upgrade 1.93.0 -> 1.93.1 and fix pointers to
 our build sysroot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../avogadro/avogadrolibs.bb                  | 23 ++++++++++++-------
 .../avogadro/avogadrolibs.inc                 |  4 ++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb
index 7a923d76..44a501f4 100644
--- a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb
+++ b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.bb
@@ -13,27 +13,34 @@ DEPENDS = " \
     mmtf-cpp \
 "
 
-inherit cmake_lib
+inherit cmake_extra_sanity features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
 
 SRC_URI += " \
     file://0001-Avoid-RPATH-if-not-configured.patch \
     file://0002-AvogadroLibsConfig.cmake-Find-include.patch \
 "
 
-EXTRA_OECMAKE += "-DENABLE_RPATH=OFF"
-
-# avogadrolibs has lots of include_directories(SYSTEM ${FOO_DIR})
-# have no better way to make gcc6 happy
 do_configure_append() {
-     sed -i 's:-isystem :-I :g' `find ${B} -name '*.ninja'`
+    # fix python executable path to not point to sysroot
+    sed -i 's:pythonInterpreterPath =.*:pythonInterpreterPath = "${bindir}/python3";:g' ${B}/avogadro/qtgui/avogadropython.h
+    # fix absolute sysroot library paths
+    sed -i \
+        -e 's:${STAGING_LIBDIR}/libGLEW.so:GLEW:g' \
+        -e 's:${STAGING_LIBDIR}/libGL.so:GL:g' \
+        -e 's:${STAGING_LIBDIR}/libGLU.so:GLU:g' \
+        -e 's:${STAGING_LIBDIR}/libarchive.so:archive:g' \
+        ${B}/CMakeFiles/Export/lib/cmake/avogadrolibs/AvogadroLibsTargets.cmake
 }
 
+EXTRA_OECMAKE += "-DENABLE_RPATH=OFF"
+
 FILES_${PN} += " \
     ${libdir}/avogadro2/scripts \
 "
 
 FILES_${PN}-staticdev += " \
     ${libdir}/avogadro2/staticplugins \
+    ${libdir}/avogadro2/*.a \
 "
-
-CMAKE_ALIGN_SYSROOT[1] = "avogadrolibs, -S${prefix}, -S${STAGING_DIR_HOST}/${prefix}"
diff --git a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.inc b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.inc
index 2730cf33..ea12bfb6 100644
--- a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.inc
+++ b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=68485d31f72dbb8611179b6c7515617b"
 
 inherit cmake_qt5 python3native
 
-PV = "1.93.0"
+PV = "1.93.1"
 SRC_URI = "git://github.com/OpenChemistry/avogadrolibs.git"
-SRCREV = "d55b7b2db2314b7c09336c05c841f31bbec40fc4"
+SRCREV = "4f1b21de000046c04a39829063c6416fbd70922b"
 S = "${WORKDIR}/git"