all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob c8d8bef860553d2ca8de375d98c9ad0ee9fa5798 1292 bytes (raw)
name: gnu/packages/patches/texlive-poppler-0.84.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
 
From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
Date: Tue, 31 Dec 2019 11:29:30 +0300
Subject: [PATCH] poppler-0.84 compat

Upstream report: https://tug.org/pipermail/tex-k/2019-December/003096.html

Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
 texk/web2c/pdftexdir/utils.c    | 1 -
 texk/web2c/xetexdir/XeTeX_ext.c | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c
index c93a8781..6f866e76 100644
--- a/texk/web2c/pdftexdir/utils.c
+++ b/texk/web2c/pdftexdir/utils.c
@@ -33,7 +33,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "ptexlib.h"
 #include <png.h>
 #ifdef POPPLER_VERSION
-#include <poppler-config.h>
 #define xpdfVersion POPPLER_VERSION
 #define xpdfString "poppler"
 #else
diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c
index 4968ee41..0aee4ee3 100644
--- a/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/texk/web2c/xetexdir/XeTeX_ext.c
@@ -38,7 +38,10 @@ authorization from the copyright holders.
 
 #include <w2c/config.h>
 
+#ifndef POPPLER_VERSION
 #include <poppler-config.h>
+#endif
+
 #include <png.h>
 #include <zlib.h>
 #include <graphite2/Font.h>
-- 
2.24.1



debug log:

solving c8d8bef860 ...
found c8d8bef860 in https://yhetil.org/guix/20210802093627.17908-1-mjbecze@riseup.net/

applying [1/1] https://yhetil.org/guix/20210802093627.17908-1-mjbecze@riseup.net/
diff --git a/gnu/packages/patches/texlive-poppler-0.84.patch b/gnu/packages/patches/texlive-poppler-0.84.patch
new file mode 100644
index 0000000000..c8d8bef860

1:37: trailing whitespace.
 
1:39: trailing whitespace.
 
1:47: trailing whitespace.
-- 
Checking patch gnu/packages/patches/texlive-poppler-0.84.patch...
1:49: new blank line at EOF.
+
Applied patch gnu/packages/patches/texlive-poppler-0.84.patch cleanly.
warning: 4 lines add whitespace errors.

index at:
100644 c8d8bef860553d2ca8de375d98c9ad0ee9fa5798	gnu/packages/patches/texlive-poppler-0.84.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.