diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-08-13 20:43:08 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-08-13 20:43:08 +0200 |
| commit | 2b3a10b6b5f2a48665cf4bfa27525c4caca175d9 (patch) | |
| tree | dacbe0484019387b586eb5f304295a8e1fa82397 /gnu/packages/patches | |
| parent | 462ad9f56b9665b8d22960acee73ad91f1052c9c (diff) | |
| download | guix-2b3a10b6b5f2a48665cf4bfa27525c4caca175d9.tar.gz | |
gnu: Remove leftover patch.
This patch was rendered obsolete by the preceding merge. * gnu/packages/patches/scribus-poppler-0.73.patch: Delete file.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/scribus-poppler-0.73.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/gnu/packages/patches/scribus-poppler-0.73.patch b/gnu/packages/patches/scribus-poppler-0.73.patch deleted file mode 100644 index 5cf4cf721d..0000000000 --- a/gnu/packages/patches/scribus-poppler-0.73.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 |