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" t/gnu/machine.scm
AgeCommit message (Expand)Author
2019-12-08machine: Remove unnecessary record self-referencing bindings....'this-machine' and 'this-machine-ssh-configuration' were useless given that there are no thunked fields. * gnu/machine.scm (<machine>)[this-machine]: Remove. * gnu/machine/ssh.scm (<machine-ssh-configuration>) [this-machine-ssh-configuration]: Remove. Ludovic Courtès
2019-12-07machine: Add provenance tracking to each machine operating system....* gnu/machine.scm (<machine>): Rename accessor to '%machine-operating-system'. (machine-operating-system): New procedure. * doc/guix.texi (Service Reference): Mention it. Ludovic Courtès
2019-08-15machine: Implement 'roll-back-machine'....* gnu/machine.scm (roll-back-machine, &deploy-error, deploy-error?) (deploy-error-should-roll-back) (deploy-error-captured-args): New variable. * gnu/machine/ssh.scm (roll-back-managed-host): New variable. * guix/scripts/deploy.scm (guix-deploy): Roll-back systems when a deployment fails. Jakob L. Kreuze
2019-08-06machine: Rename 'system' field....* gnu/machine.scm (machine-system): Delete variable. (machine-operating-system): New variable. All callers changed. * doc/guix.texi (Invoking guix deploy): Use the 'machine-operating-system' accessor rather than 'machine-system'. Jakob L. Kreuze
2019-07-06gnu: Add machine type for deployment specifications....* gnu/machine.scm: New file. * gnu/machine/ssh.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Jakob L. Kreuze