commit fc7e4c926755f47edcda488eaea0c7fb82ff5af9 · pyrox.dev/nixpkgs

pkgs/tools/typesetting/tex/texlive/bin.nix

···

       68
       68
        
             done

     

       69
       69
        
             cp -pv ${pdftoepdf} texk/web2c/pdftexdir/pdftoepdf.cc

     

       70
       70
        
             cp -pv ${pdftosrc} texk/web2c/pdftexdir/pdftosrc.cc

     

       71
       71
       +
       

     

       72
       72
       +
             # poppler 0.84 compat fixups, use 0.83 files otherwise

     

       73
       73
       +
             patch -p1 -i ${./poppler84.patch}

     

       71
       74
        
           '';

     

       72
       75
        
       

     

       73
       76
        
           # remove when removing synctex-missing-header.patch

+43

pkgs/tools/typesetting/tex/texlive/poppler84.patch

···

       1
       1
       +
       From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Mikle Kolyada <zlogene@gentoo.org>

     

       3
       3
       +
       Date: Tue, 31 Dec 2019 11:29:30 +0300

     

       4
       4
       +
       Subject: [PATCH] poppler-0.84 compat

     

       5
       5
       +
       

     

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

     

       7
       7
       +
       

     

       8
       8
       +
       Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>

     

       9
       9
       +
       ---

     

       10
       10
       +
        texk/web2c/pdftexdir/utils.c    | 1 -

     

       11
       11
       +
        texk/web2c/xetexdir/XeTeX_ext.c | 3 +++

     

       12
       12
       +
        2 files changed, 3 insertions(+), 1 deletion(-)

     

       13
       13
       +
       

     

       14
       14
       +
       diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c

     

       15
       15
       +
       index c93a8781..6f866e76 100644

     

       16
       16
       +
       --- a/texk/web2c/pdftexdir/utils.c

     

       17
       17
       +
       +++ b/texk/web2c/pdftexdir/utils.c

     

       18
       18
       +
       @@ -33,7 +33,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.

     

       19
       19
       +
        #include "ptexlib.h"

     

       20
       20
       +
        #include <png.h>

     

       21
       21
       +
        #ifdef POPPLER_VERSION

     

       22
       22
       +
       -#include <poppler-config.h>

     

       23
       23
       +
        #define xpdfVersion POPPLER_VERSION

     

       24
       24
       +
        #define xpdfString "poppler"

     

       25
       25
       +
        #else

     

       26
       26
       +
       diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c

     

       27
       27
       +
       index 4968ee41..0aee4ee3 100644

     

       28
       28
       +
       --- a/texk/web2c/xetexdir/XeTeX_ext.c

     

       29
       29
       +
       +++ b/texk/web2c/xetexdir/XeTeX_ext.c

     

       30
       30
       +
       @@ -38,7 +38,10 @@ authorization from the copyright holders.

     

       31
       31
       +
        

     

       32
       32
       +
        #include <w2c/config.h>

     

       33
       33
       +
        

     

       34
       34
       +
       +#ifndef POPPLER_VERSION

     

       35
       35
       +
        #include <poppler-config.h>

     

       36
       36
       +
       +#endif

     

       37
       37
       +
       +

     

       38
       38
       +
        #include <png.h>

     

       39
       39
       +
        #include <zlib.h>

     

       40
       40
       +
        #include <graphite2/Font.h>

     

       41
       41
       +
       -- 

     

       42
       42
       +
       2.24.1

     

       43
       43
       +