From 3db50925f726c19a622cde1115936d5caf691daea4f7fb2d003d4d9a708b4d46 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 9 Apr 2021 18:35:30 +0000 Subject: [PATCH 1/5] Update to TeXLive 2021 OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=385 --- ...rt-based-on-koriakin-GitHub-patchset.patch | 6 +- biber-2.14.tar.xz | 3 - biber-2.16.tar.xz | 3 + biber-certs.dif | 8 +- source-64.dif | 2 +- source-configure.dif | 4 +- source-dviutils.dif | 76 +- source-fix-bool-poppler.patch | 97 -- source-fix-const-poppler0.66.0.patch | 685 ---------- source-overflow.dif | 26 - source-poppler-fix-dict-memleak.patch | 73 -- source-poppler-use-std_string.patch | 43 - source-poppler.dif | 31 - source-poppler0.59.0.patch | 1120 ----------------- source-poppler0.79.0.patch | 55 - source-poppler0.83.0.patch | 54 - source-poppler0.86.0.patch | 20 - source-ppc64.dif | 2 +- source-warns.dif | 4 +- source.dif | 89 +- texlive-20200327-source.tar.xz | 3 - texlive-20210325-source.tar.xz | 3 + texlive.changes | 29 + texlive.spec | 892 ++++++------- 24 files changed, 593 insertions(+), 2735 deletions(-) delete mode 100644 biber-2.14.tar.xz create mode 100644 biber-2.16.tar.xz delete mode 100644 source-fix-bool-poppler.patch delete mode 100644 source-fix-const-poppler0.66.0.patch delete mode 100644 source-overflow.dif delete mode 100644 source-poppler-fix-dict-memleak.patch delete mode 100644 source-poppler-use-std_string.patch delete mode 100644 source-poppler.dif delete mode 100644 source-poppler0.59.0.patch delete mode 100644 source-poppler0.79.0.patch delete mode 100644 source-poppler0.83.0.patch delete mode 100644 source-poppler0.86.0.patch delete mode 100644 texlive-20200327-source.tar.xz create mode 100644 texlive-20210325-source.tar.xz diff --git a/0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch b/0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch index 6be719a..be96cc7 100644 --- a/0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch +++ b/0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch @@ -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 diff --git a/biber-2.14.tar.xz b/biber-2.14.tar.xz deleted file mode 100644 index baec83d..0000000 --- a/biber-2.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28e0a2780511c906f9c4554b2226acb50840c93cf73e579e1f2d05ea9e4c6736 -size 994392 diff --git a/biber-2.16.tar.xz b/biber-2.16.tar.xz new file mode 100644 index 0000000..64c7c9d --- /dev/null +++ b/biber-2.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c48a2ba2a87534ad8894426b4e883d63bac8548907f1739a1212d3c13106aca +size 1000132 diff --git a/biber-certs.dif b/biber-certs.dif index 2a1a0e2..a5a75f3 100644 --- a/biber-certs.dif +++ b/biber-certs.dif @@ -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); diff --git a/source-64.dif b/source-64.dif index f522c64..f66d081 100644 --- a/source-64.dif +++ b/source-64.dif @@ -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. diff --git a/source-configure.dif b/source-configure.dif index 6957b01..49addb0 100644 --- a/source-configure.dif +++ b/source-configure.dif @@ -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]) diff --git a/source-dviutils.dif b/source-dviutils.dif index 4063739..1863def 100644 --- a/source-dviutils.dif +++ b/source-dviutils.dif @@ -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 @@ -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 #include #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 +#include #include + #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 #include #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 #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 @@ -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 @@ -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.) diff --git a/source-fix-bool-poppler.patch b/source-fix-bool-poppler.patch deleted file mode 100644 index 11f66b6..0000000 --- a/source-fix-bool-poppler.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 497c0e42d91d78837ddca8906bf7246c93654d41 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -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 - diff --git a/source-fix-const-poppler0.66.0.patch b/source-fix-const-poppler0.66.0.patch deleted file mode 100644 index 9c2e9c6..0000000 --- a/source-fix-const-poppler0.66.0.patch +++ /dev/null @@ -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); diff --git a/source-overflow.dif b/source-overflow.dif deleted file mode 100644 index f175334..0000000 --- a/source-overflow.dif +++ /dev/null @@ -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]; - diff --git a/source-poppler-fix-dict-memleak.patch b/source-poppler-fix-dict-memleak.patch deleted file mode 100644 index 375c5b8..0000000 --- a/source-poppler-fix-dict-memleak.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 599cc7afea4c418ff9eff1bd3b4b3d4f157162e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -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 diff --git a/source-poppler-use-std_string.patch b/source-poppler-use-std_string.patch deleted file mode 100644 index f921369..0000000 --- a/source-poppler-use-std_string.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2ba61d7e191d753ce9f8bfeed1dacf0922ff8a1f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -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 - diff --git a/source-poppler.dif b/source-poppler.dif deleted file mode 100644 index b980acb..0000000 --- a/source-poppler.dif +++ /dev/null @@ -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 - #include - -+extern "C" { -+#include -+} -+ - #ifdef POPPLER_VERSION - #include - #include ---- 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 - #include - -+extern "C" { -+#include -+} -+ - #ifdef POPPLER_VERSION - #define GString GooString - #define xpdfVersion POPPLER_VERSION diff --git a/source-poppler0.59.0.patch b/source-poppler0.59.0.patch deleted file mode 100644 index 5515a47..0000000 --- a/source-poppler0.59.0.patch +++ /dev/null @@ -1,1120 +0,0 @@ ---- - texk/web2c/pdftexdir/pdftoepdf-poppler0.59.0.cc | 1113 ++++++++++++++++++++++++ - 1 file changed, 1113 insertions(+) - ---- texk/web2c/pdftexdir/pdftoepdf-poppler0.59.0.cc -+++ texk/web2c/pdftexdir/pdftoepdf-poppler0.59.0.cc 2019-05-14 09:08:36.877504732 +0000 -@@ -0,0 +1,1113 @@ -+/* -+Copyright 1996-2016 Han The Thanh, -+ -+This file is part of pdfTeX. -+ -+pdfTeX is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2 of the License, or -+(at your option) any later version. -+ -+pdfTeX is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License along -+with this program. If not, see . -+*/ -+ -+/* -+This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at -+https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk -+by Arch Linux. A little modifications are made to avoid a crash for -+some kind of pdf images, such as figure_missing.pdf in gnuplot. -+The poppler should be 0.59.0 or newer versions. -+POPPLER_VERSION should be defined. -+*/ -+ -+/* Do this early in order to avoid a conflict between -+ MINGW32 defining 'boolean' as 'unsigned char' and -+ defining Pascal's boolean as 'int'. -+*/ -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifdef POPPLER_VERSION -+#include -+#include -+#include -+#include -+#include -+#define GString GooString -+#else -+#error POPPLER_VERSION should be defined. -+#endif -+#include -+ -+#include "Object.h" -+#include "Stream.h" -+#include "Array.h" -+#include "Dict.h" -+#include "XRef.h" -+#include "Catalog.h" -+#include "Link.h" -+#include "Page.h" -+#include "GfxFont.h" -+#include "PDFDoc.h" -+#include "GlobalParams.h" -+#include "Error.h" -+ -+// This file is mostly C and not very much C++; it's just used to interface -+// the functions of xpdf, which are written in C++. -+ -+extern "C" { -+#include -+#include -+ -+// These functions from pdftex.web gets declared in pdftexcoerce.h in the -+// usual web2c way, but we cannot include that file here because C++ -+// does not allow it. -+extern int getpdfsuppresswarningpagegroup(void); -+extern integer getpdfsuppressptexinfo(void); -+extern integer zround(double); -+} -+ -+// The prefix "PTEX" for the PDF keys is special to pdfTeX; -+// this has been registered with Adobe by Hans Hagen. -+ -+#define pdfkeyprefix "PTEX" -+ -+#define MASK_SUPPRESS_PTEX_FULLBANNER 0x01 -+#define MASK_SUPPRESS_PTEX_FILENAME 0x02 -+#define MASK_SUPPRESS_PTEX_PAGENUMBER 0x04 -+#define MASK_SUPPRESS_PTEX_INFODICT 0x08 -+ -+// When copying the Resources of the selected page, all objects are copied -+// recusively top-down. Indirect objects however are not fetched during -+// copying, but get a new object number from pdfTeX and then will be -+// appended into a linked list. Duplicates are checked and removed from the -+// list of indirect objects during appending. -+ -+enum InObjType { -+ objFont, -+ objFontDesc, -+ objOther -+}; -+ -+struct InObj { -+ Ref ref; // ref in original PDF -+ InObjType type; // object type -+ InObj *next; // next entry in list of indirect objects -+ int num; // new object number in output PDF -+ fd_entry *fd; // pointer to /FontDescriptor object structure -+ int enc_objnum; // Encoding for objFont -+ int written; // has it been written to output PDF? -+}; -+ -+struct UsedEncoding { -+ int enc_objnum; -+ GfxFont *font; -+ UsedEncoding *next; -+}; -+ -+static InObj *inObjList; -+static UsedEncoding *encodingList; -+static bool isInit = false; -+ -+// -------------------------------------------------------------------- -+// Maintain list of open embedded PDF files -+// -------------------------------------------------------------------- -+ -+struct PdfDocument { -+ char *file_name; -+ PDFDoc *doc; -+ XRef *xref; -+ InObj *inObjList; -+ int occurences; // number of references to the document; the doc can be -+ // deleted when this is negative -+ PdfDocument *next; -+}; -+ -+static PdfDocument *pdfDocuments = 0; -+ -+static XRef *xref = 0; -+ -+// Returns pointer to PdfDocument record for PDF file. -+// Creates a new record if it doesn't exist yet. -+// xref is made current for the document. -+ -+static PdfDocument *find_add_document(char *file_name) -+{ -+ PdfDocument *p = pdfDocuments; -+ while (p && strcmp(p->file_name, file_name) != 0) -+ p = p->next; -+ if (p) { -+ xref = p->xref; -+ (p->occurences)++; -+ return p; -+ } -+ p = new PdfDocument; -+ p->file_name = xstrdup(file_name); -+ p->xref = xref = 0; -+ p->occurences = 0; -+ GString *docName = new GString(p->file_name); -+ p->doc = new PDFDoc(docName); // takes ownership of docName -+ if (!p->doc->isOk() || !p->doc->okToPrint()) { -+ pdftex_fail("xpdf: reading PDF image failed"); -+ } -+ p->inObjList = 0; -+ p->next = pdfDocuments; -+ pdfDocuments = p; -+ return p; -+} -+ -+// Deallocate a PdfDocument with all its resources -+ -+static void delete_document(PdfDocument * pdf_doc) -+{ -+ PdfDocument **p = &pdfDocuments; -+ while (*p && *p != pdf_doc) -+ p = &((*p)->next); -+ // should not happen: -+ if (!*p) -+ return; -+ // unlink from list -+ *p = pdf_doc->next; -+ // free pdf_doc's resources -+ InObj *r, *n; -+ for (r = pdf_doc->inObjList; r != 0; r = n) { -+ n = r->next; -+ delete r; -+ } -+ xref = pdf_doc->xref; -+ delete pdf_doc->doc; -+ xfree(pdf_doc->file_name); -+ delete pdf_doc; -+} -+ -+// -------------------------------------------------------------------- -+ -+static int addEncoding(GfxFont * gfont) -+{ -+ UsedEncoding *n; -+ n = new UsedEncoding; -+ n->next = encodingList; -+ encodingList = n; -+ n->font = gfont; -+ n->enc_objnum = pdfnewobjnum(); -+ return n->enc_objnum; -+} -+ -+#define addFont(ref, fd, enc_objnum) \ -+ addInObj(objFont, ref, fd, enc_objnum) -+ -+// addFontDesc is only used to avoid writing the original FontDescriptor -+// from the PDF file. -+ -+#define addFontDesc(ref, fd) \ -+ addInObj(objFontDesc, ref, fd, 0) -+ -+#define addOther(ref) \ -+ addInObj(objOther, ref, 0, 0) -+ -+static int addInObj(InObjType type, Ref ref, fd_entry * fd, int e) -+{ -+ InObj *p, *q, *n = new InObj; -+ if (ref.num == 0) -+ pdftex_fail("PDF inclusion: invalid reference"); -+ n->ref = ref; -+ n->type = type; -+ n->next = 0; -+ n->fd = fd; -+ n->enc_objnum = e; -+ n->written = 0; -+ if (inObjList == 0) -+ inObjList = n; -+ else { -+ for (p = inObjList; p != 0; p = p->next) { -+ if (p->ref.num == ref.num && p->ref.gen == ref.gen) { -+ delete n; -+ return p->num; -+ } -+ q = p; -+ } -+ // it is important to add new objects at the end of the list, -+ // because new objects are being added while the list is being -+ // written out. -+ q->next = n; -+ } -+ if (type == objFontDesc) -+ n->num = get_fd_objnum(fd); -+ else -+ n->num = pdfnewobjnum(); -+ return n->num; -+} -+ -+#if 0 /* unusewd */ -+static int getNewObjectNumber(Ref ref) -+{ -+ InObj *p; -+ if (inObjList == 0) { -+ pdftex_fail("No objects copied yet"); -+ } else { -+ for (p = inObjList; p != 0; p = p->next) { -+ if (p->ref.num == ref.num && p->ref.gen == ref.gen) { -+ return p->num; -+ } -+ } -+ pdftex_fail("Object not yet copied: %i %i", ref.num, ref.gen); -+ } -+#ifdef _MSC_VER -+ /* Never reached, but without __attribute__((noreturn)) for pdftex_fail() -+ MSVC 5.0 requires an int return value. */ -+ return -60000; -+#endif -+} -+#endif -+ -+static void copyObject(Object *); -+ -+static void copyName(const char *s) -+{ -+ pdf_puts("/"); -+ for (; *s != 0; s++) { -+ if (isdigit(*s) || isupper(*s) || islower(*s) || *s == '_' || -+ *s == '.' || *s == '-' || *s == '+') -+ pdfout(*s); -+ else -+ pdf_printf("#%.2X", *s & 0xFF); -+ } -+} -+ -+static void copyDictEntry(const Object * obj, int i) -+{ -+ Object obj1; -+ copyName(obj->dictGetKey(i)); -+ pdf_puts(" "); -+ obj1 = obj->dictGetValNF(i); -+ copyObject(&obj1); -+ pdf_puts("\n"); -+} -+ -+static void copyDict(const Object * obj) -+{ -+ int i, l; -+ if (!obj->isDict()) -+ pdftex_fail("PDF inclusion: invalid dict type <%s>", -+ obj->getTypeName()); -+ for (i = 0, l = obj->dictGetLength(); i < l; ++i) -+ copyDictEntry(obj, i); -+} -+ -+static void copyFontDict(const Object * obj, InObj * r) -+{ -+ int i, l; -+ const char *key; -+ if (!obj->isDict()) -+ pdftex_fail("PDF inclusion: invalid dict type <%s>", -+ obj->getTypeName()); -+ pdf_puts("<<\n"); -+ assert(r->type == objFont); // FontDescriptor is in fd_tree -+ for (i = 0, l = obj->dictGetLength(); i < l; ++i) { -+ key = obj->dictGetKey(i); -+ if (strncmp("FontDescriptor", key, strlen("FontDescriptor")) == 0 -+ || strncmp("BaseFont", key, strlen("BaseFont")) == 0 -+ || strncmp("Encoding", key, strlen("Encoding")) == 0) -+ continue; // skip original values -+ copyDictEntry(obj, i); -+ } -+ // write new FontDescriptor, BaseFont, and Encoding -+ pdf_printf("/FontDescriptor %d 0 R\n", get_fd_objnum(r->fd)); -+ pdf_printf("/BaseFont %d 0 R\n", get_fn_objnum(r->fd)); -+ pdf_printf("/Encoding %d 0 R\n", r->enc_objnum); -+ pdf_puts(">>"); -+} -+ -+static void copyStream(Stream * str) -+{ -+ int c, c2 = 0; -+ str->reset(); -+ while ((c = str->getChar()) != EOF) { -+ pdfout(c); -+ c2 = c; -+ } -+ pdflastbyte = c2; -+} -+ -+static void copyProcSet(Object * obj) -+{ -+ int i, l; -+ Object procset; -+ if (!obj->isArray()) -+ pdftex_fail("PDF inclusion: invalid ProcSet array type <%s>", -+ obj->getTypeName()); -+ pdf_puts("/ProcSet [ "); -+ for (i = 0, l = obj->arrayGetLength(); i < l; ++i) { -+ procset = obj->arrayGetNF(i); -+ if (!procset.isName()) -+ pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>", -+ procset.getTypeName()); -+ copyName(procset.getName()); -+ pdf_puts(" "); -+ } -+ pdf_puts("]\n"); -+} -+ -+#define REPLACE_TYPE1C true -+ -+static bool embeddableFont(Object * fontdesc) -+{ -+ Object fontfile, ffsubtype; -+ -+ if (!fontdesc->isDict()) -+ return false; -+ fontfile = fontdesc->dictLookup("FontFile"); -+ if (fontfile.isStream()) -+ return true; -+ if (REPLACE_TYPE1C) { -+ fontfile = fontdesc->dictLookup("FontFile3"); -+ if (!fontfile.isStream()) -+ return false; -+ ffsubtype = fontfile.streamGetDict()->lookup("Subtype"); -+ return ffsubtype.isName() && !strcmp(ffsubtype.getName(), "Type1C"); -+ } -+ return false; -+} -+ -+static void copyFont(const char *tag, Object * fontRef) -+{ -+ Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset, -+ stemV; -+ GfxFont *gfont; -+ fd_entry *fd; -+ fm_entry *fontmap; -+ // Check whether the font has already been embedded before analysing it. -+ InObj *p; -+ Ref ref = fontRef->getRef(); -+ for (p = inObjList; p; p = p->next) { -+ if (p->ref.num == ref.num && p->ref.gen == ref.gen) { -+ copyName(tag); -+ pdf_printf(" %d 0 R ", p->num); -+ return; -+ } -+ } -+ // Only handle included Type1 (and Type1C) fonts; anything else will be copied. -+ // Type1C fonts are replaced by Type1 fonts, if REPLACE_TYPE1C is true. -+ fontdict = fontRef->fetch(xref); -+ fontdesc = Object(objNull); -+ if (fontdict.isDict()) { -+ subtype = fontdict.dictLookup("Subtype"); -+ basefont = fontdict.dictLookup("BaseFont"); -+ fontdescRef = fontdict.dictLookupNF("FontDescriptor"); -+ if (fontdescRef.isRef()) { -+ fontdesc = fontdescRef.fetch(xref); -+ } -+ } -+ if (!fixedinclusioncopyfont && fontdict.isDict() -+ && subtype.isName() -+ && !strcmp(subtype.getName(), "Type1") -+ && basefont.isName() -+ && fontdescRef.isRef() -+ && fontdesc.isDict() -+ && embeddableFont(&fontdesc) -+ && (fontmap = lookup_fontmap(basefont.getName())) != NULL) { -+ // round /StemV value, since the PDF input is a float -+ // (see Font Descriptors in PDF reference), but we only store an -+ // integer, since we don't want to change the struct. -+ stemV = fontdesc.dictLookup("StemV"); -+ fd = epdf_create_fontdescriptor(fontmap, zround(stemV.getNum())); -+ charset = fontdesc.dictLookup("CharSet"); -+ if (!charset.isNull() && -+ charset.isString() && is_subsetable(fontmap)) -+ epdf_mark_glyphs(fd, charset.getString()->getCString()); -+ else -+ embed_whole_font(fd); -+ addFontDesc(fontdescRef.getRef(), fd); -+ copyName(tag); -+ gfont = GfxFont::makeFont(xref, tag, fontRef->getRef(), -+ fontdict.getDict()); -+ pdf_printf(" %d 0 R ", addFont(fontRef->getRef(), fd, -+ addEncoding(gfont))); -+ } else { -+ copyName(tag); -+ pdf_puts(" "); -+ copyObject(fontRef); -+ } -+} -+ -+static void copyFontResources(Object * obj) -+{ -+ Object fontRef; -+ int i, l; -+ if (!obj->isDict()) -+ pdftex_fail("PDF inclusion: invalid font resources dict type <%s>", -+ obj->getTypeName()); -+ pdf_puts("/Font << "); -+ for (i = 0, l = obj->dictGetLength(); i < l; ++i) { -+ fontRef = obj->dictGetValNF(i); -+ if (fontRef.isRef()) -+ copyFont(obj->dictGetKey(i), &fontRef); -+ else if (fontRef.isDict()) { // some programs generate pdf with embedded font object -+ copyName(obj->dictGetKey(i)); -+ pdf_puts(" "); -+ copyObject(&fontRef); -+ } -+ else -+ pdftex_fail("PDF inclusion: invalid font in reference type <%s>", -+ fontRef.getTypeName()); -+ } -+ pdf_puts(">>\n"); -+} -+ -+static void copyOtherResources(Object * obj, const char *key) -+{ -+ // copies all other resources (write_epdf handles Fonts and ProcSets), -+ -+ // if Subtype is present, it must be a name -+ if (strcmp("Subtype", key) == 0) { -+ if (!obj->isName()) { -+ pdftex_warn("PDF inclusion: Subtype in Resources dict is not a name" -+ " (key '%s', type <%s>); ignored.", -+ key, obj->getTypeName()); -+ return; -+ } -+ } else if (!obj->isDict()) { -+ //FIXME: Write the message only to the log file -+ pdftex_warn("PDF inclusion: invalid other resource which is no dict" -+ " (key '%s', type <%s>); ignored.", -+ key, obj->getTypeName()); -+ return; -+ } -+ copyName(key); -+ pdf_puts(" "); -+ copyObject(obj); -+} -+ -+// Function onverts double to string; very small and very large numbers -+// are NOT converted to scientific notation. -+// n must be a number or real conforming to the implementation limits -+// of PDF as specified in appendix C.1 of the PDF Ref. -+// These are: -+// maximum value of ints is +2^32 -+// maximum value of reals is +2^15 -+// smalles values of reals is 1/(2^16) -+ -+static char *convertNumToPDF(double n) -+{ -+ static const int precision = 6; -+ static const int fact = (int) 1E6; // must be 10^precision -+ static const double epsilon = 0.5E-6; // 2epsilon must be 10^-precision -+ static char buf[64]; -+ // handle very small values: return 0 -+ if (fabs(n) < epsilon) { -+ buf[0] = '0'; -+ buf[1] = '\0'; -+ } else { -+ char ints[64]; -+ int bindex = 0, sindex = 0; -+ int ival, fval; -+ // handle the sign part if n is negative -+ if (n < 0) { -+ buf[bindex++] = '-'; -+ n = -n; -+ } -+ n += epsilon; // for rounding -+ // handle the integer part, simply with sprintf -+ ival = (int) floor(n); -+ n -= ival; -+ sprintf(ints, "%d", ival); -+ while (ints[sindex] != 0) -+ buf[bindex++] = ints[sindex++]; -+ // handle the fractional part up to 'precision' digits -+ fval = (int) floor(n * fact); -+ if (fval) { -+ // set a dot -+ buf[bindex++] = '.'; -+ sindex = bindex + precision; -+ buf[sindex--] = '\0'; -+ // fill up trailing zeros with the string terminator NULL -+ while (((fval % 10) == 0) && (sindex >= bindex)) { -+ buf[sindex--] = '\0'; -+ fval /= 10; -+ } -+ // fill up the fractional part back to front -+ while (sindex >= bindex) { -+ buf[sindex--] = (fval % 10) + '0'; -+ fval /= 10; -+ } -+ } else -+ buf[bindex++] = 0; -+ } -+ return (char *) buf; -+} -+ -+static void copyObject(Object * obj) -+{ -+ Object obj1; -+ int i, l, c; -+ Ref ref; -+ const char *p; -+ const GString *s; -+ if (obj->isBool()) { -+ pdf_printf("%s", obj->getBool()? "true" : "false"); -+ } else if (obj->isInt()) { -+ pdf_printf("%i", obj->getInt()); -+ } else if (obj->isReal()) { -+ pdf_printf("%s", convertNumToPDF(obj->getReal())); -+ } else if (obj->isNum()) { -+ pdf_printf("%s", convertNumToPDF(obj->getNum())); -+ } else if (obj->isString()) { -+ s = obj->getString(); -+ p = s->getCString(); -+ l = s->getLength(); -+ if (strlen(p) == (unsigned int) l) { -+ pdf_puts("("); -+ for (; *p != 0; p++) { -+ c = (unsigned char) *p; -+ if (c == '(' || c == ')' || c == '\\') -+ pdf_printf("\\%c", c); -+ else if (c < 0x20 || c > 0x7F) -+ pdf_printf("\\%03o", c); -+ else -+ pdfout(c); -+ } -+ pdf_puts(")"); -+ } else { -+ pdf_puts("<"); -+ for (i = 0; i < l; i++) { -+ c = s->getChar(i) & 0xFF; -+ pdf_printf("%.2x", c); -+ } -+ pdf_puts(">"); -+ } -+ } else if (obj->isName()) { -+ copyName(obj->getName()); -+ } else if (obj->isNull()) { -+ pdf_puts("null"); -+ } else if (obj->isArray()) { -+ pdf_puts("["); -+ for (i = 0, l = obj->arrayGetLength(); i < l; ++i) { -+ obj1 = obj->arrayGetNF(i); -+ if (!obj1.isName()) -+ pdf_puts(" "); -+ copyObject(&obj1); -+ } -+ pdf_puts("]"); -+ } else if (obj->isDict()) { -+ pdf_puts("<<\n"); -+ copyDict(obj); -+ pdf_puts(">>"); -+ } else if (obj->isStream()) { -+ pdf_puts("<<\n"); -+ copyDict(obj->getStream()->getDictObject()); -+ pdf_puts(">>\n"); -+ pdf_puts("stream\n"); -+ copyStream(obj->getStream()->getUndecodedStream()); -+ pdf_puts("\nendstream"); -+ } else if (obj->isRef()) { -+ ref = obj->getRef(); -+ if (ref.num == 0) { -+ pdftex_fail -+ ("PDF inclusion: reference to invalid object" -+ " (is the included pdf broken?)"); -+ } else -+ pdf_printf("%d 0 R", addOther(ref)); -+ } else { -+ pdftex_fail("PDF inclusion: type <%s> cannot be copied", -+ obj->getTypeName()); -+ } -+} -+ -+static void writeRefs() -+{ -+ InObj *r; -+ for (r = inObjList; r != 0; r = r->next) { -+ if (!r->written) { -+ r->written = 1; -+ Object obj1 = xref->fetch(r->ref.num, r->ref.gen); -+ if (r->type == objFont) { -+ assert(!obj1.isStream()); -+ pdfbeginobj(r->num, 2); // \pdfobjcompresslevel = 2 is for this -+ copyFontDict(&obj1, r); -+ pdf_puts("\n"); -+ pdfendobj(); -+ } else if (r->type != objFontDesc) { // /FontDescriptor is written via write_fontdescriptor() -+ if (obj1.isStream()) -+ pdfbeginobj(r->num, 0); -+ else -+ pdfbeginobj(r->num, 2); // \pdfobjcompresslevel = 2 is for this -+ copyObject(&obj1); -+ pdf_puts("\n"); -+ pdfendobj(); -+ } -+ } -+ } -+} -+ -+static void writeEncodings() -+{ -+ UsedEncoding *r, *n; -+ const char *glyphNames[256], *s; -+ int i; -+ for (r = encodingList; r != 0; r = r->next) { -+ for (i = 0; i < 256; i++) { -+ if (r->font->isCIDFont()) { -+ pdftex_fail -+ ("PDF inclusion: CID fonts are not supported" -+ " (try to disable font replacement to fix this)"); -+ } -+ if ((s = ((Gfx8BitFont *) r->font)->getCharName(i)) != 0) -+ glyphNames[i] = s; -+ else -+ glyphNames[i] = notdef; -+ } -+ epdf_write_enc(glyphNames, r->enc_objnum); -+ } -+ for (r = encodingList; r != 0; r = n) { -+ n = r->next; -+#ifdef POPPLER_VERSION -+ r->font->decRefCnt(); -+#else -+#error POPPLER_VERSION should be defined. -+#endif -+ delete r; -+ } -+} -+ -+// get the pagebox according to the pagebox_spec -+static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec) -+{ -+ if (pagebox_spec == pdfboxspecmedia) -+ return page->getMediaBox(); -+ else if (pagebox_spec == pdfboxspeccrop) -+ return page->getCropBox(); -+ else if (pagebox_spec == pdfboxspecbleed) -+ return page->getBleedBox(); -+ else if (pagebox_spec == pdfboxspectrim) -+ return page->getTrimBox(); -+ else if (pagebox_spec == pdfboxspecart) -+ return page->getArtBox(); -+ else -+ pdftex_fail("PDF inclusion: unknown value of pagebox spec (%i)", -+ (int) pagebox_spec); -+ return page->getMediaBox(); // to make the compiler happy -+} -+ -+ -+// Reads various information about the PDF and sets it up for later inclusion. -+// This will fail if the PDF version of the PDF is higher than -+// minor_pdf_version_wanted or page_name is given and can not be found. -+// It makes no sense to give page_name _and_ page_num. -+// Returns the page number. -+ -+int -+read_pdf_info(char *image_name, char *page_name, int page_num, -+ int pagebox_spec, int major_pdf_version_wanted, int minor_pdf_version_wanted, -+ int pdf_inclusion_errorlevel) -+{ -+ PdfDocument *pdf_doc; -+ Page *page; -+ const PDFRectangle *pagebox; -+#ifdef POPPLER_VERSION -+ int pdf_major_version_found, pdf_minor_version_found; -+#else -+#error POPPLER_VERSION should be defined. -+#endif -+ // initialize -+ if (!isInit) { -+ globalParams = new GlobalParams(); -+ globalParams->setErrQuiet(false); -+ isInit = true; -+ } -+ // open PDF file -+ pdf_doc = find_add_document(image_name); -+ epdf_doc = (void *) pdf_doc; -+ -+ // check PDF version -+ // this works only for PDF 1.x -- but since any versions of PDF newer -+ // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will -+ // then have to changed drastically anyway. -+#ifdef POPPLER_VERSION -+ pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); -+ pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion(); -+ if ((pdf_major_version_found > major_pdf_version_wanted) -+ || (pdf_minor_version_found > minor_pdf_version_wanted)) { -+ const char *msg = -+ "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed"; -+ if (pdf_inclusion_errorlevel > 0) { -+ pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted); -+ } else if (pdf_inclusion_errorlevel < 0) { -+ ; /* do nothing */ -+ } else { /* = 0, give warning */ -+ pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted); -+ } -+ } -+#else -+#error POPPLER_VERSION should be defined. -+#endif -+ epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages(); -+ if (page_name) { -+ // get page by name -+ GString name(page_name); -+ 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); -+ 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) -+ pdftex_fail("PDF inclusion: required page does not exist <%i>", -+ epdf_num_pages); -+ } -+ // get the required page -+ page = pdf_doc->doc->getCatalog()->getPage(page_num); -+ -+ // get the pagebox (media, crop...) to use. -+ pagebox = get_pagebox(page, pagebox_spec); -+ if (pagebox->x2 > pagebox->x1) { -+ epdf_orig_x = pagebox->x1; -+ epdf_width = pagebox->x2 - pagebox->x1; -+ } else { -+ epdf_orig_x = pagebox->x2; -+ epdf_width = pagebox->x1 - pagebox->x2; -+ } -+ if (pagebox->y2 > pagebox->y1) { -+ epdf_orig_y = pagebox->y1; -+ epdf_height = pagebox->y2 - pagebox->y1; -+ } else { -+ epdf_orig_y = pagebox->y2; -+ epdf_height = pagebox->y1 - pagebox->y2; -+ } -+ -+ // get page rotation -+ epdf_rotate = page->getRotate() % 360; -+ if (epdf_rotate < 0) -+ epdf_rotate += 360; -+ -+ // page group -+ if (page->getGroup() != NULL) -+ epdf_has_page_group = 1; // only flag that page group is present; -+ // the actual object number will be -+ // generated in pdftex.web -+ else -+ epdf_has_page_group = 0; // no page group present -+ -+ pdf_doc->xref = pdf_doc->doc->getXRef(); -+ return page_num; -+} -+ -+// writes the current epf_doc. -+// Here the included PDF is copied, so most errors that can happen during PDF -+// inclusion will arise here. -+ -+void write_epdf(void) -+{ -+ Page *page; -+ Ref *pageRef; -+ Dict *pageDict; -+ Object contents, obj1, obj2, pageObj, dictObj; -+ Object groupDict; -+ bool writeSepGroup = false; -+ Object info; -+ const char *key; -+ char s[256]; -+ int i, l; -+ int rotate; -+ double scale[6] = { 0, 0, 0, 0, 0, 0 }; -+ bool writematrix = false; -+ int suppress_ptex_info = getpdfsuppressptexinfo(); -+ static const char *pageDictKeys[] = { -+ "LastModified", -+ "Metadata", -+ "PieceInfo", -+ "SeparationInfo", -+// "Group", -+// "Resources", -+ NULL -+ }; -+ -+ PdfDocument *pdf_doc = (PdfDocument *) epdf_doc; -+ (pdf_doc->occurences)--; -+ xref = pdf_doc->xref; -+ inObjList = pdf_doc->inObjList; -+ encodingList = 0; -+ page = pdf_doc->doc->getCatalog()->getPage(epdf_selected_page); -+ pageRef = pdf_doc->doc->getCatalog()->getPageRef(epdf_selected_page); -+ pageObj = xref->fetch(pageRef->num, pageRef->gen); -+ pageDict = pageObj.getDict(); -+ rotate = page->getRotate(); -+ const PDFRectangle *pagebox; -+ // write the Page header -+ pdf_puts("/Type /XObject\n"); -+ pdf_puts("/Subtype /Form\n"); -+ pdf_puts("/FormType 1\n"); -+ -+ // write additional information -+ if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_FILENAME) == 0) { -+ pdf_printf("/%s.FileName (%s)\n", pdfkeyprefix, -+ convertStringToPDFString(pdf_doc->file_name, -+ strlen(pdf_doc->file_name))); -+ } -+ if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_PAGENUMBER) == 0) { -+ pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, (int) epdf_selected_page); -+ } -+ if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_INFODICT) == 0) { -+ info = pdf_doc->doc->getDocInfoNF(); -+ if (info.isRef()) { -+ // the info dict must be indirect (PDF Ref p. 61) -+ pdf_printf("/%s.InfoDict ", pdfkeyprefix); -+ pdf_printf("%d 0 R\n", addOther(info.getRef())); -+ } -+ } -+ // get the pagebox (media, crop...) to use. -+ pagebox = get_pagebox(page, epdf_page_box); -+ -+ // handle page rotation -+ if (rotate != 0) { -+ if (rotate % 90 == 0) { -+ // this handles only the simple case: multiple of 90s but these -+ // are the only values allowed according to the reference -+ // (v1.3, p. 78). -+ // the image is rotated around its center. -+ // the /Rotate key is clockwise while the matrix is -+ // counterclockwise :-% -+ tex_printf(", page is rotated %d degrees", rotate); -+ switch (rotate) { -+ case 90: -+ scale[1] = -1; -+ scale[2] = 1; -+ scale[4] = pagebox->x1 - pagebox->y1; -+ scale[5] = pagebox->y1 + pagebox->x2; -+ writematrix = true; -+ break; -+ case 180: -+ scale[0] = scale[3] = -1; -+ scale[4] = pagebox->x1 + pagebox->x2; -+ scale[5] = pagebox->y1 + pagebox->y2; -+ writematrix = true; -+ break; // width and height are exchanged -+ case 270: -+ scale[1] = 1; -+ scale[2] = -1; -+ scale[4] = pagebox->x1 + pagebox->y2; -+ scale[5] = pagebox->y1 - pagebox->x1; -+ writematrix = true; -+ break; -+ } -+ if (writematrix) { // The matrix is only written if the image is rotated. -+ sprintf(s, "/Matrix [%.8f %.8f %.8f %.8f %.8f %.8f]\n", -+ scale[0], -+ scale[1], scale[2], scale[3], scale[4], scale[5]); -+ pdf_puts(stripzeros(s)); -+ } -+ } -+ } -+ -+ sprintf(s, "/BBox [%.8f %.8f %.8f %.8f]\n", -+ pagebox->x1, pagebox->y1, pagebox->x2, pagebox->y2); -+ pdf_puts(stripzeros(s)); -+ -+ // Metadata validity check (as a stream it must be indirect) -+ dictObj = pageDict->lookupNF("Metadata"); -+ if (!dictObj.isNull() && !dictObj.isRef()) -+ pdftex_warn("PDF inclusion: /Metadata must be indirect object"); -+ -+ // copy selected items in Page dictionary except Resources & Group -+ for (i = 0; pageDictKeys[i] != NULL; i++) { -+ dictObj = pageDict->lookupNF(pageDictKeys[i]); -+ if (!dictObj.isNull()) { -+ pdf_newline(); -+ pdf_printf("/%s ", pageDictKeys[i]); -+ copyObject(&dictObj); // preserves indirection -+ } -+ } -+ -+ // handle page group -+ dictObj = pageDict->lookupNF("Group"); -+ if (!dictObj.isNull()) { -+ if (pdfpagegroupval == 0) { -+ // another pdf with page group was included earlier on the -+ // same page; copy the Group entry as is. See manual for -+ // info on why this is a warning. -+ if (getpdfsuppresswarningpagegroup() == 0) { -+ pdftex_warn -+ ("PDF inclusion: multiple pdfs with page group included in a single page"); -+ } -+ pdf_newline(); -+ pdf_puts("/Group "); -+ copyObject(&dictObj); -+ } else { -+ // write Group dict as a separate object, since the Page dict also refers to it -+ dictObj = pageDict->lookup("Group"); -+ if (!dictObj.isDict()) -+ pdftex_fail("PDF inclusion: /Group dict missing"); -+ writeSepGroup = true; -+/* -+This part is only a single line -+ groupDict = Object(page->getGroup()); -+in the original patch. In this case, however, pdftex crashes at -+"delete pdf_doc->doc" in "delete_document()" for inclusion of some -+kind of pdf images, for example, figure_missing.pdf in gnuplot. -+A change -+ groupDict = Object(page->getGroup()).copy(); -+does not improve the situation. -+The changes below seem to work fine. -+*/ -+// begin modification -+ groupDict = pageDict->lookup("Group"); -+ const Dict& dic1 = page->getGroup(); -+ const Dict& dic2 = groupDict.getDict(); -+ // replace dic2 in groupDict with dic1 -+ l = dic2.getLength(); -+ for (i = 0; i < l; i++) { -+ groupDict.dictRemove(dic2.getKey(i)); -+ } -+ l = dic1.getLength(); -+ for (i = 0; i < l; i++) { -+ groupDict.dictAdd(copyString(dic1.getKey(i)), -+ dic1.getValNF(i)); -+ } -+// end modification -+ pdf_printf("/Group %ld 0 R\n", (long)pdfpagegroupval); -+ } -+ } -+ -+ // write the Resources dictionary -+ if (page->getResourceDict() == NULL) { -+ // Resources can be missing (files without them have been spotted -+ // in the wild); in which case the /Resouces of the /Page will be used. -+ // "This practice is not recommended". -+ pdftex_warn -+ ("PDF inclusion: /Resources missing. 'This practice is not recommended' (PDF Ref)"); -+ } else { -+ Object *obj1 = page->getResourceDictObject(); -+ if (!obj1->isDict()) -+ pdftex_fail("PDF inclusion: invalid resources dict type <%s>", -+ obj1->getTypeName()); -+ pdf_newline(); -+ pdf_puts("/Resources <<\n"); -+ for (i = 0, l = obj1->dictGetLength(); i < l; ++i) { -+ obj2 = obj1->dictGetVal(i); -+ key = obj1->dictGetKey(i); -+ if (strcmp("Font", key) == 0) -+ copyFontResources(&obj2); -+ else if (strcmp("ProcSet", key) == 0) -+ copyProcSet(&obj2); -+ else -+ copyOtherResources(&obj2, key); -+ } -+ pdf_puts(">>\n"); -+ } -+ -+ // write the page contents -+ contents = page->getContents(); -+ if (contents.isStream()) { -+ -+ // Variant A: get stream and recompress under control -+ // of \pdfcompresslevel -+ // -+ // pdfbeginstream(); -+ // copyStream(contents->getStream()); -+ // pdfendstream(); -+ -+ // Variant B: copy stream without recompressing -+ // -+ obj1 = contents.streamGetDict()->lookup("F"); -+ if (!obj1.isNull()) { -+ pdftex_fail("PDF inclusion: Unsupported external stream"); -+ } -+ obj1 = contents.streamGetDict()->lookup("Length"); -+ assert(!obj1.isNull()); -+ pdf_puts("/Length "); -+ copyObject(&obj1); -+ pdf_puts("\n"); -+ obj1 = contents.streamGetDict()->lookup("Filter"); -+ if (!obj1.isNull()) { -+ pdf_puts("/Filter "); -+ copyObject(&obj1); -+ pdf_puts("\n"); -+ obj1 = contents.streamGetDict()->lookup("DecodeParms"); -+ if (!obj1.isNull()) { -+ pdf_puts("/DecodeParms "); -+ copyObject(&obj1); -+ pdf_puts("\n"); -+ } -+ } -+ pdf_puts(">>\nstream\n"); -+ copyStream(contents.getStream()->getUndecodedStream()); -+ pdfendstream(); -+ } else if (contents.isArray()) { -+ pdfbeginstream(); -+ for (i = 0, l = contents.arrayGetLength(); i < l; ++i) { -+ Object contentsobj = contents.arrayGet(i); -+ copyStream(contentsobj.getStream()); -+ if (i < l - 1) -+ pdf_newline(); // add a newline after each stream except the last -+ } -+ pdfendstream(); -+ } else { // the contents are optional, but we need to include an empty stream -+ pdfbeginstream(); -+ pdfendstream(); -+ } -+ -+ // write out all indirect objects -+ writeRefs(); -+ -+ // write out all used encodings (and delete list) -+ writeEncodings(); -+ -+ // write the Group dict if needed -+ if (writeSepGroup) { -+ pdfbeginobj(pdfpagegroupval, 2); -+ copyObject(&groupDict); -+ pdf_puts("\n"); -+ pdfendobj(); -+ pdfpagegroupval = 0; // only the 1st included pdf on a page gets its -+ // Group included in the Page dict -+ } -+ -+ // save object list, xref -+ pdf_doc->inObjList = inObjList; -+ pdf_doc->xref = xref; -+} -+ -+// Called when an image has been written and it's resources in image_tab are -+// freed and it's not referenced anymore. -+ -+void epdf_delete() -+{ -+ PdfDocument *pdf_doc = (PdfDocument *) epdf_doc; -+ xref = pdf_doc->xref; -+ if (pdf_doc->occurences < 0) { -+ delete_document(pdf_doc); -+ } -+} -+ -+// Called when PDF embedding system is finalized. -+// Now deallocate all remaining PdfDocuments. -+ -+void epdf_check_mem() -+{ -+ if (isInit) { -+ PdfDocument *p, *n; -+ for (p = pdfDocuments; p; p = n) { -+ n = p->next; -+ delete_document(p); -+ } -+ // see above for globalParams -+ delete globalParams; -+ } -+} diff --git a/source-poppler0.79.0.patch b/source-poppler0.79.0.patch deleted file mode 100644 index faf4f4d..0000000 --- a/source-poppler0.79.0.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 3c5802812e0ae918ba5979e6a16abe39d0e2d7bf Mon Sep 17 00:00:00 2001 -From: Jiri Slaby -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 - diff --git a/source-poppler0.83.0.patch b/source-poppler0.83.0.patch deleted file mode 100644 index f7557db..0000000 --- a/source-poppler0.83.0.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Mike Gorse -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->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(); - 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; - } diff --git a/source-poppler0.86.0.patch b/source-poppler0.86.0.patch deleted file mode 100644 index dabd1c0..0000000 --- a/source-poppler0.86.0.patch +++ /dev/null @@ -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 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) diff --git a/source-ppc64.dif b/source-ppc64.dif index 6f4b58a..33e6b1a 100644 --- a/source-ppc64.dif +++ b/source-ppc64.dif @@ -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 diff --git a/source-warns.dif b/source-warns.dif index 8b588c4..e7b328f 100644 --- a/source-warns.dif +++ b/source-warns.dif @@ -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) \ diff --git a/source.dif b/source.dif index 526cfa2..78f9c2b 100644 --- a/source.dif +++ b/source.dif @@ -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 #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 /* 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 diff --git a/texlive-20200327-source.tar.xz b/texlive-20200327-source.tar.xz deleted file mode 100644 index c33161d..0000000 --- a/texlive-20200327-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08101d413463d361bc07678ecad2bafe767c3a2f20df259d7e011a7b25b8839b -size 55412152 diff --git a/texlive-20210325-source.tar.xz b/texlive-20210325-source.tar.xz new file mode 100644 index 0000000..40dc4f2 --- /dev/null +++ b/texlive-20210325-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b +size 54837368 diff --git a/texlive.changes b/texlive.changes index 4372a62..6fcfd0f 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Apr 6 14:03:37 UTC 2021 - Dr. Werner Fink + +- 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 diff --git a/texlive.spec b/texlive.spec index 7b848c2..b8a035b 100644 --- a/texlive.spec +++ b/texlive.spec @@ -16,11 +16,11 @@ # -%define texlive_version 2020 -%define texlive_previous 2019 -%define texlive_release 20200327 -%define texlive_noarch 182 -%define texlive_source texlive-20200327-source +%define texlive_version 2021 +%define texlive_previous 2020 +%define texlive_release 20210325 +%define texlive_noarch 183 +%define texlive_source texlive-20210325-source %define __perl_requires %{nil} %define __os_install_post /usr/lib/rpm/brp-compress \\\ @@ -44,12 +44,6 @@ %endif %bcond_with LuaJIT -# -# poppler -- use system wide libpoppler -# -%global with_poppler 1 -%bcond_with poppler - # psutils -- is also available as the package psutils and therefore # not necessary required, enabling the resulting psutils # cause dependency on package collection-fontutils @@ -71,37 +65,37 @@ Name: texlive Version: %{texlive_version}.%{texlive_release} Release: 0 Summary: The TeXLive Formatting System -License: GPL-2.0-or-later AND GPL-2.0-only AND GPL-3.0-only AND LPPL-1.3c AND LPPL-1.0 AND Artistic-1.0 AND Apache-2.0 AND MIT AND BSD-3-Clause AND SUSE-TeX AND SUSE-Public-Domain +License: Apache-2.0 AND Artistic-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LPPL-1.3c AND LPPL-1.0 AND MIT AND BSD-3-Clause AND SUSE-TeX AND SUSE-Public-Domain Group: Productivity/Publishing/TeX/Base URL: http://www.tug.org/texlive/ -PreReq: /usr/bin/perl +PreReq: %{name}-filesystem >= %{texlive_version} +PreReq: %{name}-kpathsea >= %{texlive_version} +PreReq: %{name}-kpathsea-bin >= %{texlive_version} +PreReq: %{name}-scripts >= %{texlive_version} PreReq: /usr/bin/clear PreReq: /usr/bin/dialog +PreReq: /usr/bin/perl PreReq: coreutils PreReq: ed PreReq: findutils PreReq: grep PreReq: sed -PreReq: %{name}-filesystem >= %{texlive_version} -PreReq: %{name}-kpathsea-bin >= %{texlive_version} -PreReq: %{name}-kpathsea >= %{texlive_version} -PreReq: %{name}-scripts >= %{texlive_version} #!BuildIgnore: %{name}-kpathsea-bin #!BuildIgnore: %{name}-kpathsea #!BuildIgnore: %{name}-scripts-bin #!BuildIgnore: %{name}-scripts Requires(post): coreutils -Requires(postun): coreutils -Requires(posttrans): coreutils -Requires(posttrans): ed -Requires(posttrans): findutils -Requires(posttrans): grep -Requires(posttrans): sed -Requires(posttrans): %{name}-filesystem >= %{texlive_version} -Requires(posttrans): %{name}-kpathsea-bin >= %{texlive_version} -Requires(posttrans): %{name}-kpathsea >= %{texlive_version} -Requires(posttrans): %{name}-scripts-bin >= %{texlive_version} -Requires(posttrans): %{name}-scripts >= %{texlive_version} +Requires(postun):coreutils +Requires(posttrans):coreutils +Requires(posttrans):ed +Requires(posttrans):findutils +Requires(posttrans):grep +Requires(posttrans):sed +Requires(posttrans):%{name}-filesystem >= %{texlive_version} +Requires(posttrans):%{name}-kpathsea-bin >= %{texlive_version} +Requires(posttrans):%{name}-kpathsea >= %{texlive_version} +Requires(posttrans):%{name}-scripts-bin >= %{texlive_version} +Requires(posttrans):%{name}-scripts >= %{texlive_version} Recommends: %{name}-scheme-medium BuildRequires: autoconf BuildRequires: automake @@ -142,7 +136,6 @@ BuildRequires: libjpeg-devel BuildRequires: libopenssl-devel BuildRequires: libpaper-devel BuildRequires: libpng-devel -BuildRequires: libpoppler-devel BuildRequires: libsigsegv-devel BuildRequires: libtool BuildRequires: libxml2-devel @@ -228,7 +221,7 @@ BuildRequires: perl(Text::BibTeX) >= 0.85 BuildRequires: perl(Text::CSV) BuildRequires: perl(Text::CSV_XS) BuildRequires: perl(Text::Roman) -BuildRequires: perl(Unicode::Collate) >= 1.25 +BuildRequires: perl(Unicode::Collate) >= 1.29 BuildRequires: perl(Unicode::GCString) BuildRequires: perl(Unicode::LineBreak) BuildRequires: perl(Unicode::Normalize) >= 1.23 @@ -238,7 +231,7 @@ BuildRequires: perl(XML::Writer::String) %endif # Download at ftp://tug.org/texlive/historic/%{texlive_version}/ Source0: %{texlive_source}.tar.xz -Source3: biber-2.14.tar.xz +Source3: biber-2.16.tar.xz Source4: cnf-to-paths.awk Source30: texlive-rpmlintrc Source50: public.c @@ -250,11 +243,9 @@ Patch3: source-arraysubs.dif Patch5: source-texdoc.dif Patch6: source-dviutils.dif Patch8: source-psutils.dif -Patch10: source-poppler.dif Patch11: source-lacheck.dif Patch12: source-warns.dif Patch13: source-x11r7.dif -Patch15: source-overflow.dif Patch17: source-64.dif Patch18: source-a2ping.dif Patch19: source-dvipng.dif @@ -266,24 +257,8 @@ Patch42: biblatex-encoding.dif Patch44: biber-certs.dif # PATCH-FIX-SUSE Make biber work with perl 5.18.2 Patch47: biber-perl-5.18.2.dif -# PATCH-FIX-SUSE Support older poppler version as well -Patch53: source-poppler0.59.0.patch -# PATCH-FIX-TEXLIVE -Patch54: source-fix-const-poppler0.66.0.patch -# PATCH-FIX-TEXLIVE -Patch55: source-fix-bool-poppler.patch -# PATCH-FIX-TEXLIVE -Patch56: source-poppler-use-std_string.patch -# PATCH-FIX-SUSE Fix leaking string copy -Patch57: source-poppler-fix-dict-memleak.patch -# PATCH-FIX-TEXLIVE -Patch58: source-poppler0.79.0.patch -# PATCH-FIX-TEXLIVE -Patch61: source-poppler0.83.0.patch # PATCH-FIX-SUSE Let it build even without ls-R files around Patch62: source-psutils-kpathsea.dif -# PATCH-FIX-UPSTREAM source-poppler0.86.0.patch -Patch64: source-poppler0.86.0.patch # PATCH-FIX-SUSE Support luajit on ppc64/ppc64le Patch104: 0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch # PATCH-FIX-SUSE Support luajit fix for arm64 @@ -323,6 +298,7 @@ Obsoletes: pdfjam < %{version} # %define texgrp mktex %define texusr mktex + #define texgid 505 #define texuid 505 # @@ -355,12 +331,11 @@ dvips, etc., shell script configuration, and a big collection of documentations. This package is easily configured by the script texconfig and has multilanguage options. - %package a2ping-bin Version: %{texlive_version}.%{texlive_release}.svn27321 Release: 0 -Summary: Binary files of a2ping License: LPPL-1.0 +Summary: Binary files of a2ping Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-a2ping >= %{texlive_version} @@ -373,8 +348,8 @@ Binary files of a2ping %package accfonts-bin Version: %{texlive_version}.%{texlive_release}.svn12688 Release: 0 -Summary: Binary files of accfonts License: LPPL-1.0 +Summary: Binary files of accfonts Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-accfonts >= %{texlive_version} @@ -387,8 +362,8 @@ Binary files of accfonts %package adhocfilelist-bin Version: %{texlive_version}.%{texlive_release}.svn28038 Release: 0 -Summary: Binary files of adhocfilelist License: LPPL-1.0 +Summary: Binary files of adhocfilelist Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-adhocfilelist >= %{texlive_version} @@ -399,10 +374,10 @@ Prefix: %{_bindir} Binary files of adhocfilelist %package afm2pl-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of afm2pl License: LPPL-1.0 +Summary: Binary files of afm2pl Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-afm2pl >= %{texlive_version} @@ -412,11 +387,25 @@ Prefix: %{_bindir} %description afm2pl-bin Binary files of afm2pl -%package aleph-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +%package albatross-bin +Version: %{texlive_version}.%{texlive_release}.svn57089 Release: 0 -Summary: Binary files of aleph License: LPPL-1.0 +Summary: Binary files of albatross +Group: Productivity/Publishing/TeX/Utilities +URL: http://www.tug.org/texlive/ +Requires(pre): texlive-albatross >= %{texlive_version} +#!BuildIgnore: texlive-albatross +Prefix: %{_bindir} + +%description albatross-bin +Binary files of albatross + +%package aleph-bin +Version: %{texlive_version}.%{texlive_release}.svn58378 +Release: 0 +License: LPPL-1.0 +Summary: Binary files of aleph Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-aleph >= %{texlive_version} @@ -429,15 +418,15 @@ Binary files of aleph %package amstex-bin Version: %{texlive_version}.%{texlive_release}.svn3006 Release: 0 -Summary: Binary files of amstex License: LPPL-1.0 +Summary: Binary files of amstex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-amstex >= %{texlive_version} #!BuildIgnore: texlive-amstex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description amstex-bin @@ -446,8 +435,8 @@ Binary files of amstex %package arara-bin Version: %{texlive_version}.%{texlive_release}.svn29036 Release: 0 -Summary: Binary files of arara License: LPPL-1.0 +Summary: Binary files of arara Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-arara >= %{texlive_version} @@ -458,10 +447,10 @@ Prefix: %{_bindir} Binary files of arara %package asymptote-bin -Version: %{texlive_version}.%{texlive_release}.svn54575 +Version: %{texlive_version}.%{texlive_release}.svn57890 Release: 0 -Summary: Binary files of asymptote License: LPPL-1.0 +Summary: Binary files of asymptote Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-asymptote >= %{texlive_version} @@ -474,8 +463,8 @@ Binary files of asymptote %package attachfile2-bin Version: %{texlive_version}.%{texlive_release}.svn52909 Release: 0 -Summary: Binary files of attachfile2 License: LPPL-1.0 +Summary: Binary files of attachfile2 Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-attachfile2 >= %{texlive_version} @@ -488,8 +477,8 @@ Binary files of attachfile2 %package authorindex-bin Version: %{texlive_version}.%{texlive_release}.svn18790 Release: 0 -Summary: Binary files of authorindex License: LPPL-1.0 +Summary: Binary files of authorindex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-authorindex >= %{texlive_version} @@ -500,10 +489,10 @@ Prefix: %{_bindir} Binary files of authorindex %package autosp-bin -Version: %{texlive_version}.%{texlive_release}.svn54358 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of autosp License: LPPL-1.0 +Summary: Binary files of autosp Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-autosp >= %{texlive_version} @@ -514,10 +503,10 @@ Prefix: %{_bindir} Binary files of autosp %package axodraw2-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn58378 Release: 0 -Summary: Binary files of axodraw2 License: LPPL-1.0 +Summary: Binary files of axodraw2 Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-axodraw2 >= %{texlive_version} @@ -530,8 +519,8 @@ Binary files of axodraw2 %package bib2gls-bin Version: %{texlive_version}.%{texlive_release}.svn45266 Release: 0 -Summary: Binary files of bib2gls License: LPPL-1.0 +Summary: Binary files of bib2gls Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-bib2gls >= %{texlive_version} @@ -542,10 +531,10 @@ Prefix: %{_bindir} Binary files of bib2gls %package biber-bin -Version: %{texlive_version}.%{texlive_release}.svn53064 +Version: %{texlive_version}.%{texlive_release}.svn57273 Release: 0 -Summary: Binary files of biber License: LPPL-1.0 +Summary: Binary files of biber Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ %if %{with buildbiber} @@ -570,8 +559,8 @@ Binary files of biber %package bibexport-bin Version: %{texlive_version}.%{texlive_release}.svn16219 Release: 0 -Summary: Binary files of bibexport License: LPPL-1.0 +Summary: Binary files of bibexport Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-bibexport >= %{texlive_version} @@ -582,51 +571,51 @@ Prefix: %{_bindir} Binary files of bibexport %package bibtex-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of bibtex License: LPPL-1.0 +Summary: Binary files of bibtex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-bibtex >= %{texlive_version} #!BuildIgnore: texlive-bibtex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description bibtex-bin Binary files of bibtex %package bibtex8-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of bibtex8 License: LPPL-1.0 +Summary: Binary files of bibtex8 Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-bibtex8 >= %{texlive_version} #!BuildIgnore: texlive-bibtex8 +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description bibtex8-bin Binary files of bibtex8 %package bibtexu-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of bibtexu License: LPPL-1.0 +Summary: Binary files of bibtexu Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-bibtexu >= %{texlive_version} #!BuildIgnore: texlive-bibtexu +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description bibtexu-bin @@ -635,8 +624,8 @@ Binary files of bibtexu %package bundledoc-bin Version: %{texlive_version}.%{texlive_release}.svn17794 Release: 0 -Summary: Binary files of bundledoc License: LPPL-1.0 +Summary: Binary files of bundledoc Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-bundledoc >= %{texlive_version} @@ -649,8 +638,8 @@ Binary files of bundledoc %package cachepic-bin Version: %{texlive_version}.%{texlive_release}.svn15543 Release: 0 -Summary: Binary files of cachepic License: LPPL-1.0 +Summary: Binary files of cachepic Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-cachepic >= %{texlive_version} @@ -663,8 +652,8 @@ Binary files of cachepic %package checkcites-bin Version: %{texlive_version}.%{texlive_release}.svn25623 Release: 0 -Summary: Binary files of checkcites License: LPPL-1.0 +Summary: Binary files of checkcites Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-checkcites >= %{texlive_version} @@ -677,8 +666,8 @@ Binary files of checkcites %package checklistings-bin Version: %{texlive_version}.%{texlive_release}.svn38300 Release: 0 -Summary: Binary files of checklistings License: LPPL-1.0 +Summary: Binary files of checklistings Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-checklistings >= %{texlive_version} @@ -691,8 +680,8 @@ Binary files of checklistings %package chklref-bin Version: %{texlive_version}.%{texlive_release}.svn52631 Release: 0 -Summary: Binary files of chklref License: LPPL-1.0 +Summary: Binary files of chklref Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-chklref >= %{texlive_version} @@ -703,17 +692,17 @@ Prefix: %{_bindir} Binary files of chklref %package chktex-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of chktex License: LPPL-1.0 +Summary: Binary files of chktex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-chktex >= %{texlive_version} #!BuildIgnore: texlive-chktex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description chktex-bin @@ -722,8 +711,8 @@ Binary files of chktex %package cjk-gs-integrate-bin Version: %{texlive_version}.%{texlive_release}.svn37223 Release: 0 -Summary: Binary files of cjk-gs-integrate License: LPPL-1.0 +Summary: Binary files of cjk-gs-integrate Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-cjk-gs-integrate >= %{texlive_version} @@ -734,10 +723,10 @@ Prefix: %{_bindir} Binary files of cjk-gs-integrate %package cjkutils-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of cjkutils License: LPPL-1.0 +Summary: Binary files of cjkutils Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-bin-cjk <= %{texlive_previous} @@ -751,8 +740,8 @@ Binary files of cjkutils %package clojure-pamphlet-bin Version: %{texlive_version}.%{texlive_release}.svn51944 Release: 0 -Summary: Binary files of clojure-pamphlet License: LPPL-1.0 +Summary: Binary files of clojure-pamphlet Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-clojure-pamphlet >= %{texlive_version} @@ -765,15 +754,15 @@ Binary files of clojure-pamphlet %package cluttex-bin Version: %{texlive_version}.%{texlive_release}.svn48871 Release: 0 -Summary: Binary files of cluttex License: LPPL-1.0 +Summary: Binary files of cluttex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-cluttex >= %{texlive_version} #!BuildIgnore: texlive-cluttex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description cluttex-bin @@ -782,15 +771,15 @@ Binary files of cluttex %package context-bin Version: %{texlive_version}.%{texlive_release}.svn34112 Release: 0 -Summary: Binary files of context License: LPPL-1.0 +Summary: Binary files of context Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-context >= %{texlive_version} #!BuildIgnore: texlive-context +Recommends: texlive-collection-context >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-context >= %{texlive_version} Prefix: %{_bindir} %description context-bin @@ -799,8 +788,8 @@ Binary files of context %package convbkmk-bin Version: %{texlive_version}.%{texlive_release}.svn30408 Release: 0 -Summary: Binary files of convbkmk License: LPPL-1.0 +Summary: Binary files of convbkmk Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-convbkmk >= %{texlive_version} @@ -813,8 +802,8 @@ Binary files of convbkmk %package crossrefware-bin Version: %{texlive_version}.%{texlive_release}.svn45927 Release: 0 -Summary: Binary files of crossrefware License: LPPL-1.0 +Summary: Binary files of crossrefware Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-crossrefware >= %{texlive_version} @@ -827,8 +816,8 @@ Binary files of crossrefware %package cslatex-bin Version: %{texlive_version}.%{texlive_release}.svn3006 Release: 0 -Summary: Binary files of cslatex License: LPPL-1.0 +Summary: Binary files of cslatex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-cslatex >= %{texlive_version} @@ -844,8 +833,8 @@ Binary files of cslatex %package csplain-bin Version: %{texlive_version}.%{texlive_release}.svn50528 Release: 0 -Summary: Binary files of csplain License: LPPL-1.0 +Summary: Binary files of csplain Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-csplain >= %{texlive_version} @@ -858,8 +847,8 @@ Binary files of csplain %package ctan-o-mat-bin Version: %{texlive_version}.%{texlive_release}.svn46996 Release: 0 -Summary: Binary files of ctan-o-mat License: LPPL-1.0 +Summary: Binary files of ctan-o-mat Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ctan-o-mat >= %{texlive_version} @@ -872,8 +861,8 @@ Binary files of ctan-o-mat %package ctanbib-bin Version: %{texlive_version}.%{texlive_release}.svn48478 Release: 0 -Summary: Binary files of ctanbib License: LPPL-1.0 +Summary: Binary files of ctanbib Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ctanbib >= %{texlive_version} @@ -886,8 +875,8 @@ Binary files of ctanbib %package ctanify-bin Version: %{texlive_version}.%{texlive_release}.svn24061 Release: 0 -Summary: Binary files of ctanify License: LPPL-1.0 +Summary: Binary files of ctanify Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ctanify >= %{texlive_version} @@ -900,8 +889,8 @@ Binary files of ctanify %package ctanupload-bin Version: %{texlive_version}.%{texlive_release}.svn23866 Release: 0 -Summary: Binary files of ctanupload License: LPPL-1.0 +Summary: Binary files of ctanupload Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ctanupload >= %{texlive_version} @@ -912,10 +901,10 @@ Prefix: %{_bindir} Binary files of ctanupload %package ctie-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of ctie License: LPPL-1.0 +Summary: Binary files of ctie Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ctie >= %{texlive_version} @@ -926,10 +915,10 @@ Prefix: %{_bindir} Binary files of ctie %package cweb-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn58136 Release: 0 -Summary: Binary files of cweb License: LPPL-1.0 +Summary: Binary files of cweb Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-cweb >= %{texlive_version} @@ -942,8 +931,8 @@ Binary files of cweb %package cyrillic-bin-bin Version: %{texlive_version}.%{texlive_release}.svn53554 Release: 0 -Summary: Binary files of cyrillic-bin License: LPPL-1.0 +Summary: Binary files of cyrillic-bin Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-cyrillic-bin >= %{texlive_version} @@ -956,8 +945,8 @@ Binary files of cyrillic-bin %package de-macro-bin Version: %{texlive_version}.%{texlive_release}.svn17399 Release: 0 -Summary: Binary files of de-macro License: LPPL-1.0 +Summary: Binary files of de-macro Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-de-macro >= %{texlive_version} @@ -968,17 +957,17 @@ Prefix: %{_bindir} Binary files of de-macro %package detex-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of detex License: LPPL-1.0 +Summary: Binary files of detex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-detex >= %{texlive_version} #!BuildIgnore: texlive-detex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description detex-bin @@ -987,8 +976,8 @@ Binary files of detex %package diadia-bin Version: %{texlive_version}.%{texlive_release}.svn37645 Release: 0 -Summary: Binary files of diadia License: LPPL-1.0 +Summary: Binary files of diadia Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ BuildArch: noarch @@ -1002,8 +991,8 @@ Binary files of diadia %package dosepsbin-bin Version: %{texlive_version}.%{texlive_release}.svn24759 Release: 0 -Summary: Binary files of dosepsbin License: LPPL-1.0 +Summary: Binary files of dosepsbin Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dosepsbin >= %{texlive_version} @@ -1014,10 +1003,10 @@ Prefix: %{_bindir} Binary files of dosepsbin %package dtl-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of dtl License: LPPL-1.0 +Summary: Binary files of dtl Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dtl >= %{texlive_version} @@ -1030,8 +1019,8 @@ Binary files of dtl %package dtxgen-bin Version: %{texlive_version}.%{texlive_release}.svn29031 Release: 0 -Summary: Binary files of dtxgen License: LPPL-1.0 +Summary: Binary files of dtxgen Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dtxgen >= %{texlive_version} @@ -1044,8 +1033,8 @@ Binary files of dtxgen %package dviasm-bin Version: %{texlive_version}.%{texlive_release}.svn8329 Release: 0 -Summary: Binary files of dviasm License: LPPL-1.0 +Summary: Binary files of dviasm Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dviasm >= %{texlive_version} @@ -1056,10 +1045,10 @@ Prefix: %{_bindir} Binary files of dviasm %package dvicopy-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of dvicopy License: LPPL-1.0 +Summary: Binary files of dvicopy Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dvicopy >= %{texlive_version} @@ -1070,10 +1059,10 @@ Prefix: %{_bindir} Binary files of dvicopy %package dvidvi-bin -Version: %{texlive_version}.%{texlive_release}.svn50281 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of dvidvi License: LPPL-1.0 +Summary: Binary files of dvidvi Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dvidvi >= %{texlive_version} @@ -1086,8 +1075,8 @@ Binary files of dvidvi %package dviinfox-bin Version: %{texlive_version}.%{texlive_release}.svn44515 Release: 0 -Summary: Binary files of dviinfox License: LPPL-1.0 +Summary: Binary files of dviinfox Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dviinfox >= %{texlive_version} @@ -1098,10 +1087,10 @@ Prefix: %{_bindir} Binary files of dviinfox %package dviljk-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of dviljk License: LPPL-1.0 +Summary: Binary files of dviljk Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-bin-dvilj <= %{texlive_previous} @@ -1114,10 +1103,10 @@ Prefix: %{_bindir} Binary files of dviljk %package dviout-util-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of dviout-util License: LPPL-1.0 +Summary: Binary files of dviout-util Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dviout-util >= %{texlive_version} @@ -1128,10 +1117,10 @@ Prefix: %{_bindir} Binary files of dviout-util %package dvipdfmx-bin -Version: %{texlive_version}.%{texlive_release}.svn54346 +Version: %{texlive_version}.%{texlive_release}.svn58535 Release: 0 -Summary: Binary files of dvipdfmx License: LPPL-1.0 +Summary: Binary files of dvipdfmx Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-dvipdfm-bin <= 2012 @@ -1146,10 +1135,10 @@ Prefix: %{_bindir} Binary files of dvipdfmx %package dvipng-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of dvipng License: LPPL-1.0 +Summary: Binary files of dvipng Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dvipng >= %{texlive_version} @@ -1160,10 +1149,10 @@ Prefix: %{_bindir} Binary files of dvipng %package dvipos-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of dvipos License: LPPL-1.0 +Summary: Binary files of dvipos Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dvipos >= %{texlive_version} @@ -1174,10 +1163,10 @@ Prefix: %{_bindir} Binary files of dvipos %package dvips-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of dvips License: LPPL-1.0 +Summary: Binary files of dvips Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dvips >= %{texlive_version} @@ -1188,10 +1177,10 @@ Prefix: %{_bindir} Binary files of dvips %package dvisvgm-bin -Version: %{texlive_version}.%{texlive_release}.svn54460 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of dvisvgm License: LPPL-1.0 +Summary: Binary files of dvisvgm Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-dvisvgm >= %{texlive_version} @@ -1204,8 +1193,8 @@ Binary files of dvisvgm %package eplain-bin Version: %{texlive_version}.%{texlive_release}.svn3006 Release: 0 -Summary: Binary files of eplain License: LPPL-1.0 +Summary: Binary files of eplain Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-eplain >= %{texlive_version} @@ -1218,8 +1207,8 @@ Binary files of eplain %package epspdf-bin Version: %{texlive_version}.%{texlive_release}.svn29050 Release: 0 -Summary: Binary files of epspdf License: LPPL-1.0 +Summary: Binary files of epspdf Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-epspdf >= %{texlive_version} @@ -1232,8 +1221,8 @@ Binary files of epspdf %package epstopdf-bin Version: %{texlive_version}.%{texlive_release}.svn18336 Release: 0 -Summary: Binary files of epstopdf License: LPPL-1.0 +Summary: Binary files of epstopdf Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-epstopdf >= %{texlive_version} @@ -1246,15 +1235,15 @@ Binary files of epstopdf %package exceltex-bin Version: %{texlive_version}.%{texlive_release}.svn25860 Release: 0 -Summary: Binary files of exceltex License: LPPL-1.0 +Summary: Binary files of exceltex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-exceltex >= %{texlive_version} #!BuildIgnore: texlive-exceltex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description exceltex-bin @@ -1263,8 +1252,8 @@ Binary files of exceltex %package fig4latex-bin Version: %{texlive_version}.%{texlive_release}.svn14752 Release: 0 -Summary: Binary files of fig4latex License: LPPL-1.0 +Summary: Binary files of fig4latex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-fig4latex >= %{texlive_version} @@ -1280,8 +1269,8 @@ Binary files of fig4latex %package findhyph-bin Version: %{texlive_version}.%{texlive_release}.svn14758 Release: 0 -Summary: Binary files of findhyph License: LPPL-1.0 +Summary: Binary files of findhyph Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-findhyph >= %{texlive_version} @@ -1294,8 +1283,8 @@ Binary files of findhyph %package fontinst-bin Version: %{texlive_version}.%{texlive_release}.svn53554 Release: 0 -Summary: Binary files of fontinst License: LPPL-1.0 +Summary: Binary files of fontinst Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-fontinst >= %{texlive_version} @@ -1308,8 +1297,8 @@ Binary files of fontinst %package fontools-bin Version: %{texlive_version}.%{texlive_release}.svn25997 Release: 0 -Summary: Binary files of fontools License: LPPL-1.0 +Summary: Binary files of fontools Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-fontools >= %{texlive_version} @@ -1320,10 +1309,10 @@ Prefix: %{_bindir} Binary files of fontools %package fontware-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of fontware License: LPPL-1.0 +Summary: Binary files of fontware Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-fontware >= %{texlive_version} @@ -1336,8 +1325,8 @@ Binary files of fontware %package fragmaster-bin Version: %{texlive_version}.%{texlive_release}.svn13663 Release: 0 -Summary: Binary files of fragmaster License: LPPL-1.0 +Summary: Binary files of fragmaster Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-fragmaster >= %{texlive_version} @@ -1350,8 +1339,8 @@ Binary files of fragmaster %package getmap-bin Version: %{texlive_version}.%{texlive_release}.svn34971 Release: 0 -Summary: Binary files of getmap License: LPPL-1.0 +Summary: Binary files of getmap Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-getmap >= %{texlive_version} @@ -1364,8 +1353,8 @@ Binary files of getmap %package git-latexdiff-bin Version: %{texlive_version}.%{texlive_release}.svn54732 Release: 0 -Summary: Binary files of git-latexdiff License: LPPL-1.0 +Summary: Binary files of git-latexdiff Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-git-latexdiff >= %{texlive_version} @@ -1381,8 +1370,8 @@ Binary files of git-latexdiff %package glossaries-bin Version: %{texlive_version}.%{texlive_release}.svn37813 Release: 0 -Summary: Binary files of glossaries License: LPPL-1.0 +Summary: Binary files of glossaries Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-glossaries >= %{texlive_version} @@ -1393,27 +1382,27 @@ Prefix: %{_bindir} Binary files of glossaries %package gregoriotex-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn58378 Release: 0 -Summary: Binary files of gregoriotex License: LPPL-1.0 +Summary: Binary files of gregoriotex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-gregoriotex >= %{texlive_version} #!BuildIgnore: texlive-gregoriotex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description gregoriotex-bin Binary files of gregoriotex %package gsftopk-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of gsftopk License: LPPL-1.0 +Summary: Binary files of gsftopk Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-gsftopk >= %{texlive_version} @@ -1423,19 +1412,33 @@ Prefix: %{_bindir} %description gsftopk-bin Binary files of gsftopk +%package hyperxmp-bin +Version: %{texlive_version}.%{texlive_release}.svn56984 +Release: 0 +License: LPPL-1.0 +Summary: Binary files of hyperxmp +Group: Productivity/Publishing/TeX/Utilities +URL: http://www.tug.org/texlive/ +Requires(pre): texlive-hyperxmp >= %{texlive_version} +#!BuildIgnore: texlive-hyperxmp +Prefix: %{_bindir} + +%description hyperxmp-bin +Binary files of hyperxmp + %package jadetex-bin Version: %{texlive_version}.%{texlive_release}.svn3006 Release: 0 -Summary: Binary files of jadetex License: LPPL-1.0 +Summary: Binary files of jadetex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-bin-jadetex <= %{texlive_previous} Requires(pre): texlive-jadetex >= %{texlive_version} #!BuildIgnore: texlive-jadetex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description jadetex-bin @@ -1444,8 +1447,8 @@ Binary files of jadetex %package jfmutil-bin Version: %{texlive_version}.%{texlive_release}.svn44835 Release: 0 -Summary: Binary files of jfmutil License: LPPL-1.0 +Summary: Binary files of jfmutil Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-jfmutil >= %{texlive_version} @@ -1458,8 +1461,8 @@ Binary files of jfmutil %package ketcindy-bin Version: %{texlive_version}.%{texlive_release}.svn49033 Release: 0 -Summary: Binary files of ketcindy License: LPPL-1.0 +Summary: Binary files of ketcindy Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ketcindy >= %{texlive_version} @@ -1472,36 +1475,36 @@ Binary files of ketcindy %package kotex-utils-bin Version: %{texlive_version}.%{texlive_release}.svn32101 Release: 0 -Summary: Binary files of kotex-utils License: LPPL-1.0 +Summary: Binary files of kotex-utils Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-kotex-utils >= %{texlive_version} #!BuildIgnore: texlive-kotex-utils +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description kotex-utils-bin Binary files of kotex-utils %package kpathsea-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of kpathsea License: LPPL-1.0 +Summary: Binary files of kpathsea Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ -Requires(pre): %{name}-filesystem >= %{texlive_version} -Requires(pre): /usr/bin/getent -Requires(pre): /usr/sbin/groupadd -Requires(post): %{name}-filesystem -Requires(post): permissions +Requires(pre): %{name}-filesystem >= %{texlive_version} +Requires(pre): /usr/bin/getent +Requires(pre): /usr/sbin/groupadd +Requires(post): %{name}-filesystem +Requires(post): permissions Requires: %{name}-gsftopk-bin -Requires(pre): %{name}-scripts-bin -Requires(verify): %{name}-filesystem -Requires(verify): permissions +Requires(pre): %{name}-scripts-bin +Requires(verify):%{name}-filesystem +Requires(verify):permissions Requires(pre): texlive-kpathsea >= %{texlive_version} #!BuildIgnore: texlive-kpathsea Prefix: %{_bindir} @@ -1512,8 +1515,8 @@ Binary files of kpathsea %package l3build-bin Version: %{texlive_version}.%{texlive_release}.svn46894 Release: 0 -Summary: Binary files of l3build License: LPPL-1.0 +Summary: Binary files of l3build Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-l3build >= %{texlive_version} @@ -1526,8 +1529,8 @@ Binary files of l3build %package lacheck-bin Version: %{texlive_version}.%{texlive_release}.svn53999 Release: 0 -Summary: Binary files of lacheck License: LPPL-1.0 +Summary: Binary files of lacheck Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-lacheck >= %{texlive_version} @@ -1540,8 +1543,8 @@ Binary files of lacheck %package latex-bin-dev-bin Version: %{texlive_version}.%{texlive_release}.svn53999 Release: 0 -Summary: Binary files of latex-bin-dev License: LPPL-1.0 +Summary: Binary files of latex-bin-dev Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-latex-bin-dev >= %{texlive_version} @@ -1557,8 +1560,8 @@ Binary files of latex-bin-dev %package latex-bin-bin Version: %{texlive_version}.%{texlive_release}.svn54358 Release: 0 -Summary: Binary files of latex-bin License: LPPL-1.0 +Summary: Binary files of latex-bin Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-latex-bin >= %{texlive_version} @@ -1574,8 +1577,8 @@ Binary files of latex-bin %package latex-git-log-bin Version: %{texlive_version}.%{texlive_release}.svn30983 Release: 0 -Summary: Binary files of latex-git-log License: LPPL-1.0 +Summary: Binary files of latex-git-log Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-latex-git-log >= %{texlive_version} @@ -1591,8 +1594,8 @@ Binary files of latex-git-log %package latex-papersize-bin Version: %{texlive_version}.%{texlive_release}.svn42296 Release: 0 -Summary: Binary files of latex-papersize License: LPPL-1.0 +Summary: Binary files of latex-papersize Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-latex-papersize >= %{texlive_version} @@ -1608,8 +1611,8 @@ Binary files of latex-papersize %package latex2man-bin Version: %{texlive_version}.%{texlive_release}.svn13663 Release: 0 -Summary: Binary files of latex2man License: LPPL-1.0 +Summary: Binary files of latex2man Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-latex2man >= %{texlive_version} @@ -1625,8 +1628,8 @@ Binary files of latex2man %package latex2nemeth-bin Version: %{texlive_version}.%{texlive_release}.svn42300 Release: 0 -Summary: Binary files of latex2nemeth License: LPPL-1.0 +Summary: Binary files of latex2nemeth Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-latex2nemeth >= %{texlive_version} @@ -1642,8 +1645,8 @@ Binary files of latex2nemeth %package latexdiff-bin Version: %{texlive_version}.%{texlive_release}.svn16420 Release: 0 -Summary: Binary files of latexdiff License: LPPL-1.0 +Summary: Binary files of latexdiff Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-latexdiff >= %{texlive_version} @@ -1659,8 +1662,8 @@ Binary files of latexdiff %package latexfileversion-bin Version: %{texlive_version}.%{texlive_release}.svn25012 Release: 0 -Summary: Binary files of latexfileversion License: LPPL-1.0 +Summary: Binary files of latexfileversion Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-latexfileversion >= %{texlive_version} @@ -1676,8 +1679,8 @@ Binary files of latexfileversion %package latexindent-bin Version: %{texlive_version}.%{texlive_release}.svn32150 Release: 0 -Summary: Binary files of latexindent License: LPPL-1.0 +Summary: Binary files of latexindent Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-latexindent >= %{texlive_version} @@ -1693,8 +1696,8 @@ Binary files of latexindent %package latexmk-bin Version: %{texlive_version}.%{texlive_release}.svn10937 Release: 0 -Summary: Binary files of latexmk License: LPPL-1.0 +Summary: Binary files of latexmk Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-latexmk >= %{texlive_version} @@ -1710,8 +1713,8 @@ Binary files of latexmk %package latexpand-bin Version: %{texlive_version}.%{texlive_release}.svn27025 Release: 0 -Summary: Binary files of latexpand License: LPPL-1.0 +Summary: Binary files of latexpand Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-latexpand >= %{texlive_version} @@ -1725,10 +1728,10 @@ Prefix: %{_bindir} Binary files of latexpand %package lcdftypetools-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of lcdftypetools License: LPPL-1.0 +Summary: Binary files of lcdftypetools Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ %if %{with lcdf_typetools} @@ -1743,11 +1746,28 @@ Prefix: %{_bindir} %description lcdftypetools-bin Binary files of lcdftypetools +%package light-latex-make-bin +Version: %{texlive_version}.%{texlive_release}.svn56352 +Release: 0 +License: LPPL-1.0 +Summary: Binary files of light-latex-make +Group: Productivity/Publishing/TeX/Utilities +URL: http://www.tug.org/texlive/ +Requires(pre): texlive-light-latex-make >= %{texlive_version} +#!BuildIgnore: texlive-light-latex-make +Recommends: texlive-collection-fontsrecommended >= %{texlive_version} +Recommends: texlive-collection-genericrecommended >= %{texlive_version} +Recommends: texlive-collection-latexrecommended >= %{texlive_version} +Prefix: %{_bindir} + +%description light-latex-make-bin +Binary files of light-latex-make + %package lilyglyphs-bin Version: %{texlive_version}.%{texlive_release}.svn31696 Release: 0 -Summary: Binary files of lilyglyphs License: LPPL-1.0 +Summary: Binary files of lilyglyphs Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-lilyglyphs >= %{texlive_version} @@ -1760,8 +1780,8 @@ Binary files of lilyglyphs %package listbib-bin Version: %{texlive_version}.%{texlive_release}.svn26126 Release: 0 -Summary: Binary files of listbib License: LPPL-1.0 +Summary: Binary files of listbib Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-listbib >= %{texlive_version} @@ -1774,8 +1794,8 @@ Binary files of listbib %package listings-ext-bin Version: %{texlive_version}.%{texlive_release}.svn15093 Release: 0 -Summary: Binary files of listings-ext License: LPPL-1.0 +Summary: Binary files of listings-ext Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-listings-ext >= %{texlive_version} @@ -1788,8 +1808,8 @@ Binary files of listings-ext %package lollipop-bin Version: %{texlive_version}.%{texlive_release}.svn41465 Release: 0 -Summary: Binary files of lollipop License: LPPL-1.0 +Summary: Binary files of lollipop Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-lollipop >= %{texlive_version} @@ -1802,8 +1822,8 @@ Binary files of lollipop %package ltxfileinfo-bin Version: %{texlive_version}.%{texlive_release}.svn29005 Release: 0 -Summary: Binary files of ltxfileinfo License: LPPL-1.0 +Summary: Binary files of ltxfileinfo Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ltxfileinfo >= %{texlive_version} @@ -1816,8 +1836,8 @@ Binary files of ltxfileinfo %package ltximg-bin Version: %{texlive_version}.%{texlive_release}.svn32346 Release: 0 -Summary: Binary files of ltximg License: LPPL-1.0 +Summary: Binary files of ltximg Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ltximg >= %{texlive_version} @@ -1828,34 +1848,34 @@ Prefix: %{_bindir} Binary files of ltximg %package luahbtex-bin -Version: %{texlive_version}.%{texlive_release}.svn54358 +Version: %{texlive_version}.%{texlive_release}.svn58535 Release: 0 -Summary: Binary files of luahbtex License: LPPL-1.0 +Summary: Binary files of luahbtex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-luahbtex >= %{texlive_version} #!BuildIgnore: texlive-luahbtex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description luahbtex-bin Binary files of luahbtex %package luajittex-bin -Version: %{texlive_version}.%{texlive_release}.svn54358 +Version: %{texlive_version}.%{texlive_release}.svn58535 Release: 0 -Summary: Binary files of luajittex License: LPPL-1.0 +Summary: Binary files of luajittex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-luajittex >= %{texlive_version} #!BuildIgnore: texlive-luajittex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description luajittex-bin @@ -1864,8 +1884,8 @@ Binary files of luajittex %package luaotfload-bin Version: %{texlive_version}.%{texlive_release}.svn34647 Release: 0 -Summary: Binary files of luaotfload License: LPPL-1.0 +Summary: Binary files of luaotfload Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-luaotfload >= %{texlive_version} @@ -1876,10 +1896,10 @@ Prefix: %{_bindir} Binary files of luaotfload %package luatex-bin -Version: %{texlive_version}.%{texlive_release}.svn54358 +Version: %{texlive_version}.%{texlive_release}.svn58535 Release: 0 -Summary: Binary files of luatex License: LPPL-1.0 +Summary: Binary files of luatex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-luatex >= %{texlive_version} @@ -1895,8 +1915,8 @@ Binary files of luatex %package lwarp-bin Version: %{texlive_version}.%{texlive_release}.svn43292 Release: 0 -Summary: Binary files of lwarp License: LPPL-1.0 +Summary: Binary files of lwarp Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-lwarp >= %{texlive_version} @@ -1909,8 +1929,8 @@ Binary files of lwarp %package m-tx-bin Version: %{texlive_version}.%{texlive_release}.svn50281 Release: 0 -Summary: Binary files of m-tx License: LPPL-1.0 +Summary: Binary files of m-tx Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-m-tx >= %{texlive_version} @@ -1923,8 +1943,8 @@ Binary files of m-tx %package make4ht-bin Version: %{texlive_version}.%{texlive_release}.svn37750 Release: 0 -Summary: Binary files of make4ht License: LPPL-1.0 +Summary: Binary files of make4ht Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-make4ht >= %{texlive_version} @@ -1937,8 +1957,8 @@ Binary files of make4ht %package makedtx-bin Version: %{texlive_version}.%{texlive_release}.svn38769 Release: 0 -Summary: Binary files of makedtx License: LPPL-1.0 +Summary: Binary files of makedtx Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-makedtx >= %{texlive_version} @@ -1949,10 +1969,10 @@ Prefix: %{_bindir} Binary files of makedtx %package makeindex-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of makeindex License: LPPL-1.0 +Summary: Binary files of makeindex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-makeindex >= %{texlive_version} @@ -1965,8 +1985,8 @@ Binary files of makeindex %package match_parens-bin Version: %{texlive_version}.%{texlive_release}.svn23500 Release: 0 -Summary: Binary files of match_parens License: LPPL-1.0 +Summary: Binary files of match_parens Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-match_parens >= %{texlive_version} @@ -1979,8 +1999,8 @@ Binary files of match_parens %package mathspic-bin Version: %{texlive_version}.%{texlive_release}.svn23661 Release: 0 -Summary: Binary files of mathspic License: LPPL-1.0 +Summary: Binary files of mathspic Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-mathspic >= %{texlive_version} @@ -1991,10 +2011,10 @@ Prefix: %{_bindir} Binary files of mathspic %package metafont-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn58378 Release: 0 -Summary: Binary files of metafont License: LPPL-1.0 +Summary: Binary files of metafont Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-metafont >= %{texlive_version} @@ -2005,10 +2025,10 @@ Prefix: %{_bindir} Binary files of metafont %package metapost-bin -Version: %{texlive_version}.%{texlive_release}.svn54358 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of metapost License: LPPL-1.0 +Summary: Binary files of metapost Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-bin-metapost <= %{texlive_previous} @@ -2022,8 +2042,8 @@ Binary files of metapost %package mex-bin Version: %{texlive_version}.%{texlive_release}.svn3006 Release: 0 -Summary: Binary files of mex License: LPPL-1.0 +Summary: Binary files of mex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-mex >= %{texlive_version} @@ -2036,8 +2056,8 @@ Binary files of mex %package mf2pt1-bin Version: %{texlive_version}.%{texlive_release}.svn23406 Release: 0 -Summary: Binary files of mf2pt1 License: LPPL-1.0 +Summary: Binary files of mf2pt1 Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-mf2pt1 >= %{texlive_version} @@ -2048,10 +2068,10 @@ Prefix: %{_bindir} Binary files of mf2pt1 %package mflua-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn58535 Release: 0 -Summary: Binary files of mflua License: LPPL-1.0 +Summary: Binary files of mflua Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-mflua >= %{texlive_version} @@ -2062,10 +2082,10 @@ Prefix: %{_bindir} Binary files of mflua %package mfware-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of mfware License: LPPL-1.0 +Summary: Binary files of mfware Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-mfware >= %{texlive_version} @@ -2078,8 +2098,8 @@ Binary files of mfware %package mkgrkindex-bin Version: %{texlive_version}.%{texlive_release}.svn14428 Release: 0 -Summary: Binary files of mkgrkindex License: LPPL-1.0 +Summary: Binary files of mkgrkindex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-mkgrkindex >= %{texlive_version} @@ -2092,15 +2112,15 @@ Binary files of mkgrkindex %package mkjobtexmf-bin Version: %{texlive_version}.%{texlive_release}.svn8457 Release: 0 -Summary: Binary files of mkjobtexmf License: LPPL-1.0 +Summary: Binary files of mkjobtexmf Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-mkjobtexmf >= %{texlive_version} #!BuildIgnore: texlive-mkjobtexmf +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description mkjobtexmf-bin @@ -2109,8 +2129,8 @@ Binary files of mkjobtexmf %package mkpic-bin Version: %{texlive_version}.%{texlive_release}.svn33688 Release: 0 -Summary: Binary files of mkpic License: LPPL-1.0 +Summary: Binary files of mkpic Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-mkpic >= %{texlive_version} @@ -2123,15 +2143,15 @@ Binary files of mkpic %package mltex-bin Version: %{texlive_version}.%{texlive_release}.svn3006 Release: 0 -Summary: Binary files of mltex License: LPPL-1.0 +Summary: Binary files of mltex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-mltex >= %{texlive_version} #!BuildIgnore: texlive-mltex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description mltex-bin @@ -2140,8 +2160,8 @@ Binary files of mltex %package mptopdf-bin Version: %{texlive_version}.%{texlive_release}.svn18674 Release: 0 -Summary: Binary files of mptopdf License: LPPL-1.0 +Summary: Binary files of mptopdf Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-mptopdf >= %{texlive_version} @@ -2154,8 +2174,8 @@ Binary files of mptopdf %package multibibliography-bin Version: %{texlive_version}.%{texlive_release}.svn30534 Release: 0 -Summary: Binary files of multibibliography License: LPPL-1.0 +Summary: Binary files of multibibliography Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-multibibliography >= %{texlive_version} @@ -2168,8 +2188,8 @@ Binary files of multibibliography %package musixtex-bin Version: %{texlive_version}.%{texlive_release}.svn37026 Release: 0 -Summary: Binary files of musixtex License: LPPL-1.0 +Summary: Binary files of musixtex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-bin-musictex <= %{texlive_previous} @@ -2177,9 +2197,9 @@ Requires: texlive-m-tx-bin >= %{texlive_version} Requires: texlive-pmx-bin >= %{texlive_version} Requires(pre): texlive-musixtex >= %{texlive_version} #!BuildIgnore: texlive-musixtex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description musixtex-bin @@ -2188,8 +2208,8 @@ Binary files of musixtex %package musixtnt-bin Version: %{texlive_version}.%{texlive_release}.svn50281 Release: 0 -Summary: Binary files of musixtnt License: LPPL-1.0 +Summary: Binary files of musixtnt Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-musixtnt >= %{texlive_version} @@ -2200,10 +2220,10 @@ Prefix: %{_bindir} Binary files of musixtnt %package omegaware-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of omegaware License: LPPL-1.0 +Summary: Binary files of omegaware Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-bin-omega <= %{texlive_previous} @@ -2221,25 +2241,25 @@ Binary files of omegaware %package optex-bin Version: %{texlive_version}.%{texlive_release}.svn53804 Release: 0 -Summary: Binary files of optex License: LPPL-1.0 +Summary: Binary files of optex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-optex >= %{texlive_version} #!BuildIgnore: texlive-optex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description optex-bin Binary files of optex %package patgen-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of patgen License: LPPL-1.0 +Summary: Binary files of patgen Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-patgen >= %{texlive_version} @@ -2252,8 +2272,8 @@ Binary files of patgen %package pax-bin Version: %{texlive_version}.%{texlive_release}.svn10843 Release: 0 -Summary: Binary files of pax License: LPPL-1.0 +Summary: Binary files of pax Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pax >= %{texlive_version} @@ -2266,8 +2286,8 @@ Binary files of pax %package pdfbook2-bin Version: %{texlive_version}.%{texlive_release}.svn37537 Release: 0 -Summary: Binary files of pdfbook2 License: LPPL-1.0 +Summary: Binary files of pdfbook2 Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pdfbook2 >= %{texlive_version} @@ -2280,8 +2300,8 @@ Binary files of pdfbook2 %package pdfcrop-bin Version: %{texlive_version}.%{texlive_release}.svn14387 Release: 0 -Summary: Binary files of pdfcrop License: LPPL-1.0 +Summary: Binary files of pdfcrop Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pdfcrop >= %{texlive_version} @@ -2294,8 +2314,8 @@ Binary files of pdfcrop %package pdfjam-bin Version: %{texlive_version}.%{texlive_release}.svn52858 Release: 0 -Summary: Binary files of pdfjam License: LPPL-1.0 +Summary: Binary files of pdfjam Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pdfjam >= %{texlive_version} @@ -2308,8 +2328,8 @@ Binary files of pdfjam %package pdflatexpicscale-bin Version: %{texlive_version}.%{texlive_release}.svn41779 Release: 0 -Summary: Binary files of pdflatexpicscale License: LPPL-1.0 +Summary: Binary files of pdflatexpicscale Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pdflatexpicscale >= %{texlive_version} @@ -2325,42 +2345,42 @@ Binary files of pdflatexpicscale %package pdftex-quiet-bin Version: %{texlive_version}.%{texlive_release}.svn49140 Release: 0 -Summary: Binary files of pdftex-quiet License: LPPL-1.0 +Summary: Binary files of pdftex-quiet Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pdftex-quiet >= %{texlive_version} #!BuildIgnore: texlive-pdftex-quiet +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description pdftex-quiet-bin Binary files of pdftex-quiet %package pdftex-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn58535 Release: 0 -Summary: Binary files of pdftex License: LPPL-1.0 +Summary: Binary files of pdftex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pdftex >= %{texlive_version} #!BuildIgnore: texlive-pdftex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description pdftex-bin Binary files of pdftex %package pdftosrc-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of pdftosrc License: LPPL-1.0 +Summary: Binary files of pdftosrc Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pdftosrc >= %{texlive_version} @@ -2373,8 +2393,8 @@ Binary files of pdftosrc %package pdfxup-bin Version: %{texlive_version}.%{texlive_release}.svn40690 Release: 0 -Summary: Binary files of pdfxup License: LPPL-1.0 +Summary: Binary files of pdfxup Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pdfxup >= %{texlive_version} @@ -2387,8 +2407,8 @@ Binary files of pdfxup %package pedigree-perl-bin Version: %{texlive_version}.%{texlive_release}.svn25962 Release: 0 -Summary: Binary files of pedigree-perl License: LPPL-1.0 +Summary: Binary files of pedigree-perl Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pedigree-perl >= %{texlive_version} @@ -2401,15 +2421,15 @@ Binary files of pedigree-perl %package perltex-bin Version: %{texlive_version}.%{texlive_release}.svn16181 Release: 0 -Summary: Binary files of perltex License: LPPL-1.0 +Summary: Binary files of perltex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-perltex >= %{texlive_version} #!BuildIgnore: texlive-perltex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description perltex-bin @@ -2418,8 +2438,8 @@ Binary files of perltex %package petri-nets-bin Version: %{texlive_version}.%{texlive_release}.svn39165 Release: 0 -Summary: Binary files of petri-nets License: LPPL-1.0 +Summary: Binary files of petri-nets Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-petri-nets >= %{texlive_version} @@ -2432,8 +2452,8 @@ Binary files of petri-nets %package pfarrei-bin Version: %{texlive_version}.%{texlive_release}.svn29348 Release: 0 -Summary: Binary files of pfarrei License: LPPL-1.0 +Summary: Binary files of pfarrei Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pfarrei >= %{texlive_version} @@ -2446,8 +2466,8 @@ Binary files of pfarrei %package pkfix-helper-bin Version: %{texlive_version}.%{texlive_release}.svn13663 Release: 0 -Summary: Binary files of pkfix-helper License: LPPL-1.0 +Summary: Binary files of pkfix-helper Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pkfix-helper >= %{texlive_version} @@ -2460,8 +2480,8 @@ Binary files of pkfix-helper %package pkfix-bin Version: %{texlive_version}.%{texlive_release}.svn13364 Release: 0 -Summary: Binary files of pkfix License: LPPL-1.0 +Summary: Binary files of pkfix Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pkfix >= %{texlive_version} @@ -2474,8 +2494,8 @@ Binary files of pkfix %package platex-bin Version: %{texlive_version}.%{texlive_release}.svn52800 Release: 0 -Summary: Binary files of platex License: LPPL-1.0 +Summary: Binary files of platex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-platex >= %{texlive_version} @@ -2489,10 +2509,10 @@ Prefix: %{_bindir} Binary files of platex %package pmx-bin -Version: %{texlive_version}.%{texlive_release}.svn54410 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of pmx License: LPPL-1.0 +Summary: Binary files of pmx Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pmx >= %{texlive_version} @@ -2505,8 +2525,8 @@ Binary files of pmx %package pmxchords-bin Version: %{texlive_version}.%{texlive_release}.svn32405 Release: 0 -Summary: Binary files of pmxchords License: LPPL-1.0 +Summary: Binary files of pmxchords Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pmxchords >= %{texlive_version} @@ -2519,8 +2539,8 @@ Binary files of pmxchords %package ps2eps-bin Version: %{texlive_version}.%{texlive_release}.svn50281 Release: 0 -Summary: Binary files of ps2eps License: LPPL-1.0 +Summary: Binary files of ps2eps Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ps2eps >= %{texlive_version} @@ -2531,10 +2551,10 @@ Prefix: %{_bindir} Binary files of ps2eps %package ps2pk-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of ps2pk License: LPPL-1.0 +Summary: Binary files of ps2pk Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-ps2pkm-bin <= 2014 @@ -2548,8 +2568,8 @@ Binary files of ps2pk %package pst-pdf-bin Version: %{texlive_version}.%{texlive_release}.svn7838 Release: 0 -Summary: Binary files of pst-pdf License: LPPL-1.0 +Summary: Binary files of pst-pdf Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pst-pdf >= %{texlive_version} @@ -2562,8 +2582,8 @@ Binary files of pst-pdf %package pst2pdf-bin Version: %{texlive_version}.%{texlive_release}.svn29333 Release: 0 -Summary: Binary files of pst2pdf License: LPPL-1.0 +Summary: Binary files of pst2pdf Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pst2pdf >= %{texlive_version} @@ -2576,32 +2596,32 @@ Binary files of pst2pdf %package ptex-fontmaps-bin Version: %{texlive_version}.%{texlive_release}.svn44206 Release: 0 -Summary: Binary files of ptex-fontmaps License: LPPL-1.0 +Summary: Binary files of ptex-fontmaps Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ptex-fontmaps >= %{texlive_version} #!BuildIgnore: texlive-ptex-fontmaps +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description ptex-fontmaps-bin Binary files of ptex-fontmaps %package ptex-bin -Version: %{texlive_version}.%{texlive_release}.svn54358 +Version: %{texlive_version}.%{texlive_release}.svn58378 Release: 0 -Summary: Binary files of ptex License: LPPL-1.0 +Summary: Binary files of ptex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ptex >= %{texlive_version} #!BuildIgnore: texlive-ptex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description ptex-bin @@ -2610,15 +2630,15 @@ Binary files of ptex %package ptex2pdf-bin Version: %{texlive_version}.%{texlive_release}.svn29335 Release: 0 -Summary: Binary files of ptex2pdf License: LPPL-1.0 +Summary: Binary files of ptex2pdf Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ptex2pdf >= %{texlive_version} #!BuildIgnore: texlive-ptex2pdf +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description ptex2pdf-bin @@ -2627,8 +2647,8 @@ Binary files of ptex2pdf %package purifyeps-bin Version: %{texlive_version}.%{texlive_release}.svn13663 Release: 0 -Summary: Binary files of purifyeps License: LPPL-1.0 +Summary: Binary files of purifyeps Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-purifyeps >= %{texlive_version} @@ -2641,15 +2661,15 @@ Binary files of purifyeps %package pythontex-bin Version: %{texlive_version}.%{texlive_release}.svn31638 Release: 0 -Summary: Binary files of pythontex License: LPPL-1.0 +Summary: Binary files of pythontex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-pythontex >= %{texlive_version} #!BuildIgnore: texlive-pythontex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description pythontex-bin @@ -2658,8 +2678,8 @@ Binary files of pythontex %package rubik-bin Version: %{texlive_version}.%{texlive_release}.svn32919 Release: 0 -Summary: Binary files of rubik License: LPPL-1.0 +Summary: Binary files of rubik Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-rubik >= %{texlive_version} @@ -2670,27 +2690,41 @@ Prefix: %{_bindir} Binary files of rubik %package seetexk-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of seetexk License: LPPL-1.0 +Summary: Binary files of seetexk Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-seetexk >= %{texlive_version} #!BuildIgnore: texlive-seetexk +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description seetexk-bin Binary files of seetexk +%package spix-bin +Version: %{texlive_version}.%{texlive_release}.svn55933 +Release: 0 +License: LPPL-1.0 +Summary: Binary files of spix +Group: Productivity/Publishing/TeX/Utilities +URL: http://www.tug.org/texlive/ +Requires(pre): texlive-spix >= %{texlive_version} +#!BuildIgnore: texlive-spix +Prefix: %{_bindir} + +%description spix-bin +Binary files of spix + %package splitindex-bin Version: %{texlive_version}.%{texlive_release}.svn29688 Release: 0 -Summary: Binary files of splitindex License: LPPL-1.0 +Summary: Binary files of splitindex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-splitindex >= %{texlive_version} @@ -2703,8 +2737,8 @@ Binary files of splitindex %package srcredact-bin Version: %{texlive_version}.%{texlive_release}.svn38710 Release: 0 -Summary: Binary files of srcredact License: LPPL-1.0 +Summary: Binary files of srcredact Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-srcredact >= %{texlive_version} @@ -2717,8 +2751,8 @@ Binary files of srcredact %package sty2dtx-bin Version: %{texlive_version}.%{texlive_release}.svn21215 Release: 0 -Summary: Binary files of sty2dtx License: LPPL-1.0 +Summary: Binary files of sty2dtx Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-sty2dtx >= %{texlive_version} @@ -2731,8 +2765,8 @@ Binary files of sty2dtx %package svn-multi-bin Version: %{texlive_version}.%{texlive_release}.svn13663 Release: 0 -Summary: Binary files of svn-multi License: LPPL-1.0 +Summary: Binary files of svn-multi Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-svn-multi >= %{texlive_version} @@ -2743,34 +2777,34 @@ Prefix: %{_bindir} Binary files of svn-multi %package synctex-bin -Version: %{texlive_version}.%{texlive_release}.svn50281 +Version: %{texlive_version}.%{texlive_release}.svn58136 Release: 0 -Summary: Binary files of synctex License: LPPL-1.0 +Summary: Binary files of synctex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-synctex >= %{texlive_version} #!BuildIgnore: texlive-synctex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description synctex-bin Binary files of synctex %package tex-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn58378 Release: 0 -Summary: Binary files of tex License: LPPL-1.0 +Summary: Binary files of tex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-tex >= %{texlive_version} #!BuildIgnore: texlive-tex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description tex-bin @@ -2779,34 +2813,34 @@ Binary files of tex %package tex4ebook-bin Version: %{texlive_version}.%{texlive_release}.svn37771 Release: 0 -Summary: Binary files of tex4ebook License: LPPL-1.0 +Summary: Binary files of tex4ebook Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-tex4ebook >= %{texlive_version} #!BuildIgnore: texlive-tex4ebook +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description tex4ebook-bin Binary files of tex4ebook %package tex4ht-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of tex4ht License: LPPL-1.0 +Summary: Binary files of tex4ht Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-bin-tex4ht <= %{texlive_previous} Conflicts: ht Requires(pre): texlive-tex4ht >= %{texlive_version} #!BuildIgnore: texlive-tex4ht +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description tex4ht-bin @@ -2815,15 +2849,15 @@ Binary files of tex4ht %package texcount-bin Version: %{texlive_version}.%{texlive_release}.svn13013 Release: 0 -Summary: Binary files of texcount License: LPPL-1.0 +Summary: Binary files of texcount Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texcount >= %{texlive_version} #!BuildIgnore: texlive-texcount +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texcount-bin @@ -2832,15 +2866,15 @@ Binary files of texcount %package texdef-bin Version: %{texlive_version}.%{texlive_release}.svn45011 Release: 0 -Summary: Binary files of texdef License: LPPL-1.0 +Summary: Binary files of texdef Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texdef >= %{texlive_version} #!BuildIgnore: texlive-texdef +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texdef-bin @@ -2849,15 +2883,15 @@ Binary files of texdef %package texdiff-bin Version: %{texlive_version}.%{texlive_release}.svn15506 Release: 0 -Summary: Binary files of texdiff License: LPPL-1.0 +Summary: Binary files of texdiff Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texdiff >= %{texlive_version} #!BuildIgnore: texlive-texdiff +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texdiff-bin @@ -2866,15 +2900,15 @@ Binary files of texdiff %package texdirflatten-bin Version: %{texlive_version}.%{texlive_release}.svn12782 Release: 0 -Summary: Binary files of texdirflatten License: LPPL-1.0 +Summary: Binary files of texdirflatten Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texdirflatten >= %{texlive_version} #!BuildIgnore: texlive-texdirflatten +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texdirflatten-bin @@ -2883,15 +2917,15 @@ Binary files of texdirflatten %package texdoc-bin Version: %{texlive_version}.%{texlive_release}.svn47948 Release: 0 -Summary: Binary files of texdoc License: LPPL-1.0 +Summary: Binary files of texdoc Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texdoc >= %{texlive_version} #!BuildIgnore: texlive-texdoc +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texdoc-bin @@ -2900,15 +2934,15 @@ Binary files of texdoc %package texdoctk-bin Version: %{texlive_version}.%{texlive_release}.svn29741 Release: 0 -Summary: Binary files of texdoctk License: LPPL-1.0 +Summary: Binary files of texdoctk Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texdoctk >= %{texlive_version} #!BuildIgnore: texlive-texdoctk +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texdoctk-bin @@ -2917,15 +2951,15 @@ Binary files of texdoctk %package texfot-bin Version: %{texlive_version}.%{texlive_release}.svn33155 Release: 0 -Summary: Binary files of texfot License: LPPL-1.0 +Summary: Binary files of texfot Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texfot >= %{texlive_version} #!BuildIgnore: texlive-texfot +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texfot-bin @@ -2934,36 +2968,36 @@ Binary files of texfot %package -n texlive-scripts-extra-bin Version: %{texlive_version}.%{texlive_release}.svn53577 Release: 0 -Summary: Binary files of texlive-scripts-extra License: LPPL-1.0 +Summary: Binary files of texlive-scripts-extra Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-pdftools-bin <= %{texlive_previous} Obsoletes: texlive-pstools-bin <= %{texlive_previous} Requires(pre): texlive-scripts-extra >= %{texlive_version} #!BuildIgnore: texlive-scripts-extra +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description -n texlive-scripts-extra-bin Binary files of texlive-scripts-extra %package -n texlive-scripts-bin -Version: %{texlive_version}.%{texlive_release}.svn54807 +Version: %{texlive_version}.%{texlive_release}.svn55172 Release: 0 -Summary: Binary files of texlive-scripts License: LPPL-1.0 +Summary: Binary files of texlive-scripts Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-tetex-bin <= %{texlive_previous} Obsoletes: tlshell-bin <= %{texlive_previous} Requires(pre): texlive-scripts >= %{texlive_version} #!BuildIgnore: texlive-scripts +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description -n texlive-scripts-bin @@ -2972,15 +3006,15 @@ Binary files of texlive-scripts %package texliveonfly-bin Version: %{texlive_version}.%{texlive_release}.svn24062 Release: 0 -Summary: Binary files of texliveonfly License: LPPL-1.0 +Summary: Binary files of texliveonfly Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texliveonfly >= %{texlive_version} #!BuildIgnore: texlive-texliveonfly +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texliveonfly-bin @@ -2989,15 +3023,15 @@ Binary files of texliveonfly %package texloganalyser-bin Version: %{texlive_version}.%{texlive_release}.svn13663 Release: 0 -Summary: Binary files of texloganalyser License: LPPL-1.0 +Summary: Binary files of texloganalyser Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texloganalyser >= %{texlive_version} #!BuildIgnore: texlive-texloganalyser +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texloganalyser-bin @@ -3006,15 +3040,15 @@ Binary files of texloganalyser %package texosquery-bin Version: %{texlive_version}.%{texlive_release}.svn43596 Release: 0 -Summary: Binary files of texosquery License: LPPL-1.0 +Summary: Binary files of texosquery Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texosquery >= %{texlive_version} #!BuildIgnore: texlive-texosquery +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texosquery-bin @@ -3023,15 +3057,15 @@ Binary files of texosquery %package texplate-bin Version: %{texlive_version}.%{texlive_release}.svn53444 Release: 0 -Summary: Binary files of texplate License: LPPL-1.0 +Summary: Binary files of texplate Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texplate >= %{texlive_version} #!BuildIgnore: texlive-texplate +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texplate-bin @@ -3040,32 +3074,32 @@ Binary files of texplate %package texsis-bin Version: %{texlive_version}.%{texlive_release}.svn3006 Release: 0 -Summary: Binary files of texsis License: LPPL-1.0 +Summary: Binary files of texsis Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texsis >= %{texlive_version} #!BuildIgnore: texlive-texsis +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texsis-bin Binary files of texsis %package texware-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of texware License: LPPL-1.0 +Summary: Binary files of texware Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-texware >= %{texlive_version} #!BuildIgnore: texlive-texware +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description texware-bin @@ -3074,8 +3108,8 @@ Binary files of texware %package thumbpdf-bin Version: %{texlive_version}.%{texlive_release}.svn6898 Release: 0 -Summary: Binary files of thumbpdf License: LPPL-1.0 +Summary: Binary files of thumbpdf Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-thumbpdf >= %{texlive_version} @@ -3086,10 +3120,10 @@ Prefix: %{_bindir} Binary files of thumbpdf %package tie-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of tie License: LPPL-1.0 +Summary: Binary files of tie Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-tie >= %{texlive_version} @@ -3099,28 +3133,42 @@ Prefix: %{_bindir} %description tie-bin Binary files of tie +%package tikztosvg-bin +Version: %{texlive_version}.%{texlive_release}.svn55132 +Release: 0 +License: LPPL-1.0 +Summary: Binary files of tikztosvg +Group: Productivity/Publishing/TeX/Utilities +URL: http://www.tug.org/texlive/ +Requires(pre): texlive-tikztosvg >= %{texlive_version} +#!BuildIgnore: texlive-tikztosvg +Prefix: %{_bindir} + +%description tikztosvg-bin +Binary files of tikztosvg + %package tpic2pdftex-bin Version: %{texlive_version}.%{texlive_release}.svn50281 Release: 0 -Summary: Binary files of tpic2pdftex License: LPPL-1.0 +Summary: Binary files of tpic2pdftex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-tpic2pdftex >= %{texlive_version} #!BuildIgnore: texlive-tpic2pdftex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description tpic2pdftex-bin Binary files of tpic2pdftex %package ttfutils-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of ttfutils License: LPPL-1.0 +Summary: Binary files of ttfutils Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ttfutils >= %{texlive_version} @@ -3133,8 +3181,8 @@ Binary files of ttfutils %package typeoutfileinfo-bin Version: %{texlive_version}.%{texlive_release}.svn25648 Release: 0 -Summary: Binary files of typeoutfileinfo License: LPPL-1.0 +Summary: Binary files of typeoutfileinfo Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-typeoutfileinfo >= %{texlive_version} @@ -3147,8 +3195,8 @@ Binary files of typeoutfileinfo %package ulqda-bin Version: %{texlive_version}.%{texlive_release}.svn13663 Release: 0 -Summary: Binary files of ulqda License: LPPL-1.0 +Summary: Binary files of ulqda Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-ulqda >= %{texlive_version} @@ -3161,8 +3209,8 @@ Binary files of ulqda %package uplatex-bin Version: %{texlive_version}.%{texlive_release}.svn52800 Release: 0 -Summary: Binary files of uplatex License: LPPL-1.0 +Summary: Binary files of uplatex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-uplatex >= %{texlive_version} @@ -3176,17 +3224,17 @@ Prefix: %{_bindir} Binary files of uplatex %package uptex-bin -Version: %{texlive_version}.%{texlive_release}.svn54358 +Version: %{texlive_version}.%{texlive_release}.svn58378 Release: 0 -Summary: Binary files of uptex License: LPPL-1.0 +Summary: Binary files of uptex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-uptex >= %{texlive_version} #!BuildIgnore: texlive-uptex +Recommends: texlive-collection-basic >= %{texlive_version} Recommends: texlive-collection-fontsrecommended >= %{texlive_version} Recommends: texlive-collection-genericrecommended >= %{texlive_version} -Recommends: texlive-collection-basic >= %{texlive_version} Prefix: %{_bindir} %description uptex-bin @@ -3195,8 +3243,8 @@ Binary files of uptex %package urlbst-bin Version: %{texlive_version}.%{texlive_release}.svn23262 Release: 0 -Summary: Binary files of urlbst License: LPPL-1.0 +Summary: Binary files of urlbst Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-urlbst >= %{texlive_version} @@ -3209,8 +3257,8 @@ Binary files of urlbst %package velthuis-bin Version: %{texlive_version}.%{texlive_release}.svn50281 Release: 0 -Summary: Binary files of velthuis License: LPPL-1.0 +Summary: Binary files of velthuis Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-velthuis >= %{texlive_version} @@ -3223,8 +3271,8 @@ Binary files of velthuis %package vlna-bin Version: %{texlive_version}.%{texlive_release}.svn50281 Release: 0 -Summary: Binary files of vlna License: LPPL-1.0 +Summary: Binary files of vlna Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-vlna >= %{texlive_version} @@ -3237,8 +3285,8 @@ Binary files of vlna %package vpe-bin Version: %{texlive_version}.%{texlive_release}.svn6897 Release: 0 -Summary: Binary files of vpe License: LPPL-1.0 +Summary: Binary files of vpe Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-vpe >= %{texlive_version} @@ -3249,10 +3297,10 @@ Prefix: %{_bindir} Binary files of vpe %package web-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn57878 Release: 0 -Summary: Binary files of web License: LPPL-1.0 +Summary: Binary files of web Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-web >= %{texlive_version} @@ -3265,8 +3313,8 @@ Binary files of web %package webquiz-bin Version: %{texlive_version}.%{texlive_release}.svn50419 Release: 0 -Summary: Binary files of webquiz License: LPPL-1.0 +Summary: Binary files of webquiz Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-webquiz >= %{texlive_version} @@ -3279,8 +3327,8 @@ Binary files of webquiz %package wordcount-bin Version: %{texlive_version}.%{texlive_release}.svn46165 Release: 0 -Summary: Binary files of wordcount License: LPPL-1.0 +Summary: Binary files of wordcount Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-wordcount >= %{texlive_version} @@ -3291,10 +3339,10 @@ Prefix: %{_bindir} Binary files of wordcount %package xdvi-bin -Version: %{texlive_version}.%{texlive_release}.svn54358 +Version: %{texlive_version}.%{texlive_release}.svn58378 Release: 0 -Summary: Binary files of xdvi License: LPPL-1.0 +Summary: Binary files of xdvi Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-xdvi >= %{texlive_version} @@ -3307,8 +3355,8 @@ Binary files of xdvi %package xelatex-dev-bin Version: %{texlive_version}.%{texlive_release}.svn53999 Release: 0 -Summary: Binary files of xelatex-dev License: LPPL-1.0 +Summary: Binary files of xelatex-dev Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-xelatex-dev >= %{texlive_version} @@ -3322,10 +3370,10 @@ Prefix: %{_bindir} Binary files of xelatex-dev %package xetex-bin -Version: %{texlive_version}.%{texlive_release}.svn53999 +Version: %{texlive_version}.%{texlive_release}.svn58378 Release: 0 -Summary: Binary files of xetex License: LPPL-1.0 +Summary: Binary files of xetex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-bin-xetex <= %{texlive_previous} @@ -3342,8 +3390,8 @@ Binary files of xetex %package xindex-bin Version: %{texlive_version}.%{texlive_release}.svn49312 Release: 0 -Summary: Binary files of xindex License: LPPL-1.0 +Summary: Binary files of xindex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-xindex >= %{texlive_version} @@ -3353,11 +3401,25 @@ Prefix: %{_bindir} %description xindex-bin Binary files of xindex +%package xml2pmx-bin +Version: %{texlive_version}.%{texlive_release}.svn57878 +Release: 0 +License: LPPL-1.0 +Summary: Binary files of xml2pmx +Group: Productivity/Publishing/TeX/Utilities +URL: http://www.tug.org/texlive/ +Requires(pre): texlive-xml2pmx >= %{texlive_version} +#!BuildIgnore: texlive-xml2pmx +Prefix: %{_bindir} + +%description xml2pmx-bin +Binary files of xml2pmx + %package xmltex-bin Version: %{texlive_version}.%{texlive_release}.svn3006 Release: 0 -Summary: Binary files of xmltex License: LPPL-1.0 +Summary: Binary files of xmltex Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-bin-xmltex <= %{texlive_previous} @@ -3374,8 +3436,8 @@ Binary files of xmltex %package xpdfopen-bin Version: %{texlive_version}.%{texlive_release}.svn52917 Release: 0 -Summary: Binary files of xpdfopen License: LPPL-1.0 +Summary: Binary files of xpdfopen Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Obsoletes: texlive-pdftools-bin <= 2019 @@ -3389,8 +3451,8 @@ Binary files of xpdfopen %package yplan-bin Version: %{texlive_version}.%{texlive_release}.svn34398 Release: 0 -Summary: Binary files of yplan License: LPPL-1.0 +Summary: Binary files of yplan Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/texlive/ Requires(pre): texlive-yplan >= %{texlive_version} @@ -3401,7 +3463,7 @@ Prefix: %{_bindir} Binary files of yplan %package -n libkpathsea6 -Version: 6.3.2 +Version: 6.3.3 Release: 0 Summary: Path searching library for TeX-related files License: LGPL-2.1-or-later @@ -3418,13 +3480,13 @@ separately, but rather is released and maintained as part of the TeX-live sources. %package -n %{name}-kpathsea-devel -Version: 6.3.2 +Version: 6.3.3 Release: 0 Summary: Path searching library for TeX-related files License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ URL: http://www.tug.org/texlive/ -Requires: libkpathsea6 = 6.3.2 +Requires: libkpathsea6 = 6.3.3 %description -n %{name}-kpathsea-devel Kpathsea is a library and utility programs which provide path @@ -3435,7 +3497,7 @@ separately, but rather is released and maintained as part of the TeX-live sources. %package -n libptexenc1 -Version: 1.3.8 +Version: 1.3.9 Release: 0 Summary: Libraries of Kanji code convert library for pTeX License: BSD-3-Clause @@ -3449,13 +3511,13 @@ The ptexenc is a useful library for Japanese pTeX TeX by ASCII Co.) and its surrounding tools. %package -n %{name}-ptexenc-devel -Version: 1.3.8 +Version: 1.3.9 Release: 0 Summary: Libraries of Kanji code convert library for pTeX License: BSD-3-Clause Group: Development/Libraries/C and C++ URL: http://www.tug.org/texlive/ -Requires: libptexenc1 = 1.3.8 +Requires: libptexenc1 = 1.3.9 %description -n %{name}-ptexenc-devel This package includes the ptexenc development files. @@ -3495,7 +3557,7 @@ and output, which means to navigate from the source document to the typeset material and vice versa. %package -n libtexlua53-5 -Version: 5.3.5 +Version: 5.3.6 Release: 0 Summary: Libraries of an extended version of pdfTeX using Lua License: MIT @@ -3508,13 +3570,13 @@ LuaTeX is an extended version of pdfTeX using Lua as an embedded scripting language %package -n %{name}-texlua-devel -Version: 5.3.5 +Version: 5.3.6 Release: 0 Summary: Libraries of an extended version of pdfTeX using Lua License: MIT Group: Development/Libraries/C and C++ URL: http://www.tug.org/texlive/ -Requires: libtexlua53-5 = 5.3.5 +Requires: libtexlua53-5 = 5.3.6 %description -n %{name}-texlua-devel This package includes the luatex development files. @@ -3541,7 +3603,7 @@ Summary: Libraries of Just-In-Time compiler for Lua License: MIT Group: Development/Libraries/C and C++ URL: http://www.tug.org/texlive/ -Requires: libtexlua53-5 = 5.3.5 +Requires: libtexlua53-5 = 5.3.6 %description -n %{name}-texluajit-devel This package includes the LuaJIT development files. @@ -3552,13 +3614,13 @@ LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language Version: %{texlive_version}.%{texlive_release} Release: 0 Summary: Basic development packages for TeXLive -License: LGPL-2.1-or-later AND BSD-3-Clause AND SUSE-TeX +License: BSD-3-Clause AND LGPL-2.1-or-later AND SUSE-TeX Group: Development/Languages/Other URL: http://www.tug.org/texlive/ -Requires: libkpathsea6 = 6.3.2 -Requires: libptexenc1 = 1.3.8 +Requires: libkpathsea6 = 6.3.3 +Requires: libptexenc1 = 1.3.9 Requires: libsynctex2 = 1.21 -Requires: libtexlua53-5 = 5.3.5 +Requires: libtexlua53-5 = 5.3.6 %if %{with LuaJIT} Requires: libtexluajit2 = 2.1.0beta3 %endif @@ -3771,11 +3833,9 @@ This package is required by the package texlive-biber-bin. %patch5 -p0 -b .texdoc %patch6 -p0 -b .dviutils %patch8 -p0 -b .psutils -%patch10 -p0 -b .poppler %patch11 -p0 -b .lacheck %patch12 -p0 -b .warns %patch13 -p0 -b .x11r7 -%patch15 -p0 -b .overflow %patch17 -p0 -b .64 %patch18 -p0 -b .a2p %patch19 -p0 -b .dvipng @@ -3799,57 +3859,8 @@ rm -vf t/*.fastsort popd %endif -%patch53 -p0 -b .poppler0590 -%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.59.0}}%{!?pkg_vcmp:0} -%patch54 -p0 -b .poppler -%patch55 -p1 -b .popplerbool -%endif -%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.72.0}}%{!?pkg_vcmp:0} -%patch56 -p1 -b .popplerstring -%endif -%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.69.0}}%{!?pkg_vcmp:0} -%patch57 -p1 -b .popplerdict -%endif -%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.73.0}}%{!?pkg_vcmp:0} -%patch58 -p1 -b .poppler75 -%endif -%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.83.0}}%{!?pkg_vcmp:0} -%patch61 -p1 -b .poppler79 -%endif -%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.86.0}}%{!?pkg_vcmp:0} -%patch64 -p1 -b .poppler86 -%endif -pver=$(pkg-config --modversion poppler) -%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.79.0}}%{!?pkg_vcmp:0} -cp ./texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc ./texk/web2c/pdftexdir/pdftoepdf-poppler${pver}.cc -%endif %patch62 -p0 -b .kpserr -if pkg-config --atleast-version=0.59 poppler -then - for cc in $(find -name '*-newpoppler.cc') - do - test -e "$cc" || continue - old=${cc/-newpoppler/} - test -e "$old" && mv -fv $old $old.oldpoppler || : - mv -fv $cc $old - done - for cc in $(find -name '*-poppler0.59.0.cc') - do - test -e "$cc" || continue - old=${cc/-poppler0.59.0/} - test -e "$old" && mv -fv $old $old.oldpoppler || : - mv -fv $cc $old - done - for cc in $(find -name "*-poppler${pver}.cc") - do - test -e "$cc" || continue - old=${cc/-poppler${pver}/} - test -e "$old" && mv -fv $old $old.oldpoppler || : - mv -fv $cc $old - done -fi - # Correct FHS paths paths=$(find -name cnf-to-paths.awk) test -n "$paths" || exit 1 @@ -3974,10 +3985,6 @@ fi --with-system-zlib \ --with-system-expat \ --with-system-unzip \ -%if %{with poppler} - --with-system-poppler \ -%endif - --with-system-xpdf \ --with-system-libpng \ --with-system-pnglib \ --with-system-gd \ @@ -4515,10 +4522,13 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : %defattr(-,root,root,755) %{_bindir}/afm2pl +%files albatross-bin +%defattr(-,root,root,755) +%{_bindir}/albatross + %files aleph-bin %defattr(-,root,root,755) %{_bindir}/aleph -%{_bindir}/lamed %files amstex-bin %defattr(-,root,root,755) @@ -4862,6 +4872,10 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : %defattr(-,root,root,755) %{_bindir}/gsftopk +%files hyperxmp-bin +%defattr(-,root,root,755) +%{_bindir}/hyperxmp-add-bytecount + %files jadetex-bin %defattr(-,root,root,755) %{_bindir}/jadetex @@ -4967,6 +4981,10 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : %{_bindir}/ttftotype42 %endif +%files light-latex-make-bin +%defattr(-,root,root,755) +%{_bindir}/llmk + %files lilyglyphs-bin %defattr(-,root,root,755) %{_bindir}/lily-glyph-commands @@ -5294,6 +5312,10 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : %{_bindir}/mydvichk %{_bindir}/odd2even +%files spix-bin +%defattr(-,root,root,755) +%{_bindir}/spix + %files splitindex-bin %defattr(-,root,root,755) %{_bindir}/splitindex @@ -5438,6 +5460,10 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : %defattr(-,root,root,755) %{_bindir}/tie +%files tikztosvg-bin +%defattr(-,root,root,755) +%{_bindir}/tikztosvg + %files tpic2pdftex-bin %defattr(-,root,root,755) %{_bindir}/tpic2pdftex @@ -5524,6 +5550,10 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : %defattr(-,root,root,755) %{_bindir}/xindex +%files xml2pmx-bin +%defattr(-,root,root,755) +%{_bindir}/xml2pmx + %files xmltex-bin %defattr(-,root,root,755) %{_bindir}/pdfxmltex From 23eb405cbc8c3fd6b55333fb13a13e22891fb348414dff1b1917691307aa9396 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 12 Apr 2021 13:47:24 +0000 Subject: [PATCH 2/5] Support mendex on non-Intel boxes OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=386 --- texlive.changes | 7 +++++++ texlive.spec | 31 +++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/texlive.changes b/texlive.changes index 6fcfd0f..5eccfe5 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 12 12:41:38 UTC 2021 - Dr. Werner Fink + +- Use -fsigned-char on non-Intel boxes for mendex and upmendex + otherwise the sort.c results are wrong +- Reenable pygmentex as now with python3 + ------------------------------------------------------------------- Tue Apr 6 14:03:37 UTC 2021 - Dr. Werner Fink diff --git a/texlive.spec b/texlive.spec index b8a035b..e554983 100644 --- a/texlive.spec +++ b/texlive.spec @@ -19,7 +19,7 @@ %define texlive_version 2021 %define texlive_previous 2020 %define texlive_release 20210325 -%define texlive_noarch 183 +%define texlive_noarch 184 %define texlive_source texlive-20210325-source %define __perl_requires %{nil} @@ -2658,6 +2658,23 @@ Prefix: %{_bindir} %description purifyeps-bin Binary files of purifyeps +%package pygmentex-bin +Version: %{texlive_version}.%{texlive_release}.svn34996 +Release: 0 +License: LPPL-1.0 +Summary: Binary files of pygmentex +Group: Productivity/Publishing/TeX/Utilities +URL: http://www.tug.org/texlive/ +Requires(pre): texlive-pygmentex >= %{texlive_version} +#!BuildIgnore: texlive-pygmentex +Recommends: texlive-collection-basic >= %{texlive_version} +Recommends: texlive-collection-fontsrecommended >= %{texlive_version} +Recommends: texlive-collection-genericrecommended >= %{texlive_version} +Prefix: %{_bindir} + +%description pygmentex-bin +Binary files of pygmentex + %package pythontex-bin Version: %{texlive_version}.%{texlive_release}.svn31638 Release: 0 @@ -3909,12 +3926,19 @@ popd else banner='for SUSE Linux' fi + # # Avoid win32 Makefile # find -name configure | xargs sed -ri '/(CONFIG_FILES|ac_config_files)=/ { s@[[:blank:]]+(otps/|)win32/Makefile@@p; }' find -name config.status | xargs -r rm -vf + # + # The (up)mendex unsigned character sort does not work on non-Intel boxes + # + sed -ri '/^CFLAGS/{ s/$/ -fsigned-char/ }' texk/mendexk/Makefile.in + sed -ri '/^CFLAGS/{ s/$/ -fsigned-char/ }' texk/upmendex/Makefile.in + # Run configure now ... no reautoconf here as TeX Live uses modified m4 macros # longinteger and off_t declarations are still inconsistent, do not enable # largefile unless you are testing. @@ -4430,7 +4454,6 @@ popd done # Currently disabled due python2 requirement rm -vf %{buildroot}%{_bindir}/ebong -rm -vf %{buildroot}%{_bindir}/pygmentex %if %{defined verify_permissions} %verifyscript kpathsea-bin @@ -5293,6 +5316,10 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : %defattr(-,root,root,755) %{_bindir}/purifyeps +%files pygmentex-bin +%defattr(-,root,root,755) +%{_bindir}/pygmentex + %files pythontex-bin %defattr(-,root,root,755) %{_bindir}/depythontex From 9b9218ef739cd18545e7d065000b5f78622d6b78e740d85542ed28b527619ecb Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 13 Apr 2021 08:53:15 +0000 Subject: [PATCH 3/5] Make mktexlsr work even in root's home OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=387 --- public.c | 10 ++++++++++ texlive.changes | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/public.c b/public.c index bfcd92c..d5d11af 100644 --- a/public.c +++ b/public.c @@ -127,6 +127,7 @@ int main(int argc, char *argv[]) if (ruid == 0 || euid == 0) { /* If user is root switch over to mktex:mktex */ int initgrp = 0; + char *cwd; if ((pwd = getpwnam(TEXUSR)) == (struct passwd*)0) goto err; @@ -171,6 +172,15 @@ int main(int argc, char *argv[]) setenv(ep->name, ep->value, 1); } + if ((cwd = getcwd(NULL, 0))) { + if (access(cwd, X_OK) < 0) { + int ret = chdir(pwd->pw_dir); + if (ret < 0) + fprintf(stderr, "public: %m\n"); + } + free(cwd); + } + } else if (rgid != grp->gr_gid && egid == grp->gr_gid) { rgid = grp->gr_gid; diff --git a/texlive.changes b/texlive.changes index 5eccfe5..ec9cd9c 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 13 08:50:31 UTC 2021 - Dr. Werner Fink + +- Make public wrapper change into mktex home directory if current + directory is not accessible + ------------------------------------------------------------------- Mon Apr 12 12:41:38 UTC 2021 - Dr. Werner Fink From d5f2b7fb7230cbdc53986e65a564da294298e6fe2327123bc1095cc20827a2a6 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 13 Apr 2021 08:54:28 +0000 Subject: [PATCH 4/5] Make mktexlsr work even in root's home OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=388 --- public.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public.c b/public.c index d5d11af..1806314 100644 --- a/public.c +++ b/public.c @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) if (access(cwd, X_OK) < 0) { int ret = chdir(pwd->pw_dir); if (ret < 0) - fprintf(stderr, "public: %m\n"); + fprintf(stderr, "public: %s: %m\n", pwd->pw_dir); } free(cwd); } From 7d55840c054f7e559071879f9791b2959292b2af63b1a85da0805620f5a020a2 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 26 Apr 2021 15:40:21 +0000 Subject: [PATCH 5/5] Upstream fix for mpost/luatex btex/etex OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=389 --- source-r58686:r58919.dif | 165 +++++++++++++++++++++++++++++++++++++++ texlive.changes | 6 ++ texlive.spec | 3 + 3 files changed, 174 insertions(+) create mode 100644 source-r58686:r58919.dif diff --git a/source-r58686:r58919.dif b/source-r58686:r58919.dif new file mode 100644 index 0000000..5c2b73a --- /dev/null +++ b/source-r58686:r58919.dif @@ -0,0 +1,165 @@ +--- + texk/web2c/luatexdir/ChangeLog | 9 +++++++++ + texk/web2c/luatexdir/NEWS | 19 +++++++++++++++++++ + texk/web2c/luatexdir/luatex.c | 4 ++-- + texk/web2c/luatexdir/luatex_svnversion.h | 2 +- + texk/web2c/mplibdir/ChangeLog | 7 ++++++- + texk/web2c/mplibdir/am/libmplib.am | 2 +- + texk/web2c/mplibdir/am/mplib.am | 2 +- + texk/web2c/mplibdir/mp.w | 4 ++-- + texk/web2c/mplibdir/mpxout.w | 2 +- + texk/web2c/pmpostdir/pmp.ch | 8 ++++---- + 10 files changed, 46 insertions(+), 13 deletions(-) + +--- texk/web2c/luatexdir/ChangeLog ++++ texk/web2c/luatexdir/ChangeLog 2021-04-26 00:00:00.000000000 +0000 +@@ -1,3 +1,12 @@ ++2021-04-10 Luigi Scarso ++ * LuaTeX version 1.13.2 with MetaPost 2.01. ++ The version change in MetaPost ++ is due solely to the bug fix in btex .. etex ++ ++2021-04-02 Luigi Scarso ++ * LuaTeX version 1.13.1, ++ The version change is due solely to the bug fix in btex .. etex ++ + 2021-03-23 Karl Berry + * TL'21. + +--- texk/web2c/luatexdir/NEWS ++++ texk/web2c/luatexdir/NEWS 2021-04-26 00:00:00.000000000 +0000 +@@ -1,4 +1,23 @@ + ============================================================== ++LuaTeX 1.13.2 2021-04-10 ++============================================================== ++ ++MetaPost 2.01 (to mark the patch on the unwanted space in ++btex etex). ++ ++ ++ ++============================================================== ++LuaTeX 1.13.1 2021-04-02 ++============================================================== ++ ++Fixed an unwanted space in btex etex in metapost, introduced ++after a patch for troff. ++ ++ ++ ++ ++============================================================== + LuaTeX 1.13.0 2021-03-12 + ============================================================== + +--- texk/web2c/luatexdir/luatex.c ++++ texk/web2c/luatexdir/luatex.c 2021-04-26 00:00:00.000000000 +0000 +@@ -33,8 +33,8 @@ + */ + + int luatex_version = 113; +-int luatex_revision = '0'; +-const char *luatex_version_string = "1.13.0"; ++int luatex_revision = '2'; ++const char *luatex_version_string = "1.13.2"; + const char *engine_name = my_name; + + #include +--- texk/web2c/luatexdir/luatex_svnversion.h ++++ texk/web2c/luatexdir/luatex_svnversion.h 2021-04-26 00:00:00.000000000 +0000 +@@ -1 +1 @@ +-#define luatex_svn_revision 7418 ++#define luatex_svn_revision 7430 +--- texk/web2c/mplibdir/ChangeLog ++++ texk/web2c/mplibdir/ChangeLog 2021-04-26 00:00:00.000000000 +0000 +@@ -1,10 +1,15 @@ ++2021-04-10 Luigi Scarso ++ * Metapost version 2.01 (needed to mark the patch mpx_copy_mpto). ++ ++2021-04-02 Luigi Scarso ++ * Revert the patch in mpx_copy_mpto, it was wrong in tex mode. Added a check if in troff mode. ++ + 2021-03-23 Karl Berry + * TL'21. + + 2020-12-28 Luigi Scarso + * Temp, fix in mpx_copy_mpto, changed || with && to avoid a wrong final % + +- + 2020-12-27 Luigi Scarso + * Fixed some typos in manual (thank to 胡亚捷 (Hu Yajie) ) + * Added the undocumented -T option +--- texk/web2c/mplibdir/mp.w ++++ texk/web2c/mplibdir/mp.w 2021-04-26 00:00:00.000000000 +0000 +@@ -71,12 +71,12 @@ undergoes any modifications, so that it + @^extensions to \MP@> + @^system dependencies@> + +-@d default_banner "This is MetaPost, Version 2.00" /* printed when \MP\ starts */ ++@d default_banner "This is MetaPost, Version 2.01" /* printed when \MP\ starts */ + @d true 1 + @d false 0 + + @= +-#define metapost_version "2.00" ++#define metapost_version "2.01" + + @ The external library header for \MP\ is |mplib.h|. It contains a + few typedefs and the header defintions for the externally used +--- texk/web2c/mplibdir/mpxout.w ++++ texk/web2c/mplibdir/mpxout.w 2021-04-26 00:00:00.000000000 +0000 +@@ -564,7 +564,7 @@ static void mpx_copy_mpto (MPX mpx, FILE + if (textype == B_TEX) { + /* put no |%| at end if it's only 1 line total, starting with |%|; + * this covers the special case |%&format| in a single line. */ +- if (t != s && *t != '%') ++ if ((t != s || *t != '%') && mpx->mode == mpx_tex_mode) + fprintf(outfile,"%%"); + } + free(res); +--- texk/web2c/mplibdir/am/libmplib.am ++++ texk/web2c/mplibdir/am/libmplib.am 2021-04-26 00:00:00.000000000 +0000 +@@ -1,6 +1,6 @@ + ## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib. + ## +-## Copyright (C) 2015-2020 Luigi Scarso ++## Copyright (C) 2015-2021 Luigi Scarso + ## Copyright (C) 2009-2014 Peter Breitenlohner + ## You may freely use, modify and/or distribute this file. + +--- texk/web2c/mplibdir/am/mplib.am ++++ texk/web2c/mplibdir/am/mplib.am 2021-04-26 00:00:00.000000000 +0000 +@@ -1,6 +1,6 @@ + ## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost. + ## +-## Copyright 2017-2018 Luigi Scarso ++## Copyright 2017-2021 Luigi Scarso + ## Copyright 2009-2015 Peter Breitenlohner + ## You may freely use, modify and/or distribute this file. + +--- texk/web2c/pmpostdir/pmp.ch ++++ texk/web2c/pmpostdir/pmp.ch 2021-04-26 00:00:00.000000000 +0000 +@@ -13,19 +13,19 @@ + % + + @x +-@d default_banner "This is MetaPost, Version 2.00" /* printed when \MP\ starts */ ++@d default_banner "This is MetaPost, Version 2.01" /* printed when \MP\ starts */ + @y + @z + + @x +-#define metapost_version "2.00" ++#define metapost_version "2.01" + @y + #ifdef UPMP + #define P_UP "up" +-#define metapost_version "2.00-0.04-u1.27" ++#define metapost_version "2.01-0.04-u1.27" + #else + #define P_UP "p" +-#define metapost_version "2.00-0.04" ++#define metapost_version "2.01-0.04" + #endif + #define default_banner "This is " P_UP "MetaPost, Version " metapost_version /* printed when \MP\ starts */ + @z diff --git a/texlive.changes b/texlive.changes index ec9cd9c..a7094fd 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 26 09:46:36 UTC 2021 - Dr. Werner Fink + +- Add patch source-r58686:r58919.dif + * Upstream fix for mpost/luatex btex/etex + ------------------------------------------------------------------- Tue Apr 13 08:50:31 UTC 2021 - Dr. Werner Fink diff --git a/texlive.spec b/texlive.spec index e554983..4b7d67b 100644 --- a/texlive.spec +++ b/texlive.spec @@ -259,6 +259,8 @@ Patch44: biber-certs.dif Patch47: biber-perl-5.18.2.dif # PATCH-FIX-SUSE Let it build even without ls-R files around Patch62: source-psutils-kpathsea.dif +# PATCH-FIX-UPSTREAM Upstream fix for mpost/luatex btex/etex +Patch63: source-r58686:r58919.dif # PATCH-FIX-SUSE Support luajit on ppc64/ppc64le Patch104: 0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch # PATCH-FIX-SUSE Support luajit fix for arm64 @@ -3877,6 +3879,7 @@ popd %endif %patch62 -p0 -b .kpserr +%patch63 -p0 -b .be # Correct FHS paths paths=$(find -name cnf-to-paths.awk)