Merge branch 'master' into core-updates
[jackhill/guix/guix.git] / gnu / packages / patches / texlive-bin-poppler-0.83.patch
1 Fix build with Poppler 0.83 and later.
2
3 Taken from Arch Linux, but adjusted to patch the versioned Poppler
4 files, as upstream applies it after copying them in place.
5 https://git.archlinux.org/svntogit/packages.git/tree/trunk/texlive-poppler-0.83.patch?h=packages/texlive-bin
6
7 diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc texlive-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc
8 --- texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc
9 +++ texlive-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc
10 @@ -723,7 +723,7 @@
11 #endif
12 // initialize
13 if (!isInit) {
14 - globalParams = new GlobalParams();
15 + globalParams.reset(new GlobalParams());
16 globalParams->setErrQuiet(false);
17 isInit = true;
18 }
19 @@ -1108,6 +1108,5 @@
20 delete_document(p);
21 }
22 // see above for globalParams
23 - delete globalParams;
24 }
25 }
26 diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc texlive-source/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc
27 --- texlive-source-orig/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc
28 +++ texlive-source/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc
29 @@ -79,7 +79,7 @@
30 exit(1);
31 }
32 fileName = new GString(argv[1]);
33 - globalParams = new GlobalParams();
34 + globalParams.reset(new GlobalParams());
35 doc = new PDFDoc(fileName);
36 if (!doc->isOk()) {
37 fprintf(stderr, "Invalid PDF file\n");
38 @@ -100,7 +100,7 @@
39 if (objnum == 0) {
40 srcStream = catalogDict.dictLookup("SourceObject");
41 static char const_SourceFile[] = "SourceFile";
42 - if (!srcStream.isStream(const_SourceFile)) {
43 + if (!srcStream.isDict(const_SourceFile)) {
44 fprintf(stderr, "No SourceObject found\n");
45 exit(1);
46 }
47 @@ -202,5 +202,4 @@
48 fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
49 fclose(outfile);
50 delete doc;
51 - delete globalParams;
52 }