Index: avogadro-1.2.0/libavogadro/src/pythonengine_p.h =================================================================== --- avogadro-1.2.0.orig/libavogadro/src/pythonengine_p.h +++ avogadro-1.2.0/libavogadro/src/pythonengine_p.h @@ -31,7 +31,9 @@ #include #include +#ifndef Q_MOC_RUN #include +#endif namespace Avogadro { Index: avogadro-1.2.0/libavogadro/src/pythonextension_p.h =================================================================== --- avogadro-1.2.0.orig/libavogadro/src/pythonextension_p.h +++ avogadro-1.2.0/libavogadro/src/pythonextension_p.h @@ -33,7 +33,9 @@ #include #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include Index: avogadro-1.2.0/libavogadro/src/pythontool_p.h =================================================================== --- avogadro-1.2.0.orig/libavogadro/src/pythontool_p.h +++ avogadro-1.2.0/libavogadro/src/pythontool_p.h @@ -31,7 +31,9 @@ #include #include +#ifndef Q_MOC_RUN #include +#endif #include #include Index: avogadro-1.2.0/libavogadro/src/pythoninterpreter.h =================================================================== --- avogadro-1.2.0.orig/libavogadro/src/pythoninterpreter.h +++ avogadro-1.2.0/libavogadro/src/pythoninterpreter.h @@ -26,7 +26,9 @@ #define PYTHONINTERPRETER_H #include +#ifndef Q_MOC_RUN #include +#endif #include #include Index: avogadro-1.2.0/libavogadro/src/pythonscript.h =================================================================== --- avogadro-1.2.0.orig/libavogadro/src/pythonscript.h +++ avogadro-1.2.0/libavogadro/src/pythonscript.h @@ -27,6 +27,8 @@ #define PYTHONSCRIPT_H #include +#ifndef Q_MOC_RUN #include +#endif #include "pythonerror.h" '/guix/log/tests?id=3547bb6a66c32eb1deac46a98b40e2e051689ed3'>tests/egg.scm
AgeCommit message (Expand)Author
2021-11-17Merge branch 'master' into core-updates-frozenLudovic Courtès
2021-11-14tests: Adjust tests/egg.scm to latest API changes....This is a followup to b999c80c2e71bd4b3f26a18a321b7e7e7b580103. * tests/egg.scm (eval-test-with-egg-file): Pass 'version' argument to 'egg->guix-package'. Ludovic Courtès
2021-07-20import: egg: Emit new-style package inputs....* guix/import/egg.scm (egg->guix-package): Generate dependency list from a list of symbols. [egg-parse-dependency]: Return a list of symbols. [maybe-inputs]: Wrap INPUTS in 'list' instead of 'quasiquote'. * tests/egg.scm (match-chicken-foo): Adjust accordingly. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Sarah Morgensen
2021-06-03import: Add CHICKEN egg importer....* guix/import/egg.scm: New file. * guix/scripts/import/egg.scm: New file. * tests/egg.scm: New file. * Makefile.am (MODULES, SCM_TESTS): Register them. * po/guix/POTFILES.in: Likewise. * guix/scripts/import.scm (importers): Add egg importer. * doc/guix.texi (Invoking guix import, Invoking guix refresh): Document it. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Xinglu Chen