[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: Remove leftover patch.
From: |
guix-commits |
Subject: |
02/02: gnu: Remove leftover patch. |
Date: |
Tue, 13 Aug 2019 14:47:58 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 2b3a10b6b5f2a48665cf4bfa27525c4caca175d9
Author: Marius Bakke <address@hidden>
Date: Tue Aug 13 20:43:08 2019 +0200
gnu: Remove leftover patch.
This patch was rendered obsolete by the preceding merge.
* gnu/packages/patches/scribus-poppler-0.73.patch: Delete file.
---
gnu/packages/patches/scribus-poppler-0.73.patch | 36 -------------------------
1 file changed, 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 5cf4cf7..0000000
--- 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