diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
| commit | 66ea98e321e93b0806f6870d77dd4c00e7e720c0 (patch) | |
| tree | 21778401485e3b8683bbc6a31769233c059683b1 /gnu/packages/patches/abiword-no-include-glib-internal-headers.patch | |
| parent | da5538ef44bfa74d3e435f9f557374eabba5dc1e (diff) | |
| parent | 5dae0186dea1e72e73bf223161620cfeddef5a63 (diff) | |
| download | guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
Diffstat (limited to 'gnu/packages/patches/abiword-no-include-glib-internal-headers.patch')
| -rw-r--r-- | gnu/packages/patches/abiword-no-include-glib-internal-headers.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gnu/packages/patches/abiword-no-include-glib-internal-headers.patch b/gnu/packages/patches/abiword-no-include-glib-internal-headers.patch new file mode 100644 index 0000000000..60a74920fb --- /dev/null +++ b/gnu/packages/patches/abiword-no-include-glib-internal-headers.patch @@ -0,0 +1,13 @@ +Include glib.h instead of an internal header. + +--- a/goffice-bits/goffice/app/goffice-app.h 2007-01-17 00:17:27.000000000 +0100 ++++ b/goffice-bits/goffice/app/goffice-app.h 2014-09-05 19:02:59.402064713 +0200 +@@ -22,7 +22,7 @@ + #ifndef GOFFICE_APP_H + #define GOFFICE_APP_H + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + |