rpm/texlive
SHA256
1
0
Fork 0
forked from pool/texlive
Code Pull Requests Activity

Update to TeXLive 2021

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=385
This commit is contained in:
Dr. Werner Fink 2021-04-09 18:35:30 +00:00 committed by Git OBS Bridge
parent ffaa4aebd2
commit 3db50925f7
24 changed files with 593 additions and 2735 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
View File

@ -54,7 +54,7 @@ diff --git a/src/Makefile b/src/Makefile
index 6b73a89..cc50bae 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
@@ -450,7 +450,16 @@ ifeq (ppc,$(TARGET_LJARCH))
DASM_AFLAGS+= -D GPR64
endif
ifeq (PS3,$(TARGET_SYS))
@ -113,7 +113,7 @@ diff --git a/src/lj_arch.h b/src/lj_arch.h
index d609b37..53bc651 100644
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -269,10 +269,18 @@
@@ -267,10 +267,18 @@
#if LJ_TARGET_CONSOLE
#define LJ_ARCH_PPC32ON64 1
#define LJ_ARCH_NOFFI 1
@ -134,7 +134,7 @@ index d609b37..53bc651 100644
#endif
#if _ARCH_PWR7
@@ -423,12 +431,6 @@
@@ -421,12 +429,6 @@
#if defined(_SOFT_FLOAT) || defined(_SOFT_DOUBLE)
#error "No support for PowerPC CPUs without double-precision FPU"
#endif

3
biber-2.14.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28e0a2780511c906f9c4554b2226acb50840c93cf73e579e1f2d05ea9e4c6736
size 994392

3
biber-2.16.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c48a2ba2a87534ad8894426b4e883d63bac8548907f1739a1212d3c13106aca
size 1000132

8
biber-certs.dif
View File

@ -4,7 +4,7 @@
2 files changed, 2 insertions(+), 1 deletion(-)
--- Build.PL
+++ Build.PL 2020-03-20 11:01:12.391105105 +0100
+++ Build.PL 2021-04-07 10:33:36.151418110 +0000
@@ -55,7 +55,6 @@ my $builder = $class->new(
'List::AllUtils' => 0,
'List::MoreUtils' => 0,
@ -12,10 +12,10 @@
- 'Mozilla::CA' => '20160104',
'Regexp::Common' => 0,
'Log::Log4perl' => 0,
'Unicode::Collate' => '1.27',
'Unicode::Collate' => '1.29',
--- bin/biber
+++ bin/biber 2018-04-12 12:06:39.913188617 +0000
@@ -123,6 +123,8 @@ GetOptions(
+++ bin/biber 2021-04-07 10:32:14.806230488 +0000
@@ -130,6 +130,8 @@ GetOptions(
) or pod2usage(-verbose => 0,
-exitval => EXIT_ERROR);

2
source-64.dif
View File

@ -5,7 +5,7 @@
--- configure
+++ configure 2018-04-10 08:58:00.463820598 +0000
@@ -20747,6 +20747,10 @@ fi
@@ -20711,6 +20711,10 @@ fi
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.

4
source-configure.dif
View File

@ -35,8 +35,8 @@
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([dvipdfm-x (TeX Live)], [20200315], [dvipdfmx@tug.org])
+AC_INIT([dvipdfm (TeX Live)], [20200315], [dvipdfmx@tug.org])
-AC_INIT([dvipdfm-x (TeX Live)], [20210318], [dvipdfmx@tug.org])
+AC_INIT([dvipdfm (TeX Live)], [20210318], [dvipdfmx@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([agl.c])
AC_CONFIG_AUX_DIR([../../build-aux])

76
source-dviutils.dif
View File

@ -2,10 +2,10 @@
m4/kpse-kpathsea-flags.m4 | 2 +-
texk/seetexk/a4toa5 | 26 ++++++++++++++++++++++++++
texk/seetexk/configure | 2 +-
texk/seetexk/dvibook.c | 6 +++---
texk/seetexk/dvibook.c | 7 +++----
texk/seetexk/dviconcat.c | 6 ++----
texk/seetexk/dviselect.c | 8 +++-----
texk/seetexk/dvitodvi.c | 40 ++++++++++++++++++++++++++++++++--------
texk/seetexk/dvitodvi.c | 41 ++++++++++++++++++++++++++++++++---------
texk/seetexk/error.c | 14 +++++---------
texk/seetexk/gripes.h | 21 +++++++++++----------
texk/seetexk/gripes0.c | 12 +++++-------
@ -16,10 +16,10 @@
texk/seetexk/seek.c | 11 +++++------
texk/seetexk/tempfile.c | 5 ++---
texk/seetexk/types.h | 2 +-
17 files changed, 141 insertions(+), 70 deletions(-)
17 files changed, 141 insertions(+), 72 deletions(-)
--- m4/kpse-kpathsea-flags.m4
+++ m4/kpse-kpathsea-flags.m4 2018-04-10 08:25:10.644838384 +0000
+++ m4/kpse-kpathsea-flags.m4 2021-04-07 09:56:20.318745619 +0000
@@ -16,7 +16,7 @@
AC_DEFUN([KPSE_KPATHSEA_FLAGS], [dnl
AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
@ -30,7 +30,7 @@
[${top_builddir}/../kpathsea/paths.h])
m4_if(m4_index([ $1 ], [ no-debug ]), [-1],
--- texk/seetexk/a4toa5
+++ texk/seetexk/a4toa5 2018-04-10 08:25:10.644838384 +0000
+++ texk/seetexk/a4toa5 2021-04-07 09:56:20.322745677 +0000
@@ -0,0 +1,26 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -59,7 +59,7 @@
+#
+exec dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(190mm,-10mm)' $1 $2
--- texk/seetexk/configure
+++ texk/seetexk/configure 2018-04-10 08:25:10.644838384 +0000
+++ texk/seetexk/configure 2021-04-07 09:56:20.322745677 +0000
@@ -14943,7 +14943,7 @@ elif test "x$need_kpathsea:$with_system_
as_fn_error $? "did not find kpathsea" "$LINENO" 5
fi
@ -70,7 +70,7 @@
KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la'
KPATHSEA_RULE='# Rebuild libkpathsea
--- texk/seetexk/dvibook.c
+++ texk/seetexk/dvibook.c 2018-04-10 08:25:10.644838384 +0000
+++ texk/seetexk/dvibook.c 2021-04-07 09:59:15.141300494 +0000
@@ -46,6 +46,7 @@ extern char *optarg;
extern int optind;
#endif
@ -87,19 +87,20 @@
+#include <unistd.h>
#include <ctype.h>
#include "seek.h"
@@ -129,9 +132,6 @@ i32 Count[10]; /* the 10 \count variabl
#include "common.h"
@@ -123,10 +126,6 @@ i32 Count[10]; /* the 10 \count variabl
/* save some string space: we use this a lot */
char writeerr[] = "error writing DVI file";
-#ifndef KPATHSEA
-char *malloc(), *realloc();
-void *malloc(), *realloc();
-void free();
-#endif
/*
* You may get lint warnings about sprintf's return value.
* Older versions of 4BSD have `char *sprintf()'. ANSI and
--- texk/seetexk/dviconcat.c
+++ texk/seetexk/dviconcat.c 2018-04-10 08:25:10.644838384 +0000
+++ texk/seetexk/dviconcat.c 2021-04-07 09:56:20.322745677 +0000
@@ -43,6 +43,8 @@ extern char *optarg;
extern int optind;
#endif
@ -109,7 +110,7 @@
#include "types.h"
#include "dviclass.h"
#include "dvicodes.h"
@@ -114,10 +116,6 @@ char writeerr[] = "error writing DVI fil
@@ -110,10 +112,6 @@ char writeerr[] = "error writing DVI fil
static void HandleDVIFile(void);
@ -121,7 +122,7 @@
/*
--- texk/seetexk/dviselect.c
+++ texk/seetexk/dviselect.c 2018-04-10 08:49:25.661500063 +0000
+++ texk/seetexk/dviselect.c 2021-04-07 09:59:54.141870365 +0000
@@ -57,6 +57,8 @@ extern int optind;
#include "gripes.h"
#include "search.h"
@ -129,9 +130,9 @@
+#include <stdlib.h>
+#include <string.h>
#include <ctype.h>
#include "common.h"
#if defined(WIN32) && defined(KPATHSEA)
@@ -177,10 +179,6 @@ static void HandleDVIFile(void);
@@ -173,10 +175,6 @@ static void HandleDVIFile(void);
static void PutFontSelector(i32);
static void WritePreAmble(void);
@ -152,7 +153,7 @@
pl = (struct pagelist *)malloc(sizeof *pl);
if (pl == NULL)
--- texk/seetexk/dvitodvi.c
+++ texk/seetexk/dvitodvi.c 2018-04-10 08:49:00.045981786 +0000
+++ texk/seetexk/dvitodvi.c 2021-04-07 10:02:34.816217795 +0000
@@ -46,6 +46,7 @@ extern char *optarg;
extern int optind;
#endif
@ -169,8 +170,8 @@
+#include <unistd.h>
#include <ctype.h>
#include "seek.h"
@@ -95,6 +98,7 @@ struct fontinfo {
#include "common.h"
@@ -89,6 +92,7 @@ struct fontinfo {
i32 Width; /* width of page */
i32 Height; /* height of page */
i32 Magnification; /* Magnification of pages */
@ -178,17 +179,18 @@
int Modulo; /* page spec modulo */
struct pagespec *PageSpecs; /* page specification list */
@@ -134,9 +138,6 @@ i32 Count[10]; /* the 10 \count variabl
@@ -128,10 +132,6 @@ i32 Count[10]; /* the 10 \count variabl
/* save some string space: we use this a lot */
char writeerr[] = "error writing DVI file";
-#ifndef KPATHSEA
-char *malloc(), *realloc();
-void *malloc(), *realloc();
-void free();
-#endif
static void WriteFont(struct fontinfo *fi);
static void PutFontSelector(i32 index);
@@ -197,6 +198,15 @@ scale(i32 whole, int num, int den, i32 s
@@ -192,6 +192,15 @@ scale(i32 whole, int num, int den, i32 s
return (v) ;
}
@ -204,7 +206,7 @@
struct pagespec {
int reversed, pageno, add;
i32 xoff, yoff;
@@ -304,6 +314,8 @@ parsedimen(char **sp)
@@ -299,6 +308,8 @@ parsedimen(char **sp)
fac = Height;
s++;
}
@ -213,7 +215,7 @@
whole = scale(whole, num, den, fac) ;
*sp = s;
return (neg ? -whole : whole);
@@ -506,9 +518,15 @@ HandlePostAmble(void)
@@ -501,9 +512,15 @@ HandlePostAmble(void)
PutLong(outf, Denominator);
PutLong(outf, DVIMag);
c = GetLong(inf);
@ -231,7 +233,7 @@
c = GetWord(inf)+1;
PutWord(outf, c); /* DVI stack size */
PutWord(outf, NumberOfOutputPages);
@@ -606,7 +624,8 @@ HandlePreAmble(void)
@@ -601,7 +618,8 @@ HandlePreAmble(void)
DVIFileName, DVI_VERSION);
Numerator = GetLong(inf);
Denominator = GetLong(inf);
@ -241,7 +243,7 @@
putbyte(outf, DVI_PRE);
putbyte(outf, DVI_VERSION);
PutLong(outf, Numerator);
@@ -644,6 +663,7 @@ main(int argc, char **argv)
@@ -639,6 +657,7 @@ main(int argc, char **argv)
Width = 0;
Height = 0;
Magnification = 1000;
@ -249,7 +251,7 @@
Modulo = 1;
ProgName = *argv;
@@ -745,12 +765,16 @@ Usage: %s [-q] [-i infile] [-o outfile]
@@ -750,12 +769,16 @@ Usage: %s [-q] [-i infile] [-o outfile]
if (fseek(inf, 16L, 1) == -1)
error(1, -1, "can't seek postamble");
if (Height == 0) /* get height from postamble */
@ -267,9 +269,9 @@
+ Width = myscale(Width,MyMag,1000);
HandleDVIFile();
if (WritingPage)
free(StartOfPage);
--- texk/seetexk/error.c
+++ texk/seetexk/error.c 2018-04-10 08:25:10.644838384 +0000
+++ texk/seetexk/error.c 2021-04-07 09:56:20.326745736 +0000
@@ -29,7 +29,12 @@
#include <config.h>
#endif
@ -305,7 +307,7 @@
static char *
strerror (int errnum)
--- texk/seetexk/gripes.h
+++ texk/seetexk/gripes.h 2018-04-10 08:25:10.644838384 +0000
+++ texk/seetexk/gripes.h 2021-04-07 09:56:20.326745736 +0000
@@ -28,16 +28,17 @@ extern const char *DVIFileName;
* Declarations for the various gripes.
*/
@ -335,7 +337,7 @@
+void GripeUndefinedOp(int n) __NR__;
void GripeBadGlyph(i32 c, struct font *f);
--- texk/seetexk/gripes0.c
+++ texk/seetexk/gripes0.c 2018-04-10 08:25:10.644838384 +0000
+++ texk/seetexk/gripes0.c 2021-04-07 09:56:20.326745736 +0000
@@ -28,10 +28,8 @@
#include "error.h"
#include "gripes.h"
@ -375,7 +377,7 @@
+ exit(0); /* NOTREACHED */
}
--- texk/seetexk/gripes1.c
+++ texk/seetexk/gripes1.c 2018-04-10 08:25:10.644838384 +0000
+++ texk/seetexk/gripes1.c 2021-04-07 09:56:20.326745736 +0000
@@ -29,6 +29,7 @@
#include "font.h"
#include "gripes.h"
@ -457,7 +459,7 @@
/*
--- texk/seetexk/mydvichk
+++ texk/seetexk/mydvichk 2018-04-10 08:25:10.648838309 +0000
+++ texk/seetexk/mydvichk 2021-04-07 09:56:20.326745736 +0000
@@ -0,0 +1,12 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -472,7 +474,7 @@
+
+exit(0)
--- texk/seetexk/odd2even
+++ texk/seetexk/odd2even 2018-04-10 08:25:10.648838309 +0000
+++ texk/seetexk/odd2even 2021-04-07 09:56:20.330745794 +0000
@@ -0,0 +1,22 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -497,7 +499,7 @@
+
+exit 0
--- texk/seetexk/search.c
+++ texk/seetexk/search.c 2018-04-10 08:25:10.648838309 +0000
+++ texk/seetexk/search.c 2021-04-07 09:56:20.330745794 +0000
@@ -34,6 +34,7 @@
* it runs in increasing-key-value sequence).
*/
@ -518,7 +520,7 @@
SCreate(unsigned int dsize)
{
--- texk/seetexk/seek.c
+++ texk/seetexk/seek.c 2018-04-10 08:25:10.648838309 +0000
+++ texk/seetexk/seek.c 2021-04-07 09:56:20.330745794 +0000
@@ -43,6 +43,10 @@
#endif
@ -545,7 +547,7 @@
/*
* Make and return a version of `f' on which fseek works (unconditionally).
--- texk/seetexk/tempfile.c
+++ texk/seetexk/tempfile.c 2018-04-10 08:25:10.648838309 +0000
+++ texk/seetexk/tempfile.c 2021-04-07 09:56:20.330745794 +0000
@@ -25,6 +25,7 @@
#endif
@ -566,7 +568,7 @@
#include "tempfile.h"
--- texk/seetexk/types.h
+++ texk/seetexk/types.h 2018-04-10 08:25:10.648838309 +0000
+++ texk/seetexk/types.h 2021-04-07 09:56:20.330745794 +0000
@@ -58,7 +58,7 @@
*
* (The bcopy provided in lib/bcopy.c does handle overlap.)

97
source-fix-bool-poppler.patch
View File

@ -1,97 +0,0 @@
From 497c0e42d91d78837ddca8906bf7246c93654d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sat, 22 Dec 2018 00:25:44 +0100
Subject: [PATCH] Use bool instead of GBool
---
texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc | 6 +++---
texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc | 6 +++---
texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc | 6 +++---
texk/web2c/pdftexdir/pdftosrc.cc | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc 2019-05-13 08:46:30.531477531 +0000
@@ -120,7 +120,7 @@ struct UsedEncoding {
static InObj *inObjList;
static UsedEncoding *encodingList;
-static GBool isInit = gFalse;
+static bool isInit = false;
// --------------------------------------------------------------------
// Maintain list of open embedded PDF files
@@ -724,8 +724,8 @@ read_pdf_info(char *image_name, char *pa
// initialize
if (!isInit) {
globalParams = new GlobalParams();
- globalParams->setErrQuiet(gFalse);
- isInit = gTrue;
+ globalParams->setErrQuiet(false);
+ isInit = true;
}
// open PDF file
pdf_doc = find_add_document(image_name);
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc 2019-05-13 08:46:38.347329153 +0000
@@ -120,7 +120,7 @@ struct UsedEncoding {
static InObj *inObjList;
static UsedEncoding *encodingList;
-static GBool isInit = gFalse;
+static bool isInit = false;
// --------------------------------------------------------------------
// Maintain list of open embedded PDF files
@@ -724,8 +724,8 @@ read_pdf_info(char *image_name, char *pa
// initialize
if (!isInit) {
globalParams = new GlobalParams();
- globalParams->setErrQuiet(gFalse);
- isInit = gTrue;
+ globalParams->setErrQuiet(false);
+ isInit = true;
}
// open PDF file
pdf_doc = find_add_document(image_name);
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc 2019-05-13 08:46:45.075201428 +0000
@@ -120,7 +120,7 @@ struct UsedEncoding {
static InObj *inObjList;
static UsedEncoding *encodingList;
-static GBool isInit = gFalse;
+static bool isInit = false;
// --------------------------------------------------------------------
// Maintain list of open embedded PDF files
@@ -724,8 +724,8 @@ read_pdf_info(char *image_name, char *pa
// initialize
if (!isInit) {
globalParams = new GlobalParams();
- globalParams->setErrQuiet(gFalse);
- isInit = gTrue;
+ globalParams->setErrQuiet(false);
+ isInit = true;
}
// open PDF file
pdf_doc = find_add_document(image_name);
diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
index 3b1d250..7dbee00 100644
--- a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
+++ b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
@@ -174,9 +174,9 @@ int main(int argc, char *argv[])
// parse the header: object numbers and offsets
objStr.streamReset();
- str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first);
+ str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
lexer = new Lexer(xref, str);
- parser = new Parser(xref, lexer, gFalse);
+ parser = new Parser(xref, lexer, false);
for (n = 0; n < nObjects; ++n) {
obj1 = parser->getObj();
obj2 = parser->getObj();
--
2.19.2

685
source-fix-const-poppler0.66.0.patch
View File

@ -1,685 +0,0 @@
---
texk/web2c/pdftexdir/epdf.c | 2 -
texk/web2c/pdftexdir/mapfile.c | 2 -
texk/web2c/pdftexdir/pdftex-common.h | 6 ++---
texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc | 28 ++++++++++++------------
texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc | 28 ++++++++++++------------
texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc | 22 +++++++++---------
texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc | 22 +++++++++---------
texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc | 22 +++++++++---------
texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc | 22 +++++++++---------
texk/web2c/pdftexdir/pdftosrc-newpoppler.cc | 2 -
texk/web2c/pdftexdir/writeenc.c | 2 -
11 files changed, 79 insertions(+), 79 deletions(-)
Index: texk/web2c/pdftexdir/pdftosrc.cc
===================================================================
--- texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
+++ texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
Stream *s;
Object srcStream, srcName, catalogDict;
FILE *outfile;
- char *outname;
+ const char *outname = NULL;
int objnum = 0, objgen = 0;
bool extract_xref_table = false;
int c;
--- texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc
+++ texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc 2019-05-13 08:37:11.562085046 +0000
@@ -275,7 +275,7 @@ static int getNewObjectNumber(Ref ref)
static void copyObject(Object *);
-static void copyName(char *s)
+static void copyName(const char *s)
{
pdf_puts("/");
for (; *s != 0; s++) {
@@ -287,7 +287,7 @@ static void copyName(char *s)
}
}
-static void copyDictEntry(Object * obj, int i)
+static void copyDictEntry(const Object * obj, int i)
{
Object obj1;
copyName((char *)obj->dictGetKey(i));
@@ -297,7 +297,7 @@ static void copyDictEntry(Object * obj,
pdf_puts("\n");
}
-static void copyDict(Object * obj)
+static void copyDict(const Object * obj)
{
int i, l;
if (!obj->isDict())
@@ -307,10 +307,10 @@ static void copyDict(Object * obj)
copyDictEntry(obj, i);
}
-static void copyFontDict(Object * obj, InObj * r)
+static void copyFontDict(const Object * obj, InObj * r)
{
int i, l;
- char *key;
+ const char *key;
if (!obj->isDict())
pdftex_fail("PDF inclusion: invalid dict type <%s>",
obj->getTypeName());
@@ -382,7 +382,7 @@ static bool embeddableFont(Object * font
return false;
}
-static void copyFont(char *tag, Object * fontRef)
+static void copyFont(const char *tag, Object * fontRef)
{
Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
stemV;
@@ -467,7 +467,7 @@ static void copyFontResources(Object * o
pdf_puts(">>\n");
}
-static void copyOtherResources(Object * obj, char *key)
+static void copyOtherResources(Object * obj, const char *key)
{
// copies all other resources (write_epdf handles Fonts and ProcSets),
@@ -554,8 +554,8 @@ static void copyObject(Object * obj)
Object obj1;
int i, l, c;
Ref ref;
- char *p;
- GString *s;
+ const char *p;
+ const GString *s;
if (obj->isBool()) {
pdf_printf("%s", obj->getBool()? "true" : "false");
} else if (obj->isInt()) {
@@ -655,7 +655,7 @@ static void writeRefs()
static void writeEncodings()
{
UsedEncoding *r, *n;
- char *glyphNames[256], *s;
+ const char *glyphNames[256], *s;
int i;
for (r = encodingList; r != 0; r = r->next) {
for (i = 0; i < 256; i++) {
@@ -683,7 +683,7 @@ static void writeEncodings()
}
// get the pagebox according to the pagebox_spec
-static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
+static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
{
if (pagebox_spec == pdfboxspecmedia)
return page->getMediaBox();
@@ -715,7 +715,7 @@ read_pdf_info(char *image_name, char *pa
{
PdfDocument *pdf_doc;
Page *page;
- PDFRectangle *pagebox;
+ const PDFRectangle *pagebox;
#ifdef POPPLER_VERSION
int pdf_major_version_found, pdf_minor_version_found;
#else
@@ -822,7 +822,7 @@ void write_epdf(void)
Object groupDict;
bool writeSepGroup = false;
Object info;
- char *key;
+ const char *key;
char s[256];
int i, l;
int rotate;
@@ -849,7 +849,7 @@ void write_epdf(void)
pageObj = xref->fetch(pageRef->num, pageRef->gen);
pageDict = pageObj.getDict();
rotate = page->getRotate();
- PDFRectangle *pagebox;
+ const PDFRectangle *pagebox;
// write the Page header
pdf_puts("/Type /XObject\n");
pdf_puts("/Subtype /Form\n");
--- texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc
+++ texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc 2019-05-13 08:37:19.877927300 +0000
@@ -275,7 +275,7 @@ static int getNewObjectNumber(Ref ref)
static void copyObject(Object *);
-static void copyName(char *s)
+static void copyName(const char *s)
{
pdf_puts("/");
for (; *s != 0; s++) {
@@ -287,7 +287,7 @@ static void copyName(char *s)
}
}
-static void copyDictEntry(Object * obj, int i)
+static void copyDictEntry(const Object * obj, int i)
{
Object obj1;
copyName((char *)obj->dictGetKey(i));
@@ -297,7 +297,7 @@ static void copyDictEntry(Object * obj,
pdf_puts("\n");
}
-static void copyDict(Object * obj)
+static void copyDict(const Object * obj)
{
int i, l;
if (!obj->isDict())
@@ -307,10 +307,10 @@ static void copyDict(Object * obj)
copyDictEntry(obj, i);
}
-static void copyFontDict(Object * obj, InObj * r)
+static void copyFontDict(const Object * obj, InObj * r)
{
int i, l;
- char *key;
+ const char *key;
if (!obj->isDict())
pdftex_fail("PDF inclusion: invalid dict type <%s>",
obj->getTypeName());
@@ -382,7 +382,7 @@ static bool embeddableFont(Object * font
return false;
}
-static void copyFont(char *tag, Object * fontRef)
+static void copyFont(const char *tag, Object * fontRef)
{
Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
stemV;
@@ -467,7 +467,7 @@ static void copyFontResources(Object * o
pdf_puts(">>\n");
}
-static void copyOtherResources(Object * obj, char *key)
+static void copyOtherResources(Object * obj, const char *key)
{
// copies all other resources (write_epdf handles Fonts and ProcSets),
@@ -554,8 +554,8 @@ static void copyObject(Object * obj)
Object obj1;
int i, l, c;
Ref ref;
- char *p;
- GString *s;
+ const char *p;
+ const GString *s;
if (obj->isBool()) {
pdf_printf("%s", obj->getBool()? "true" : "false");
} else if (obj->isInt()) {
@@ -655,7 +655,7 @@ static void writeRefs()
static void writeEncodings()
{
UsedEncoding *r, *n;
- char *glyphNames[256], *s;
+ const char *glyphNames[256], *s;
int i;
for (r = encodingList; r != 0; r = r->next) {
for (i = 0; i < 256; i++) {
@@ -683,7 +683,7 @@ static void writeEncodings()
}
// get the pagebox according to the pagebox_spec
-static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
+static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
{
if (pagebox_spec == pdfboxspecmedia)
return page->getMediaBox();
@@ -715,7 +715,7 @@ read_pdf_info(char *image_name, char *pa
{
PdfDocument *pdf_doc;
Page *page;
- PDFRectangle *pagebox;
+ const PDFRectangle *pagebox;
#ifdef POPPLER_VERSION
int pdf_major_version_found, pdf_minor_version_found;
#else
@@ -822,7 +822,7 @@ void write_epdf(void)
Object groupDict;
bool writeSepGroup = false;
Object info;
- char *key;
+ const char *key;
char s[256];
int i, l;
int rotate;
@@ -849,7 +849,7 @@ void write_epdf(void)
pageObj = xref->fetch(pageRef->num, pageRef->gen);
pageDict = pageObj.getDict();
rotate = page->getRotate();
- PDFRectangle *pagebox;
+ const PDFRectangle *pagebox;
// write the Page header
pdf_puts("/Type /XObject\n");
pdf_puts("/Subtype /Form\n");
--- texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc
+++ texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc 2019-05-13 08:37:25.761815685 +0000
@@ -275,7 +275,7 @@ static int getNewObjectNumber(Ref ref)
static void copyObject(Object *);
-static void copyName(char *s)
+static void copyName(const char *s)
{
pdf_puts("/");
for (; *s != 0; s++) {
@@ -287,7 +287,7 @@ static void copyName(char *s)
}
}
-static void copyDictEntry(Object * obj, int i)
+static void copyDictEntry(const Object * obj, int i)
{
Object obj1;
copyName((char *)obj->dictGetKey(i));
@@ -297,7 +297,7 @@ static void copyDictEntry(Object * obj,
pdf_puts("\n");
}
-static void copyDict(Object * obj)
+static void copyDict(const Object * obj)
{
int i, l;
if (!obj->isDict())
@@ -307,10 +307,10 @@ static void copyDict(Object * obj)
copyDictEntry(obj, i);
}
-static void copyFontDict(Object * obj, InObj * r)
+static void copyFontDict(const Object * obj, InObj * r)
{
int i, l;
- char *key;
+ const char *key;
if (!obj->isDict())
pdftex_fail("PDF inclusion: invalid dict type <%s>",
obj->getTypeName());
@@ -382,7 +382,7 @@ static bool embeddableFont(Object * font
return false;
}
-static void copyFont(char *tag, Object * fontRef)
+static void copyFont(const char *tag, Object * fontRef)
{
Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
stemV;
@@ -467,7 +467,7 @@ static void copyFontResources(Object * o
pdf_puts(">>\n");
}
-static void copyOtherResources(Object * obj, char *key)
+static void copyOtherResources(Object * obj, const char *key)
{
// copies all other resources (write_epdf handles Fonts and ProcSets),
@@ -554,8 +554,8 @@ static void copyObject(Object * obj)
Object obj1;
int i, l, c;
Ref ref;
- char *p;
- GString *s;
+ const char *p;
+ const GString *s;
if (obj->isBool()) {
pdf_printf("%s", obj->getBool()? "true" : "false");
} else if (obj->isInt()) {
@@ -655,7 +655,7 @@ static void writeRefs()
static void writeEncodings()
{
UsedEncoding *r, *n;
- char *glyphNames[256], *s;
+ const char *glyphNames[256], *s;
int i;
for (r = encodingList; r != 0; r = r->next) {
for (i = 0; i < 256; i++) {
@@ -822,7 +822,7 @@ void write_epdf(void)
Object groupDict;
bool writeSepGroup = false;
Object info;
- char *key;
+ const char *key;
char s[256];
int i, l;
int rotate;
--- texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc
+++ texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc 2019-05-13 08:38:42.464360579 +0000
@@ -275,7 +275,7 @@ static int getNewObjectNumber(Ref ref)
static void copyObject(Object *);
-static void copyName(char *s)
+static void copyName(const char *s)
{
pdf_puts("/");
for (; *s != 0; s++) {
@@ -287,7 +287,7 @@ static void copyName(char *s)
}
}
-static void copyDictEntry(Object * obj, int i)
+static void copyDictEntry(const Object * obj, int i)
{
Object obj1;
copyName((char *)obj->dictGetKey(i));
@@ -297,7 +297,7 @@ static void copyDictEntry(Object * obj,
pdf_puts("\n");
}
-static void copyDict(Object * obj)
+static void copyDict(const Object * obj)
{
int i, l;
if (!obj->isDict())
@@ -307,10 +307,10 @@ static void copyDict(Object * obj)
copyDictEntry(obj, i);
}
-static void copyFontDict(Object * obj, InObj * r)
+static void copyFontDict(const Object * obj, InObj * r)
{
int i, l;
- char *key;
+ const char *key;
if (!obj->isDict())
pdftex_fail("PDF inclusion: invalid dict type <%s>",
obj->getTypeName());
@@ -382,7 +382,7 @@ static bool embeddableFont(Object * font
return false;
}
-static void copyFont(char *tag, Object * fontRef)
+static void copyFont(const char *tag, Object * fontRef)
{
Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
stemV;
@@ -467,7 +467,7 @@ static void copyFontResources(Object * o
pdf_puts(">>\n");
}
-static void copyOtherResources(Object * obj, char *key)
+static void copyOtherResources(Object * obj, const char *key)
{
// copies all other resources (write_epdf handles Fonts and ProcSets),
@@ -554,8 +554,8 @@ static void copyObject(Object * obj)
Object obj1;
int i, l, c;
Ref ref;
- char *p;
- GString *s;
+ const char *p;
+ const GString *s;
if (obj->isBool()) {
pdf_printf("%s", obj->getBool()? "true" : "false");
} else if (obj->isInt()) {
@@ -655,7 +655,7 @@ static void writeRefs()
static void writeEncodings()
{
UsedEncoding *r, *n;
- char *glyphNames[256], *s;
+ const char *glyphNames[256], *s;
int i;
for (r = encodingList; r != 0; r = r->next) {
for (i = 0; i < 256; i++) {
@@ -822,7 +822,7 @@ void write_epdf(void)
Object groupDict;
bool writeSepGroup = false;
Object info;
- char *key;
+ const char *key;
char s[256];
int i, l;
int rotate;
--- texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
+++ texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc 2019-05-13 08:38:55.432114555 +0000
@@ -276,7 +276,7 @@ static int getNewObjectNumber(Ref ref)
static void copyObject(Object *);
-static void copyName(char *s)
+static void copyName(const char *s)
{
pdf_puts("/");
for (; *s != 0; s++) {
@@ -288,7 +288,7 @@ static void copyName(char *s)
}
}
-static void copyDictEntry(Object * obj, int i)
+static void copyDictEntry(const Object * obj, int i)
{
Object obj1;
copyName((char *)obj->dictGetKey(i));
@@ -298,7 +298,7 @@ static void copyDictEntry(Object * obj,
pdf_puts("\n");
}
-static void copyDict(Object * obj)
+static void copyDict(const Object * obj)
{
int i, l;
if (!obj->isDict())
@@ -308,10 +308,10 @@ static void copyDict(Object * obj)
copyDictEntry(obj, i);
}
-static void copyFontDict(Object * obj, InObj * r)
+static void copyFontDict(const Object * obj, InObj * r)
{
int i, l;
- char *key;
+ const char *key;
if (!obj->isDict())
pdftex_fail("PDF inclusion: invalid dict type <%s>",
obj->getTypeName());
@@ -383,7 +383,7 @@ static bool embeddableFont(Object * font
return false;
}
-static void copyFont(char *tag, Object * fontRef)
+static void copyFont(const char *tag, Object * fontRef)
{
Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
stemV;
@@ -468,7 +468,7 @@ static void copyFontResources(Object * o
pdf_puts(">>\n");
}
-static void copyOtherResources(Object * obj, char *key)
+static void copyOtherResources(Object * obj, const char *key)
{
// copies all other resources (write_epdf handles Fonts and ProcSets),
@@ -555,8 +555,8 @@ static void copyObject(Object * obj)
Object obj1;
int i, l, c;
Ref ref;
- char *p;
- GString *s;
+ const char *p;
+ const GString *s;
if (obj->isBool()) {
pdf_printf("%s", obj->getBool()? "true" : "false");
} else if (obj->isInt()) {
@@ -656,7 +656,7 @@ static void writeRefs()
static void writeEncodings()
{
UsedEncoding *r, *n;
- char *glyphNames[256], *s;
+ const char *glyphNames[256], *s;
int i;
for (r = encodingList; r != 0; r = r->next) {
for (i = 0; i < 256; i++) {
@@ -823,7 +823,7 @@ void write_epdf(void)
Object groupDict;
bool writeSepGroup = false;
Object info;
- char *key;
+ const char *key;
char s[256];
int i, l;
int rotate;
--- texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
+++ texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc 2019-05-13 08:39:36.183341391 +0000
@@ -275,7 +275,7 @@ static int getNewObjectNumber(Ref ref)
static void copyObject(Object *);
-static void copyName(char *s)
+static void copyName(const char *s)
{
pdf_puts("/");
for (; *s != 0; s++) {
@@ -287,7 +287,7 @@ static void copyName(char *s)
}
}
-static void copyDictEntry(Object * obj, int i)
+static void copyDictEntry(const Object * obj, int i)
{
Object obj1;
copyName((char *)obj->dictGetKey(i));
@@ -297,7 +297,7 @@ static void copyDictEntry(Object * obj,
pdf_puts("\n");
}
-static void copyDict(Object * obj)
+static void copyDict(const Object * obj)
{
int i, l;
if (!obj->isDict())
@@ -307,10 +307,10 @@ static void copyDict(Object * obj)
copyDictEntry(obj, i);
}
-static void copyFontDict(Object * obj, InObj * r)
+static void copyFontDict(const Object * obj, InObj * r)
{
int i, l;
- char *key;
+ const char *key;
if (!obj->isDict())
pdftex_fail("PDF inclusion: invalid dict type <%s>",
obj->getTypeName());
@@ -382,7 +382,7 @@ static bool embeddableFont(Object * font
return false;
}
-static void copyFont(char *tag, Object * fontRef)
+static void copyFont(const char *tag, Object * fontRef)
{
Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
stemV;
@@ -467,7 +467,7 @@ static void copyFontResources(Object * o
pdf_puts(">>\n");
}
-static void copyOtherResources(Object * obj, char *key)
+static void copyOtherResources(Object * obj, const char *key)
{
// copies all other resources (write_epdf handles Fonts and ProcSets),
@@ -554,8 +554,8 @@ static void copyObject(Object * obj)
Object obj1;
int i, l, c;
Ref ref;
- char *p;
- GString *s;
+ const char *p;
+ const GString *s;
if (obj->isBool()) {
pdf_printf("%s", obj->getBool()? "true" : "false");
} else if (obj->isInt()) {
@@ -655,7 +655,7 @@ static void writeRefs()
static void writeEncodings()
{
UsedEncoding *r, *n;
- char *glyphNames[256], *s;
+ const char *glyphNames[256], *s;
int i;
for (r = encodingList; r != 0; r = r->next) {
for (i = 0; i < 256; i++) {
@@ -822,7 +822,7 @@ void write_epdf(void)
Object groupDict;
bool writeSepGroup = false;
Object info;
- char *key;
+ const char *key;
char s[256];
int i, l;
int rotate;
Index: texk/web2c/pdftexdir/epdf.c
===================================================================
--- texk/web2c/pdftexdir/epdf.c
+++ texk/web2c/pdftexdir/epdf.c
@@ -73,7 +73,7 @@ int get_fn_objnum(fd_entry * fd)
#define Isgenericspace(c) (c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f')
-void epdf_mark_glyphs(fd_entry * fd, char *charset)
+void epdf_mark_glyphs(fd_entry * fd, const char *charset)
{
char *p, *q, *s;
char *glyph;
Index: texk/web2c/pdftexdir/mapfile.c
===================================================================
--- texk/web2c/pdftexdir/mapfile.c
+++ texk/web2c/pdftexdir/mapfile.c
@@ -682,7 +682,7 @@ static boolean fm_valid_for_font_replace
* used for Type1 font replacement when embedding of PDF files
*/
-fm_entry *lookup_fontmap(char *ps_name)
+fm_entry *lookup_fontmap(const char *ps_name)
{
fm_entry *fm, *fm2, tmp;
char *a, *b, *c, *d, *e, *s;
Index: texk/web2c/pdftexdir/pdftex-common.h
===================================================================
--- texk/web2c/pdftexdir/pdftex-common.h
+++ texk/web2c/pdftexdir/pdftex-common.h
@@ -67,7 +67,7 @@ extern void zpdfbeginobj(integer, intege
extern void embed_whole_font(fd_entry *);
extern fd_entry *epdf_create_fontdescriptor(fm_entry *, int);
extern void epdf_free(void);
-extern void epdf_mark_glyphs(fd_entry *, char *);
+extern void epdf_mark_glyphs(fd_entry *, const char *);
extern int get_fd_objnum(fd_entry *);
extern int get_fn_objnum(fd_entry *);
extern int is_subsetable(fm_entry *);
@@ -76,7 +76,7 @@ extern int is_subsetable(fm_entry *);
extern char notdef[];
/* mapfile.c */
-extern fm_entry *lookup_fontmap(char *);
+extern fm_entry *lookup_fontmap(const char *);
#undef fd_entry
#undef fm_entry
@@ -101,7 +101,7 @@ extern void tex_printf(const char *, ...);
extern void write_epdf(void);
/* writeenc.c */
-extern void epdf_write_enc(char **, int);
+extern void epdf_write_enc(const char **, int);
/* writeimg.c */
extern float epdf_width;
Index: texk/web2c/pdftexdir/writeenc.c
===================================================================
--- texk/web2c/pdftexdir/writeenc.c
+++ texk/web2c/pdftexdir/writeenc.c
@@ -83,7 +83,7 @@ fe_entry *get_fe_entry(char *s)
/**********************************************************************/
-void epdf_write_enc(char **glyph_names, int fe_objnum)
+void epdf_write_enc(const char **glyph_names, int fe_objnum)
{
int i, i_old;
assert(glyph_names != NULL);

26
source-overflow.dif
View File

@ -1,26 +0,0 @@
---
texk/upmendex/convert.c | 2 +-
utils/lacheck/lacheck.test | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
--- utils/lacheck/lacheck.test
+++ utils/lacheck/lacheck.test 2018-04-10 08:57:17.672625041 +0000
@@ -9,5 +9,6 @@
./lacheck $srcdir/test.tex | \
sed -e "s!$srcdir/test.tex!./test.tex!g" >test.out || exit 1
-diff $srcdir/test.old test.out || exit 1
+test -e $srcdir/test.old || > $srcdir/test.old
+diff $srcdir/test.old test.out || true
--- texk/upmendex/convert.c
+++ texk/upmendex/convert.c 2020-04-22 06:10:54.285427585 +0000
@@ -187,7 +187,7 @@ static int dcomp(const void *bf1, const
int convert(UChar *buff1, UChar *buff2)
{
int i=0,j=0,k;
- char errbuff[BUFFERLEN],errbuff2[BUFFERLEN];
+ char errbuff[BUFFERLEN+42],errbuff2[BUFFERLEN];
int wclen;
UChar buff3[3];

73
source-poppler-fix-dict-memleak.patch
View File

@ -1,73 +0,0 @@
From 599cc7afea4c418ff9eff1bd3b4b3d4f157162e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sat, 22 Dec 2018 03:00:04 +0100
Subject: [PATCH] Avoid leaking string copy
---
texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc | 2 +-
texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc | 2 +-
texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc | 2 +-
texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc | 2 +-
texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc
@@ -977,7 +977,7 @@ The changes below seem to work fine.
}
l = dic1.getLength();
for (i = 0; i < l; i++) {
- groupDict.dictAdd((const char *)copyString(dic1.getKey(i)),
+ groupDict.dictAdd((const char *)dic1.getKey(i),
dic1.getValNF(i));
}
// end modification
diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc
@@ -977,7 +977,7 @@ The changes below seem to work fine.
}
l = dic1.getLength();
for (i = 0; i < l; i++) {
- groupDict.dictAdd((const char *)copyString(dic1.getKey(i)),
+ groupDict.dictAdd((const char *)dic1.getKey(i),
dic1.getValNF(i));
}
// end modification
diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc
@@ -977,7 +977,7 @@ The changes below seem to work fine.
}
l = dic1.getLength();
for (i = 0; i < l; i++) {
- groupDict.dictAdd((const char *)copyString(dic1.getKey(i)),
+ groupDict.dictAdd((const char *)dic1.getKey(i),
dic1.getValNF(i));
}
// end modification
diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
@@ -978,7 +978,7 @@ The changes below seem to work fine.
}
l = dic1.getLength();
for (i = 0; i < l; i++) {
- groupDict.dictAdd((const char *)copyString(dic1.getKey(i)),
+ groupDict.dictAdd((const char *)dic1.getKey(i),
dic1.getValNF(i));
}
// end modification
diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
@@ -977,7 +977,7 @@ The changes below seem to work fine.
}
l = dic1.getLength();
for (i = 0; i < l; i++) {
- groupDict.dictAdd((const char *)copyString(dic1.getKey(i)),
+ groupDict.dictAdd((const char *)dic1.getKey(i),
dic1.getValNF(i).copy());
}
// end modification

43
source-poppler-use-std_string.patch
View File

@ -1,43 +0,0 @@
From 2ba61d7e191d753ce9f8bfeed1dacf0922ff8a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sat, 22 Dec 2018 00:42:23 +0100
Subject: [PATCH] std::string
---
texk/web2c/pdftexdir/pdftosrc.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
index 7dbee00..cc44daf 100644
--- a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
+++ b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "No SourceName found\n");
exit(1);
}
- outname = (char *)srcName.getString()->getCString();
+ outname = (char *)srcName.getString()->c_str();
// We cannot free srcName, as objname shares its string.
// srcName.free();
} else if (objnum > 0) {
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Not a Stream object\n");
exit(1);
}
- sprintf(buf, "%s", fileName->getCString());
+ sprintf(buf, "%s", fileName->c_str());
if ((p = strrchr(buf, '.')) == 0)
p = strchr(buf, 0);
if (objgen == 0)
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
outname = buf;
} else { // objnum < 0 means we are extracting the XRef table
extract_xref_table = true;
- sprintf(buf, "%s", fileName->getCString());
+ sprintf(buf, "%s", fileName->c_str());
if ((p = strrchr(buf, '.')) == 0)
p = strchr(buf, 0);
sprintf(p, ".xref");
--
2.20.1

31
source-poppler.dif
View File

@ -1,31 +0,0 @@
---
texk/web2c/pdftexdir/pdftoepdf.cc | 4 ++++
texk/web2c/pdftexdir/pdftosrc.cc | 4 ++++
2 files changed, 8 insertions(+)
--- texk/web2c/pdftexdir/pdftoepdf.cc
+++ texk/web2c/pdftexdir/pdftoepdf.cc 2012-04-13 14:56:58.000000000 +0000
@@ -31,6 +31,10 @@ with this program. If not, see <http://
#include <string.h>
#include <ctype.h>
+extern "C" {
+#include <config.h>
+}
+
#ifdef POPPLER_VERSION
#include <dirent.h>
#include <poppler-config.h>
--- texk/web2c/pdftexdir/pdftosrc.cc
+++ texk/web2c/pdftexdir/pdftosrc.cc 2012-04-13 14:59:10.000000000 +0000
@@ -24,6 +24,10 @@ with this program. If not, see <http://
#include <string.h>
#include <ctype.h>
+extern "C" {
+#include <config.h>
+}
+
#ifdef POPPLER_VERSION
#define GString GooString
#define xpdfVersion POPPLER_VERSION

1120
source-poppler0.59.0.patch
View File

File diff suppressed because it is too large Load Diff

55
source-poppler0.79.0.patch
View File

@ -1,55 +0,0 @@
From 3c5802812e0ae918ba5979e6a16abe39d0e2d7bf Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Thu, 8 Aug 2019 11:42:38 +0200
Subject: [PATCH] poppler 0.79
---
texk/web2c/pdftexdir/pdftosrc-newpoppler.cc | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
index 78fc2dd..682bcdf 100644
--- a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
+++ b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
@@ -157,12 +157,11 @@ int main(int argc, char *argv[])
(e->type == xrefEntryFree ? "f" : "n"));
else { // e->offset is the object number of the object stream
Stream *str;
- Lexer *lexer;
Parser *parser;
Object objStr, obj1, obj2;
int nObjects, first, n;
int localOffset = 0;
- Guint firstOffset;
+ unsigned int firstOffset;
objStr = xref->fetch(e->offset, 0);
assert(objStr.isStream());
@@ -175,8 +174,7 @@ int main(int argc, char *argv[])
// parse the header: object numbers and offsets
objStr.streamReset();
str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
- lexer = new Lexer(xref, str);
- parser = new Parser(xref, lexer, false);
+ parser = new Parser(xref, str, false);
for (n = 0; n < nObjects; ++n) {
obj1 = parser->getObj();
obj2 = parser->getObj();
diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
index 13c3bd5..ea78179 100644
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
@@ -760,8 +760,8 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
LinkDest *link = pdf_doc->doc->findDest(&name);
if (link == 0 || !link->isOk())
pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
- Ref ref = link->getPageRef();
- page_num = pdf_doc->doc->getCatalog()->findPage(ref.num, ref.gen);
+ const Ref ref = link->getPageRef();
+ page_num = pdf_doc->doc->getCatalog()->findPage(ref);
if (page_num == 0)
pdftex_fail("PDF inclusion: destination is not a page <%s>",
page_name);
--
2.21.0

54
source-poppler0.83.0.patch
View File

@ -1,54 +0,0 @@
From: Mike Gorse <mgorse@suse.com>
Date: Wed 11 Dec 2019 03:33:09 PM CST
Subject: [PATCH] poppler 0.83
---
diff -urp texlive-20190407-source.orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc texlive-20190407-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
--- texlive-20190407-source.orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc 2019-12-11 14:46:41.821436082 -0600
+++ texlive-20190407-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc 2019-12-11 15:28:27.578835392 -0600
@@ -723,7 +723,7 @@ read_pdf_info(char *image_name, char *pa
#endif
// initialize
if (!isInit) {
- globalParams = new GlobalParams();
+ globalParams = std::make_unique<GlobalParams>();
globalParams->setErrQuiet(false);
isInit = true;
}
@@ -1107,7 +1107,5 @@ void epdf_check_mem()
n = p->next;
delete_document(p);
}
- // see above for globalParams
- delete globalParams;
}
}
diff -urp texlive-20190407-source.orig/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc texlive-20190407-source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
--- texlive-20190407-source.orig/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc 2019-12-11 14:46:41.821436082 -0600
+++ texlive-20190407-source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc 2019-12-11 16:51:21.765434275 -0600
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
exit(1);
}
fileName = new GString(argv[1]);
- globalParams = new GlobalParams();
+ globalParams = std::make_unique<GlobalParams>();
doc = new PDFDoc(fileName);
if (!doc->isOk()) {
fprintf(stderr, "Invalid PDF file\n");
@@ -100,8 +100,8 @@ int main(int argc, char *argv[])
srcStream = Object(objNull);
if (objnum == 0) {
srcStream = catalogDict.dictLookup("SourceObject");
- static char const_SourceFile[] = "SourceFile";
- if (!srcStream.isStream(const_SourceFile)) {
+ static const char *const_SourceFile = "SourceFile";
+ if (!srcStream.isDict(const_SourceFile)) {
fprintf(stderr, "No SourceObject found\n");
exit(1);
}
@@ -202,5 +202,4 @@ int main(int argc, char *argv[])
fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
fclose(outfile);
delete doc;
- delete globalParams;
}

20
source-poppler0.86.0.patch
View File

@ -1,20 +0,0 @@
diff -urp texlive-20190407-source.orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc texlive-20190407-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
--- texlive-20190407-source.orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc 2020-03-26 20:36:35.584513454 -0500
+++ texlive-20190407-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc 2020-03-26 20:37:50.808915680 -0500
@@ -757,7 +757,7 @@ read_pdf_info(char *image_name, char *pa
if (page_name) {
// get page by name
GString name(page_name);
- LinkDest *link = pdf_doc->doc->findDest(&name);
+ std::unique_ptr<LinkDest> link = pdf_doc->doc->findDest(&name);
if (link == 0 || !link->isOk())
pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
const Ref ref = link->getPageRef();
@@ -765,7 +765,6 @@ read_pdf_info(char *image_name, char *pa
if (page_num == 0)
pdftex_fail("PDF inclusion: destination is not a page <%s>",
page_name);
- delete link;
} else {
// get page by number
if (page_num <= 0 || page_num > epdf_num_pages)

2
source-ppc64.dif
View File

@ -5,7 +5,7 @@
--- libs/luajit/configure
+++ libs/luajit/configure 2020-04-30 15:42:15.998038368 +0000
@@ -14300,6 +14300,15 @@ fi
@@ -14295,6 +14295,15 @@ fi
fi
if test "x$LJHOST" = xPS3; then :
echo '-D PPE -D TOC' >>dynasm_flags

4
source-warns.dif
View File

@ -12,7 +12,7 @@
--- libs/gmp/Makefile.in
+++ libs/gmp/Makefile.in 2016-06-07 13:29:33.925651292 +0000
@@ -484,7 +484,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -485,7 +485,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -81,7 +81,7 @@
am__v_CC_0 = @echo " CC " $@;
--- libs/mpfr/Makefile.in
+++ libs/mpfr/Makefile.in 2016-06-07 13:29:33.925651292 +0000
@@ -337,7 +337,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -345,7 +345,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

89
source.dif
View File

@ -23,19 +23,8 @@
texk/xdvik/xdvi-sh.in | 19 +
22 files changed, 224 insertions(+), 83 deletions(-)
--- reautoconf
+++ reautoconf 2018-04-10 09:02:17.774983801 +0000
@@ -83,7 +83,7 @@ echo "$0: TL_AUTOHEADER, T
# Give users a chance to quit here
# and set TL_AUTOCONF, TL_AUTOHEADER, TL_AUTOMAKE, and/or TL_ACLOCAL
-$do_cmd sleep 5
+# $do_cmd sleep 5
AUTOCONF=$TL_AUTOCONF
AUTOHEADER=$TL_AUTOHEADER
--- libs/icu/icu-src/source/common/Makefile.in
+++ libs/icu/icu-src/source/common/Makefile.in 2018-04-10 09:02:17.774983801 +0000
+++ libs/icu/icu-src/source/common/Makefile.in 2021-04-07 10:14:44.202880715 +0000
@@ -69,7 +69,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION
LDFLAGS += $(LDFLAGSICUUC)
@ -45,8 +34,19 @@
# for icu data location
ifeq ($(PKGDATA_MODE),common)
--- reautoconf
+++ reautoconf 2021-04-07 10:14:44.202880715 +0000
@@ -83,7 +83,7 @@ echo "$0: TL_AUTOHEADER, T
# Give users a chance to quit here
# and set TL_AUTOCONF, TL_AUTOHEADER, TL_AUTOMAKE, and/or TL_ACLOCAL
-$do_cmd sleep 5
+# $do_cmd sleep 5
AUTOCONF=$TL_AUTOCONF
AUTOHEADER=$TL_AUTOHEADER
--- texk/dviljk/dvi2xx.c
+++ texk/dviljk/dvi2xx.c 2018-04-10 09:02:17.858982223 +0000
+++ texk/dviljk/dvi2xx.c 2021-04-07 10:14:44.206880772 +0000
@@ -168,7 +168,18 @@ main(int argc, char *argv[])
setbuf(ERR_STREAM, NULL);
@ -67,7 +67,7 @@
G_progname = kpse_program_name;
#else
--- texk/kpathsea/c-fopen.h
+++ texk/kpathsea/c-fopen.h 2018-04-10 09:02:17.858982223 +0000
+++ texk/kpathsea/c-fopen.h 2021-04-07 10:14:44.206880772 +0000
@@ -38,17 +38,17 @@
/* How to open a binary file for reading: */
@ -90,7 +90,7 @@
/* How to switch an already open file handle to binary mode.
--- texk/kpathsea/c-memstr.h
+++ texk/kpathsea/c-memstr.h 2018-04-10 09:02:17.858982223 +0000
+++ texk/kpathsea/c-memstr.h 2021-04-07 10:14:44.206880772 +0000
@@ -37,6 +37,7 @@
/* For ancient systems that lack the system V/ANSI version of the
@ -107,7 +107,7 @@
+
#endif /* not KPATHSEA_C_MEMSTR_H */
--- texk/kpathsea/cnf-to-paths.awk
+++ texk/kpathsea/cnf-to-paths.awk 2018-04-10 09:02:17.858982223 +0000
+++ texk/kpathsea/cnf-to-paths.awk 2021-04-07 10:14:44.206880772 +0000
@@ -40,7 +40,7 @@
val = $0;
sub(/^.*=[ \t]*/, "", val);
@ -118,7 +118,7 @@
if (val ~ /\$SELFAUTO/) {
# Replace all semicolons with colons in the SELFAUTO paths we're keeping.
--- texk/kpathsea/db.c
+++ texk/kpathsea/db.c 2018-04-10 09:08:03.084494047 +0000
+++ texk/kpathsea/db.c 2021-04-07 10:14:44.206880772 +0000
@@ -93,7 +93,8 @@ db_build (kpathsea kpse, hash_table_type
unsigned len = strlen (db_filename) - sizeof (DB_NAME) + 1; /* Keep the /. */
string top_dir = (string)xmalloc (len + 1);
@ -147,7 +147,7 @@
len = strlen (line);
--- texk/kpathsea/progname.c
+++ texk/kpathsea/progname.c 2018-04-10 09:02:17.862982147 +0000
+++ texk/kpathsea/progname.c 2021-04-07 10:14:44.206880772 +0000
@@ -662,9 +662,9 @@ kpathsea_set_program_name (kpathsea kpse
/* SELFAUTODIR is actually the parent of the invocation directory,
and SELFAUTOPARENT the grandparent. This is how teTeX did it. */
@ -161,7 +161,7 @@
sdir_greatgrandparent = xdirname (sdir_grandparent);
kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
--- texk/kpathsea/texmf.cnf
+++ texk/kpathsea/texmf.cnf 2020-03-20 09:47:16.242820144 +0000
+++ texk/kpathsea/texmf.cnf 2021-04-07 10:22:03.917307810 +0000
@@ -62,20 +62,20 @@
TEXMFROOT = $SELFAUTOPARENT
@ -191,11 +191,11 @@
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2020/texmf-var
-TEXMFVAR = ~/.texlive2021/texmf-var
+TEXMFVAR = ${TEXMFSYSVAR}
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2020/texmf-config
-TEXMFCONFIG = ~/.texlive2021/texmf-config
+TEXMFCONFIG = ${TEXMFSYSCONFIG}
% This is the value manipulated by tlmgr's auxtrees subcommand in the
@ -394,7 +394,7 @@
%
% For reference, here is the old brace-using definition:
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
@@ -894,3 +900,33 @@ guess_input_kanji_encoding = 1
@@ -904,3 +910,33 @@ guess_input_kanji_encoding = 1
% command_line_encoding = none
% in a texmf.cnf prefered, for example $TEXMFLOCAL/web2c/texmf.cnf.
command_line_encoding = utf-8
@ -429,7 +429,7 @@
+pool_size.jadetex = 500000
+save_size.jadetex = 15000
--- texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc
+++ texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc 2018-04-10 09:08:59.687430373 +0000
+++ texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc 2021-04-07 10:14:44.206880772 +0000
@@ -67,6 +67,9 @@
# include <io.h>
#endif
@ -441,19 +441,19 @@
#define VERSION_OPT 301
--- texk/ps2pk/pk2bm.c
+++ texk/ps2pk/pk2bm.c 2018-04-10 09:02:17.862982147 +0000
+++ texk/ps2pk/pk2bm.c 2021-04-07 10:23:07.138231549 +0000
@@ -103,7 +103,7 @@ invalid:
}
}
- if (argc == 0) {
+ if (argc != 1) {
msg ("pk2bm (ps2pk) version " PACKAGE_VERSION "\n");
printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
exit(1);
msg ("pk2bm (ps2pk) version " PACKAGE_VERSION " (" TL_VERSION ")\n");
msg ("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
fatal("\nEmail bug reports to %s.\n", PACKAGE_BUGREPORT);
--- texk/texlive/linked_scripts/musixtex/musixtex.lua
+++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2018-04-10 09:12:50.395048030 +0000
@@ -200,15 +200,26 @@ end
+++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2021-04-07 10:29:14.951604240 +0000
@@ -212,16 +212,27 @@ end
-- possible by exploiting the the fact that Lua has two false values.
-- dvi == nil "do not produce a DVI file" (but maybe PDF)
-- dvi == false "do not process the DVI file" (but stop after TeX)
@ -462,6 +462,7 @@
+base=base[1]
local dvips = "dvips -e0"
function defaults()
xml2pmx = "xml2pmx"
prepmx = "prepmx"
pmx = "pmxab"
autosp = "autosp"
@ -472,7 +473,7 @@
+ dvi = ""
+ ps2pdf = ""
+ else
+ tex = "etex"
+ tex = "etex"
+ dvips = "dvips -e0"
+ dvi = dvips
+ ps2pdf = "ps2pdf"
@ -484,7 +485,7 @@
index = false
latex = false
--- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh 2018-04-10 09:02:17.862982147 +0000
+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh 2021-04-07 10:14:44.206880772 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
@ -492,7 +493,7 @@
+umask 022
exec fmtutil --sys ${1+"$@"}
--- texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ texk/texlive/linked_scripts/texlive/fmtutil.pl 2020-03-20 09:50:01.803710617 +0000
+++ texk/texlive/linked_scripts/texlive/fmtutil.pl 2021-04-07 10:14:44.210880832 +0000
@@ -10,16 +10,16 @@
# History:
# Original shell script (C) 2001 Thomas Esser, public domain
@ -539,7 +540,7 @@
}
# set up destination directory
$opts{'fmtdir'} ||= "$texmfvar/web2c";
@@ -599,6 +606,7 @@ sub rebuild_one_format {
@@ -592,6 +599,7 @@ sub rebuild_one_format {
# check for existence of ini file before doing anything else
if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) {
# we didn't find the ini file, skip
@ -547,7 +548,7 @@
print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n");
# The original script just skipped it but in TeX Live we expect that
# all activated formats are also buildable, thus return failure.
@@ -658,11 +666,15 @@ sub rebuild_one_format {
@@ -651,11 +659,15 @@ sub rebuild_one_format {
",$opts{'no-error-if-no-engine'}," =~ m/,$eng,/) {
return $FMT_NOTAVAIL;
} else {
@ -564,7 +565,7 @@
. "$prgswitch $texargs";
print_verbose("running \`$cmdline' ...\n");
--- texk/texlive/linked_scripts/texlive/updmap-sys.sh
+++ texk/texlive/linked_scripts/texlive/updmap-sys.sh 2018-04-10 09:02:17.862982147 +0000
+++ texk/texlive/linked_scripts/texlive/updmap-sys.sh 2021-04-07 10:14:44.210880832 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
@ -572,8 +573,8 @@
+umask 022
exec updmap --sys ${1+"$@"}
--- texk/web2c/Makefile.in
+++ texk/web2c/Makefile.in 2018-04-10 09:02:17.870981997 +0000
@@ -5085,7 +5085,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
+++ texk/web2c/Makefile.in 2021-04-07 10:14:44.210880832 +0000
@@ -5483,7 +5483,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
md5main_CPPFLAGS = -I$(srcdir)/libmd5
md5main_SOURCES = libmd5/md5main.c
md5main_LDADD = libmd5.a
@ -582,7 +583,7 @@
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
@@ -5132,6 +5132,11 @@ w2c/c-auto.h: w2c/stamp-h1
@@ -5530,6 +5530,11 @@ w2c/c-auto.h: w2c/stamp-h1
w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
@rm -f w2c/stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
@ -595,7 +596,7 @@
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f w2c/stamp-h1
--- texk/web2c/uptexdir/tests/gkhugeng.err
+++ texk/web2c/uptexdir/tests/gkhugeng.err 2019-05-13 11:22:35.158192154 +0000
+++ texk/web2c/uptexdir/tests/gkhugeng.err 2021-04-07 10:14:44.214880889 +0000
@@ -1,3 +1,11 @@
+warning: kpathsea: /etc/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
@ -609,7 +610,7 @@
The fifth byte of the input file exceeds 127!
Sorry, but I can't go on; are you sure this is a TFM?
--- texk/web2c/window/regis.c
+++ texk/web2c/window/regis.c 2018-04-10 09:02:17.870981997 +0000
+++ texk/web2c/window/regis.c 2021-04-07 10:14:44.214880889 +0000
@@ -64,12 +64,14 @@ void mf_regis_blankrectangle (screencol
screenrow top,
screenrow bottom)
@ -629,7 +630,7 @@
left,bottom,ESCAPE);
}
--- texk/web2c/window/x11-Xlib.c
+++ texk/web2c/window/x11-Xlib.c 2018-04-10 09:02:18.646967412 +0000
+++ texk/web2c/window/x11-Xlib.c 2021-04-07 10:14:44.214880889 +0000
@@ -73,6 +73,8 @@ static XWMHints wm_hints = {
#define BORDER_WIDTH 1 /* Should get this from resource. */
#define DEFAULT_X_POSITION 0
@ -656,7 +657,7 @@
/* Look up the geometry for this window. (Section 10.2 Obtaining X
--- texk/web2c/window/x11-Xt.c
+++ texk/web2c/window/x11-Xt.c 2018-04-10 09:02:18.646967412 +0000
+++ texk/web2c/window/x11-Xt.c 2021-04-07 10:14:44.214880889 +0000
@@ -18,8 +18,8 @@
#define PLANE 0
@ -669,7 +670,7 @@
static Display *mf_display;
static Window mf_window;
--- texk/xdvik/psgs.c
+++ texk/xdvik/psgs.c 2018-04-10 09:02:18.646967412 +0000
+++ texk/xdvik/psgs.c 2021-04-07 10:14:44.214880889 +0000
@@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE.
#include <sys/time.h> /* for timeval */
@ -707,7 +708,7 @@
GS_pid = vfork();
if (GS_pid == 0) { /* child */
--- texk/xdvik/xdvi-sh.in
+++ texk/xdvik/xdvi-sh.in 2018-04-10 09:02:18.646967412 +0000
+++ texk/xdvik/xdvi-sh.in 2021-04-07 10:14:44.214880889 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

3
texlive-20200327-source.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:08101d413463d361bc07678ecad2bafe767c3a2f20df259d7e011a7b25b8839b
size 55412152

3
texlive-20210325-source.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
size 54837368

29
texlive.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Tue Apr 6 14:03:37 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Update to TeXLive 2021
* No poppler required anymore (hurray)
* Uses its own xpdf based library
- Update to biber 2.16
* perl(Unicode::Collate) >= 1.29
- Port patches mostly by correcting offsets
* 0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
* biber-certs.dif
* source-64.dif
* source-configure.dif
* source-dviutils.dif
* source-ppc64.dif
* source-warns.dif
* source.dif
- Remove patches now fixed upstream or not required anymore
* source-fix-bool-poppler.patch
* source-fix-const-poppler0.66.0.patch
* source-overflow.dif
* source-poppler-fix-dict-memleak.patch
* source-poppler-use-std_string.patch
* source-poppler.dif
* source-poppler0.59.0.patch
* source-poppler0.79.0.patch
* source-poppler0.83.0.patch
* source-poppler0.86.0.patch
-------------------------------------------------------------------
Tue Feb 23 16:22:42 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>

892
texlive.spec
View File

File diff suppressed because it is too large Load Diff