Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package avogadrolibs for openSUSE:Factory checked in at 2022-12-08 16:52:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avogadrolibs (Old) and /work/SRC/openSUSE:Factory/.avogadrolibs.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avogadrolibs" Thu Dec 8 16:52:01 2022 rev:8 rq:1041316 version:1.97.0 Changes: -------- --- /work/SRC/openSUSE:Factory/avogadrolibs/avogadrolibs.changes 2022-09-16 13:32:45.573349873 +0200 +++ /work/SRC/openSUSE:Factory/.avogadrolibs.new.1835/avogadrolibs.changes 2022-12-08 16:52:08.599777351 +0100 @@ -1,0 +2,6 @@ +Wed Dec 7 03:55:56 UTC 2022 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Fix build with mmtf-cpp 1.1.0, add + 0001-Avoid-ambigous-definition-of-mmtf-s-is_polymer.patch + +------------------------------------------------------------------- New: ---- 0001-Avoid-ambigous-definition-of-mmtf-s-is_polymer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avogadrolibs.spec ++++++ --- /var/tmp/diff_new_pack.Z7t8RF/_old 2022-12-08 16:52:09.359781250 +0100 +++ /var/tmp/diff_new_pack.Z7t8RF/_new 2022-12-08 16:52:09.367781291 +0100 @@ -44,6 +44,8 @@ Patch0: not-install-gwavi.patch # PATCH-FIX-UPSTREAM Patch1: https://github.com/OpenChemistry/avogadrolibs/commit/e48e67b85aae1f694b1d8c63b844bf8846006aae.patch#/Fix_qtplugins_surfaces_linking.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-Avoid-ambigous-definition-of-mmtf-s-is_polymer.patch BuildRequires: cmake >= 3.3 BuildRequires: eigen3-devel >= 2.91.0 BuildRequires: fdupes ++++++ 0001-Avoid-ambigous-definition-of-mmtf-s-is_polymer.patch ++++++ >From 2f263eade9246544e88497c586c7f01ff31cb221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Wed, 7 Dec 2022 04:54:40 +0100 Subject: [PATCH] Avoid ambigous definition of mmtf's is_polymer is_polymer can be found with ADL lookup in the mmtf namespace (due to mmtf::Entity) and via ordinary lookup in the enclosing namespace, making it ambigous. Remove the copied definition is mmtf is recent enough. Fixes #1185. --- avogadro/io/mmtfformat.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/avogadro/io/mmtfformat.cpp b/avogadro/io/mmtfformat.cpp index fb77491..e58369f 100644 --- a/avogadro/io/mmtfformat.cpp +++ b/avogadro/io/mmtfformat.cpp @@ -33,8 +33,10 @@ MMTFFormat::MMTFFormat() = default; MMTFFormat::~MMTFFormat() = default; +namespace { // from latest MMTF code, under the MIT license // https://github.com/rcsb/mmtf-cpp/blob/master/include/mmtf/structure_data.hpp +#if MMTF_SPEC_VERSION_MAJOR <= 1 && MMTF_SPEC_VERSION_MINOR < 1 bool is_polymer(const unsigned int chain_index, const std::vector<mmtf::Entity>& entity_list) { @@ -48,6 +50,8 @@ bool is_polymer(const unsigned int chain_index, } return false; } +#endif +} // namespace bool MMTFFormat::read(std::istream& file, Molecule& molecule) { -- 2.38.1
