diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-10 18:15:10 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-11 19:48:31 +0100 |
| commit | 9df397508dc1bc3544534aebc7c658c9754b08b4 (patch) | |
| tree | 7a59d005f6f8c691e35e37b6f20a5b5a5bcabfa9 /gnu/packages/patches/scribus-poppler-0.73.patch | |
| parent | 35b259eed055e288eadb2365b5ab4e8b15f363a7 (diff) | |
| download | guix-9df397508dc1bc3544534aebc7c658c9754b08b4.tar.gz | |
gnu: poppler: Update to 0.74.0.
* gnu/packages/patches/scribus-poppler-0.73.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/scribus.scm (scribus)[source](patches): Add it. * gnu/packages/pdf.scm (poppler): Update to 0.74.0. [arguments]: Adjust renamed configure flag. * gnu/packages/tex.scm (texlive-bin)[arguments]: Add phase 'use-code-for-even-newer-poppler'.
Diffstat (limited to 'gnu/packages/patches/scribus-poppler-0.73.patch')
| -rw-r--r-- | gnu/packages/patches/scribus-poppler-0.73.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/gnu/packages/patches/scribus-poppler-0.73.patch b/gnu/packages/patches/scribus-poppler-0.73.patch new file mode 100644 index 0000000000..5cf4cf721d --- /dev/null +++ b/gnu/packages/patches/scribus-poppler-0.73.patch @@ -0,0 +1,36 @@ +Fix build with Poppler 0.73. + +This is an amalgamation of these upstream commits: +https://github.com/scribusproject/scribus/commit/d34e59bfe495250ba023ba0f99e672ee32300a27 +https://github.com/scribusproject/scribus/commit/c43a89030026f8ffab5070b6935daee8bd74838a + +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index c46448b80a..4dac7c3983 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place. + #include "selection.h" + #include "vgradient.h" + ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0) + #include <poppler/goo/gtypes.h> ++#endif + #include <poppler/Object.h> + #include <poppler/OutputDev.h> + #include <poppler/Gfx.h> +diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h +index f6b3950377..80ac796501 100644 +--- a/scribus/plugins/import/pdf/importpdfconfig.h ++++ b/scribus/plugins/import/pdf/importpdfconfig.h +@@ -37,4 +37,11 @@ for which a new license (GPL+exception) is in place. + #define getCString c_str + #endif + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 73, 0) ++#define Guchar unsigned char ++#define Gushort unsigned short ++#define Guint unsigned int ++#define Gulong unsigned long ++#endif ++ + #endif |