Dr. Werner Fink 2019-05-10 14:09:22 +00:00 committed by Git OBS Bridge
parent 94b7055de9
commit 12bf1e4d3f
27 changed files with 468 additions and 1221 deletions

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

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

View File

@ -1,9 +1,7 @@
--- ---
Build.PL | 1 - Build.PL | 1 -
META.json | 1 -
META.yml | 1 -
bin/biber | 2 ++ bin/biber | 2 ++
4 files changed, 2 insertions(+), 3 deletions(-) 2 files changed, 2 insertions(+), 1 deletion(-)
--- Build.PL --- Build.PL
+++ Build.PL 2018-04-12 12:07:59.531719830 +0000 +++ Build.PL 2018-04-12 12:07:59.531719830 +0000
@ -15,29 +13,9 @@
'Regexp::Common' => 0, 'Regexp::Common' => 0,
'Log::Log4perl' => 0, 'Log::Log4perl' => 0,
'Unicode::Collate' => '1.25', 'Unicode::Collate' => '1.25',
--- META.json
+++ META.json 2018-04-12 12:08:19.691347923 +0000
@@ -49,7 +49,6 @@
"List::MoreUtils" : "0",
"List::MoreUtils::XS" : "0",
"Log::Log4perl" : "0",
- "Mozilla::CA" : "20160104",
"PerlIO::utf8_strict" : "0",
"Regexp::Common" : "0",
"Sort::Key" : "0",
--- META.yml
+++ META.yml 2018-04-12 12:08:45.330874919 +0000
@@ -94,7 +94,6 @@ requires:
List::MoreUtils: '0'
List::MoreUtils::XS: '0'
Log::Log4perl: '0'
- Mozilla::CA: '20160104'
PerlIO::utf8_strict: '0'
Regexp::Common: '0'
Sort::Key: '0'
--- bin/biber --- bin/biber
+++ bin/biber 2018-04-12 12:06:39.913188617 +0000 +++ bin/biber 2018-04-12 12:06:39.913188617 +0000
@@ -114,6 +114,8 @@ GetOptions( @@ -116,6 +116,8 @@ GetOptions(
) or pod2usage(-verbose => 0, ) or pod2usage(-verbose => 0,
-exitval => EXIT_ERROR); -exitval => EXIT_ERROR);

View File

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

View File

@ -1,20 +0,0 @@
---
m4/kpse-freetype2-flags.m4 | 4 ++++
1 file changed, 4 insertions(+)
--- texlive-bin.orig/m4/kpse-freetype2-flags.m4
+++ texlive-bin/m4/kpse-freetype2-flags.m4
@@ -28,9 +28,13 @@
AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
+AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl
if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+ FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
fi

View File

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

View File

@ -1,86 +0,0 @@
Extracted from svn source tree of TeXLive for CVE-2018-17407 (bsc#1109673)
------------------------------------------------------------------------
r48697 | preining | 2018-09-19 06:02:06 +0200 (Wed, 19 Sep 2018) | 1 line
writet1 protection against buffer overflow
------------------------------------------------------------------------
| Index: Build/source/texk/dvipsk/ChangeLog
| ===================================================================
| --- Build/source/texk/dvipsk/ChangeLog (revision 48696)
| +++ Build/source/texk/dvipsk/ChangeLog (revision 48697)
| @@ -1,3 +1,8 @@
| +2018-09-18 Nick Roessler <nicholas.e.roessler@gmail.com>
| +
| + * writet1.c (t1_check_unusual_charstring): protect against buffer
| + overflow.
| +
| 2018-04-14 Karl Berry <karl@tug.org>
|
| * Version 5.998 for TeX Live 2018 release.
Index: Build/source/texk/dvipsk/writet1.c
===================================================================
--- Build/source/texk/dvipsk/writet1.c (revision 48696)
+++ Build/source/texk/dvipsk/writet1.c (revision 48697)
@@ -1449,7 +1449,9 @@
*(strend(t1_buf_array) - 1) = ' ';
t1_getline();
+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE);
strcat(t1_buf_array, t1_line_array);
+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE);
strcpy(t1_line_array, t1_buf_array);
t1_line_ptr = eol(t1_line_array);
}
| Index: Build/source/texk/web2c/luatexdir/ChangeLog
| ===================================================================
| --- Build/source/texk/web2c/luatexdir/ChangeLog (revision 48696)
| +++ Build/source/texk/web2c/luatexdir/ChangeLog (revision 48697)
| @@ -1,3 +1,7 @@
| +2018-09-18 Nick Roessler <nicholas.e.roessler@gmail.com>
| + * fonts/writet1.w (t1_check_unusual_charstring): protect against
| + buffer overflow.
| +
| 2018-08-27 Luigi Scarso <luigi.scarso@gmail.com>
| * dropped dependency from gmp and mpfr
|
Index: Build/source/texk/web2c/luatexdir/font/writet1.c
===================================================================
--- Build/source/texk/web2c/luatexdir/font/writet1.w (revision 48696)
+++ Build/source/texk/web2c/luatexdir/font/writet1.w (revision 48697)
@@ -1581,7 +1581,9 @@
if (sscanf(p, "%i", &i) != 1) {
strcpy(t1_buf_array, t1_line_array);
t1_getline();
+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE);
strcat(t1_buf_array, t1_line_array);
+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE);
strcpy(t1_line_array, t1_buf_array);
t1_line_ptr = eol(t1_line_array);
}
| Index: Build/source/texk/web2c/pdftexdir/ChangeLog
| ===================================================================
| --- Build/source/texk/web2c/pdftexdir/ChangeLog (revision 48696)
| +++ Build/source/texk/web2c/pdftexdir/ChangeLog (revision 48697)
| @@ -1,3 +1,8 @@
| +2018-09-18 Nick Roessler <nicholas.e.roessler@gmail.com>
| +
| + * writet1.c (t1_check_unusual_charstring): protect against buffer
| + overflow.
| +
| 2018-09-09 Karl Berry <karl@tug.org>
|
| * expanded.test,
Index: Build/source/texk/web2c/pdftexdir/writet1.c
===================================================================
--- Build/source/texk/web2c/pdftexdir/writet1.c (revision 48696)
+++ Build/source/texk/web2c/pdftexdir/writet1.c (revision 48697)
@@ -1598,7 +1598,9 @@
*(strend(t1_buf_array) - 1) = ' ';
t1_getline();
+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE);
strcat(t1_buf_array, t1_line_array);
+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE);
strcpy(t1_line_array, t1_buf_array);
t1_line_ptr = eol(t1_line_array);
}

View File

@ -19,7 +19,7 @@
AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes]) AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
--- configure --- configure
+++ configure 2018-04-10 08:18:33.596283890 +0000 +++ configure 2018-04-10 08:18:33.596283890 +0000
@@ -22265,9 +22265,6 @@ fi @@ -22269,9 +22269,6 @@ fi
if test "x$syslib_status" = xno; then if test "x$syslib_status" = xno; then
as_fn_error $? "some requested system libraries failed" "$LINENO" 5 as_fn_error $? "some requested system libraries failed" "$LINENO" 5
fi fi
@ -35,8 +35,8 @@
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
dnl dnl
-AC_INIT([dvipdfm-x (TeX Live)], [20180217], [tex-k@tug.org]) -AC_INIT([dvipdfm-x (TeX Live)], [20190225], [tex-k@tug.org])
+AC_INIT([dvipdfmx (TeX Live)], [20180217], [tex-k@tug.org]) +AC_INIT([dvipdfmx (TeX Live)], [20190225], [tex-k@tug.org])
AC_PREREQ([2.65]) AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([agl.c]) AC_CONFIG_SRCDIR([agl.c])
AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_AUX_DIR([../../build-aux])
@ -50,9 +50,9 @@
-PACKAGE_TARNAME='dvipdfm-x--tex-live-' -PACKAGE_TARNAME='dvipdfm-x--tex-live-'
+PACKAGE_NAME='dvipdfmx (TeX Live)' +PACKAGE_NAME='dvipdfmx (TeX Live)'
+PACKAGE_TARNAME='dvipdfmx' +PACKAGE_TARNAME='dvipdfmx'
PACKAGE_VERSION='20180217' PACKAGE_VERSION='20190225'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20180217' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20190225'
+PACKAGE_STRING='dvipdfmx (TeX Live) 20180217' +PACKAGE_STRING='dvipdfmx (TeX Live) 20190225'
PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL='' PACKAGE_URL=''
@ -62,6 +62,6 @@
# Define the identity of the package. # Define the identity of the package.
- PACKAGE='dvipdfm-x--tex-live-' - PACKAGE='dvipdfm-x--tex-live-'
+ PACKAGE='dvipdfmx' + PACKAGE='dvipdfmx'
VERSION='20180217' VERSION='20190225'

View File

@ -1,29 +0,0 @@
--- texk/dvipdfm-x/pngimage.c_orig 2018-04-27 02:37:38.954103428 +0200
+++ texk/dvipdfm-x/pngimage.c 2018-04-27 02:48:48.121731743 +0200
@@ -964,12 +964,16 @@
png_bytep trans;
int num_trans;
png_uint_32 i;
+ png_byte bpc, mask, shift;
if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ||
!png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL)) {
WARN("%s: PNG does not have valid tRNS chunk but tRNS is requested.", PNG_DEBUG_STR);
return NULL;
}
+ bpc = png_get_bit_depth(png_ptr, info_ptr);
+ mask = 0xff >> (8 - bpc);
+ shift = 8 - bpc;
smask = pdf_new_stream(STREAM_COMPRESS);
dict = pdf_stream_dict(smask);
@@ -981,7 +985,8 @@
pdf_add_dict(dict, pdf_new_name("ColorSpace"), pdf_new_name("DeviceGray"));
pdf_add_dict(dict, pdf_new_name("BitsPerComponent"), pdf_new_number(8));
for (i = 0; i < width*height; i++) {
- png_byte idx = image_data_ptr[i];
+ /* data is packed for 1/2/4 bpc formats, msb first */
+ png_byte idx = (image_data_ptr[bpc * i / 8] >> (shift - bpc * i % 8)) & mask;
smask_data_ptr[i] = (idx < num_trans) ? trans[idx] : 0xff;
}
pdf_add_stream(smask, (char *)smask_data_ptr, width*height);

View File

@ -60,7 +60,7 @@
+exec dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(190mm,-10mm)' $1 $2 +exec dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(190mm,-10mm)' $1 $2
--- texk/seetexk/configure --- texk/seetexk/configure
+++ texk/seetexk/configure 2018-04-10 08:25:10.644838384 +0000 +++ texk/seetexk/configure 2018-04-10 08:25:10.644838384 +0000
@@ -14939,7 +14939,7 @@ elif test "x$need_kpathsea:$with_system_ @@ -14943,7 +14943,7 @@ elif test "x$need_kpathsea:$with_system_
as_fn_error $? "did not find kpathsea" "$LINENO" 5 as_fn_error $? "did not find kpathsea" "$LINENO" 5
fi fi
else else

View File

@ -4,138 +4,15 @@ Date: Sat, 22 Dec 2018 00:25:44 +0100
Subject: [PATCH] Use bool instead of GBool Subject: [PATCH] Use bool instead of GBool
--- ---
luatexdir/image/pdftoepdf.w | 12 ++++++------
luatexdir/lua/lepdflib.cc | 20 ++++++++++----------
pdftexdir/pdftoepdf.cc | 6 +++--- pdftexdir/pdftoepdf.cc | 6 +++---
pdftexdir/pdftosrc.cc | 4 ++-- pdftexdir/pdftosrc.cc | 4 ++--
4 files changed, 16 insertions(+), 16 deletions(-) 4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w
index 7ba2973..dedc489 100644
--- a/texk/web2c/luatexdir/image/pdftoepdf.w
+++ b/texk/web2c/luatexdir/image/pdftoepdf.w
@@ -35,7 +35,7 @@
extern void md5(Guchar *msg, int msgLen, Guchar *digest);
-static GBool isInit = gFalse;
+static bool isInit = false;
/* Maintain AVL tree of all PDF files for embedding */
@@ -587,11 +587,11 @@ void read_pdf_info(image_dict * idict)
const PDFRectangle *pagebox;
int pdf_major_version_found, pdf_minor_version_found;
float xsize, ysize, xorig, yorig;
- if (isInit == gFalse) {
+ if (isInit == false) {
if (!(globalParams))
globalParams = new GlobalParams();
- globalParams->setErrQuiet(gFalse);
- isInit = gTrue;
+ globalParams->setErrQuiet(false);
+ isInit = true;
}
if (img_type(idict) == IMG_TYPE_PDF)
pdf_doc = refPdfDocument(img_filepath(idict), FE_FAIL);
@@ -966,7 +966,7 @@ void epdf_free()
if (PdfDocumentTree != NULL)
avl_destroy(PdfDocumentTree, destroyPdfDocument);
PdfDocumentTree = NULL;
- if (isInit == gTrue)
+ if (isInit == true)
delete globalParams;
- isInit = gFalse;
+ isInit = false;
}
diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
index a16bf3b..36f1601 100644
--- a/texk/web2c/luatexdir/lua/lepdflib.cc
+++ b/texk/web2c/luatexdir/lua/lepdflib.cc
@@ -439,7 +439,7 @@ static int l_new_Object(lua_State * L)
break;
case 1:
if (lua_isboolean (L,1)) {
- uout->d = new Object(lua_toboolean(L, 1)? gTrue : gFalse);
+ uout->d = new Object(lua_toboolean(L, 1)? true : false);
uout->atype = ALLOC_LEPDF;
uout->pc = 0;
uout->pd = NULL;
@@ -1527,9 +1527,9 @@ static int m_Object_initBool(lua_State * L)
pdfdoc_changed_error(L);
luaL_checktype(L, 2, LUA_TBOOLEAN);
if (lua_toboolean(L, 2) != 0)
- *((Object *) uin->d) = Object(gTrue);
+ *((Object *) uin->d) = Object(true);
else
- *((Object *) uin->d) = Object(gFalse);
+ *((Object *) uin->d) = Object(false);
return 0;
}
@@ -3038,12 +3038,12 @@ m_poppler_get_BOOL(Attribute, isHidden);
static int m_Attribute_setHidden(lua_State * L)
{
- GBool i;
+ bool i;
udstruct *uin;
uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
- i = (GBool) lua_toboolean(L, 2);
+ i = lua_toboolean(L, 2);
((Attribute *) uin->d)->setHidden(i);
return 0;
}
@@ -3180,7 +3180,7 @@ static int m_StructElement_getParentRef(lua_State * L)
// Ref is false if the C++ functione return false
static int m_StructElement_getPageRef(lua_State * L)
{
- GBool b;
+ bool b;
Ref *r;
udstruct *uin, *uout;
uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
@@ -3226,13 +3226,13 @@ static int m_StructElement_setRevision(lua_State * L)
static int m_StructElement_getText(lua_State * L)
{
- GBool i;
+ bool i;
const GooString *gs;
udstruct *uin;
uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
- i = (GBool) lua_toboolean(L, 2);
+ i = lua_toboolean(L, 2);
gs = ((StructElement *) uin->d)->getText(i);
if (gs != NULL)
lua_pushlstring(L, gs->getCString(), gs->getLength());
@@ -3321,7 +3321,7 @@ static int m_StructElement_findAttribute(lua_State * L)
{
Attribute::Type t;
Attribute::Owner o;
- GBool g;
+ bool g;
udstruct *uin, *uout;
const Attribute *a;
uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
@@ -3329,7 +3329,7 @@ static int m_StructElement_findAttribute(lua_State * L)
pdfdoc_changed_error(L);
t = (Attribute::Type) luaL_checkint(L,1);
o = (Attribute::Owner) luaL_checkint(L,2);
- g = (GBool) lua_toboolean(L, 3);
+ g = lua_toboolean(L, 3);
a = ((StructElement *) uin->d)->findAttribute(t,g,o);
if (a!=NULL){
diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc
index 013cf13..d26ac61 100644 index 013cf13..d26ac61 100644
--- a/texk/web2c/pdftexdir/pdftoepdf.cc --- a/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf.cc +++ b/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -120,7 +120,7 @@ struct UsedEncoding { @@ -143,7 +143,7 @@ struct UsedEncoding {
static InObj *inObjList; static InObj *inObjList;
static UsedEncoding *encodingList; static UsedEncoding *encodingList;
@ -144,7 +21,7 @@ index 013cf13..d26ac61 100644
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// Maintain list of open embedded PDF files // Maintain list of open embedded PDF files
@@ -724,8 +724,8 @@ read_pdf_info(char *image_name, char *page_name, int page_num, @@ -737,8 +737,8 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
// initialize // initialize
if (!isInit) { if (!isInit) {
globalParams = new GlobalParams(); globalParams = new GlobalParams();
@ -159,7 +36,7 @@ diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
index 3b1d250..7dbee00 100644 index 3b1d250..7dbee00 100644
--- a/texk/web2c/pdftexdir/pdftosrc.cc --- a/texk/web2c/pdftexdir/pdftosrc.cc
+++ b/texk/web2c/pdftexdir/pdftosrc.cc +++ b/texk/web2c/pdftexdir/pdftosrc.cc
@@ -173,9 +173,9 @@ int main(int argc, char *argv[]) @@ -178,9 +178,9 @@ int main(int argc, char *argv[])
// parse the header: object numbers and offsets // parse the header: object numbers and offsets
objStr.streamReset(); objStr.streamReset();

View File

@ -1,8 +1,17 @@
---
texk/web2c/pdftexdir/epdf.c | 2 +-
texk/web2c/pdftexdir/mapfile.c | 2 +-
texk/web2c/pdftexdir/pdftex-common.h | 6 +++---
texk/web2c/pdftexdir/pdftoepdf.cc | 28 ++++++++++++++--------------
texk/web2c/pdftexdir/pdftosrc.cc | 2 +-
texk/web2c/pdftexdir/writeenc.c | 2 +-
6 files changed, 21 insertions(+), 21 deletions(-)
Index: texk/web2c/pdftexdir/pdftosrc.cc Index: texk/web2c/pdftexdir/pdftosrc.cc
=================================================================== ===================================================================
--- texk/web2c/pdftexdir/pdftosrc.cc --- texk/web2c/pdftexdir/pdftosrc.cc
+++ texk/web2c/pdftexdir/pdftosrc.cc +++ texk/web2c/pdftexdir/pdftosrc.cc
@@ -72,7 +72,7 @@ int main(int argc, char *argv[]) @@ -73,7 +73,7 @@ int main(int argc, char *argv[])
Stream *s; Stream *s;
Object srcStream, srcName, catalogDict; Object srcStream, srcName, catalogDict;
FILE *outfile; FILE *outfile;
@ -15,7 +24,7 @@ Index: texk/web2c/pdftexdir/pdftoepdf.cc
=================================================================== ===================================================================
--- texk/web2c/pdftexdir/pdftoepdf.cc --- texk/web2c/pdftexdir/pdftoepdf.cc
+++ texk/web2c/pdftexdir/pdftoepdf.cc +++ texk/web2c/pdftexdir/pdftoepdf.cc
@@ -279,7 +279,7 @@ static int getNewObjectNumber(Ref ref) @@ -310,7 +310,7 @@ static int getNewObjectNumber(Ref ref)
static void copyObject(Object *); static void copyObject(Object *);
@ -24,16 +33,16 @@ Index: texk/web2c/pdftexdir/pdftoepdf.cc
{ {
pdf_puts("/"); pdf_puts("/");
for (; *s != 0; s++) { for (; *s != 0; s++) {
@@ -291,7 +291,7 @@ static void copyName(char *s) @@ -322,7 +322,7 @@ static void copyName(char *s)
} }
} }
-static void copyDictEntry(Object * obj, int i) -static void copyDictEntry(Object * obj, int i)
+static void copyDictEntry(const Object * obj, int i) +static void copyDictEntry(const Object * obj, int i)
{ {
Object obj1; PdfObject obj1;
copyName(obj->dictGetKey(i)); copyName(obj->dictGetKey(i));
@@ -301,7 +301,7 @@ static void copyDictEntry(Object * obj, @@ -332,7 +332,7 @@ static void copyDictEntry(Object * obj,
pdf_puts("\n"); pdf_puts("\n");
} }
@ -42,7 +51,7 @@ Index: texk/web2c/pdftexdir/pdftoepdf.cc
{ {
int i, l; int i, l;
if (!obj->isDict()) if (!obj->isDict())
@@ -311,10 +311,10 @@ static void copyDict(Object * obj) @@ -342,10 +342,10 @@ static void copyDict(Object * obj)
copyDictEntry(obj, i); copyDictEntry(obj, i);
} }
@ -55,16 +64,16 @@ Index: texk/web2c/pdftexdir/pdftoepdf.cc
if (!obj->isDict()) if (!obj->isDict())
pdftex_fail("PDF inclusion: invalid dict type <%s>", pdftex_fail("PDF inclusion: invalid dict type <%s>",
obj->getTypeName()); obj->getTypeName());
@@ -386,7 +386,7 @@ static void copyProcSet(Object * obj) @@ -398,7 +398,7 @@ static void copyProcSet(Object * obj)
return false;
} #define REPLACE_TYPE1C true
-static void copyFont(char *tag, Object * fontRef) -static void copyFont(char *tag, Object * fontRef)
+static void copyFont(const char *tag, Object * fontRef) +static void copyFont(const char *tag, Object * fontRef)
{ {
Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset, PdfObject fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
stemV; fontfile, ffsubtype, stemV;
@@ -471,7 +471,7 @@ static void copyFontResources(Object * obj) @@ -477,7 +477,7 @@ static void copyFontResources(Object * o
pdf_puts(">>\n"); pdf_puts(">>\n");
} }
@ -73,8 +82,8 @@ Index: texk/web2c/pdftexdir/pdftoepdf.cc
{ {
// copies all other resources (write_epdf handles Fonts and ProcSets), // copies all other resources (write_epdf handles Fonts and ProcSets),
@@ -558,8 +558,8 @@ static void copyObject(Object * obj) @@ -564,8 +564,8 @@ static void copyObject(Object * obj)
Object obj1; PdfObject obj1;
int i, l, c; int i, l, c;
Ref ref; Ref ref;
- char *p; - char *p;
@ -84,7 +93,7 @@ Index: texk/web2c/pdftexdir/pdftoepdf.cc
if (obj->isBool()) { if (obj->isBool()) {
pdf_printf("%s", obj->getBool()? "true" : "false"); pdf_printf("%s", obj->getBool()? "true" : "false");
} else if (obj->isInt()) { } else if (obj->isInt()) {
@@ -662,7 +662,7 @@ static void writeRefs() @@ -668,7 +668,7 @@ static void writeRefs()
static void writeEncodings() static void writeEncodings()
{ {
UsedEncoding *r, *n; UsedEncoding *r, *n;
@ -93,7 +102,7 @@ Index: texk/web2c/pdftexdir/pdftoepdf.cc
int i; int i;
for (r = encodingList; r != 0; r = r->next) { for (r = encodingList; r != 0; r = r->next) {
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
@@ -690,7 +690,7 @@ static void writeEncodings() @@ -696,7 +696,7 @@ static void writeEncodings()
} }
// get the pagebox according to the pagebox_spec // get the pagebox according to the pagebox_spec
@ -102,7 +111,7 @@ Index: texk/web2c/pdftexdir/pdftoepdf.cc
{ {
if (pagebox_spec == pdfboxspecmedia) if (pagebox_spec == pdfboxspecmedia)
return page->getMediaBox(); return page->getMediaBox();
@@ -722,7 +722,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num, @@ -728,7 +728,7 @@ read_pdf_info(char *image_name, char *pa
{ {
PdfDocument *pdf_doc; PdfDocument *pdf_doc;
Page *page; Page *page;
@ -111,8 +120,8 @@ Index: texk/web2c/pdftexdir/pdftoepdf.cc
#ifdef POPPLER_VERSION #ifdef POPPLER_VERSION
int pdf_major_version_found, pdf_minor_version_found; int pdf_major_version_found, pdf_minor_version_found;
#else #else
@@ -829,7 +829,7 @@ void write_epdf(void) @@ -847,7 +847,7 @@ void write_epdf(void)
Object groupDict; PdfObject groupDict;
bool writeSepGroup = false; bool writeSepGroup = false;
Object info; Object info;
- char *key; - char *key;
@ -120,9 +129,9 @@ Index: texk/web2c/pdftexdir/pdftoepdf.cc
char s[256]; char s[256];
int i, l; int i, l;
int rotate; int rotate;
@@ -856,7 +856,7 @@ void write_epdf(void) @@ -874,7 +874,7 @@ void write_epdf(void)
pageObj = xref->fetch(pageRef->num, pageRef->gen); xref->fetch(pageRef->num, pageRef->gen, &pageObj);
pageDict = pageObj.getDict(); pageDict = pageObj->getDict();
rotate = page->getRotate(); rotate = page->getRotate();
- PDFRectangle *pagebox; - PDFRectangle *pagebox;
+ const PDFRectangle *pagebox; + const PDFRectangle *pagebox;
@ -133,9 +142,9 @@ Index: texk/web2c/pdftexdir/epdf.c
=================================================================== ===================================================================
--- texk/web2c/pdftexdir/epdf.c --- texk/web2c/pdftexdir/epdf.c
+++ texk/web2c/pdftexdir/epdf.c +++ texk/web2c/pdftexdir/epdf.c
@@ -69,7 +69,7 @@ int get_fn_objnum(fd_entry * fd) @@ -73,7 +73,7 @@ int get_fn_objnum(fd_entry * fd)
* leading slashes, but without blanks between them, like: /a/b/c
***********************************************************************/ #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, char *charset)
+void epdf_mark_glyphs(fd_entry * fd, const char *charset) +void epdf_mark_glyphs(fd_entry * fd, const char *charset)
@ -199,242 +208,3 @@ Index: texk/web2c/pdftexdir/writeenc.c
{ {
int i, i_old; int i, i_old;
assert(glyph_names != NULL); assert(glyph_names != NULL);
Index: texk/web2c/luatexdir/image/pdftoepdf.w
===================================================================
--- texk/web2c/luatexdir/image/pdftoepdf.w
+++ texk/web2c/luatexdir/image/pdftoepdf.w
@@ -361,9 +361,9 @@ void copyReal(PDF pdf, double d)
pdf->cave = true;
}
-static void copyString(PDF pdf, GooString * string)
+static void copyString(PDF pdf, const GooString * string)
{
- char *p;
+ const char *p;
unsigned char c;
size_t i, l;
p = string->getCString();
@@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooString * string)
pdf->cave = true;
}
-static void copyName(PDF pdf, char *s)
+static void copyName(PDF pdf, const char *s)
{
pdf_out(pdf, '/');
for (; *s != 0; s++) {
@@ -527,7 +527,7 @@ static void writeRefs(PDF pdf, PdfDocument * pdf_doc)
/* get the pagebox coordinates according to the pagebox_spec */
-static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
+static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
{
switch (pagebox_spec) {
case PDF_BOX_SPEC_MEDIA:
@@ -584,7 +584,7 @@ void read_pdf_info(image_dict * idict)
Catalog *catalog;
Page *page;
int rotate;
- PDFRectangle *pagebox;
+ const PDFRectangle *pagebox;
int pdf_major_version_found, pdf_minor_version_found;
float xsize, ysize, xorig, yorig;
if (isInit == gFalse) {
@@ -721,7 +721,7 @@ void write_epdf(PDF pdf, image_dict * idict, int suppress_optional_info)
Ref *pageref;
Dict *pageDict;
Object obj1, contents, pageobj, pagesobj1, pagesobj2, *op1, *op2, *optmp;
- PDFRectangle *pagebox;
+ const PDFRectangle *pagebox;
int i, l;
double bbox[4];
/* char s[256]; */
Index: texk/web2c/luatexdir/lua/lepdflib.cc
===================================================================
--- texk/web2c/luatexdir/lua/lepdflib.cc
+++ texk/web2c/luatexdir/lua/lepdflib.cc
@@ -591,7 +591,7 @@ static const struct luaL_Reg epdflib_f[] = {
#define m_poppler_get_poppler(in, out, function) \
static int m_##in##_##function(lua_State * L) \
{ \
- out *o; \
+ const out *o; \
udstruct *uin, *uout; \
uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \
if (uin->pd != NULL && uin->pd->pc != uin->pc) \
@@ -599,7 +599,8 @@ static int m_##in##_##function(lua_State * L) \
o = ((in *) uin->d)->function(); \
if (o != NULL) { \
uout = new_##out##_userdata(L); \
- uout->d = o; \
+ uout->d = (void *)(o); \
+ uout->atype = ALLOC_POPPLER; \
uout->pc = uin->pc; \
uout->pd = uin->pd; \
} else \
@@ -669,7 +670,7 @@ static int m_##in##_##function(lua_State * L) \
#define m_poppler_get_GOOSTRING(in, function) \
static int m_##in##_##function(lua_State * L) \
{ \
- GooString *gs; \
+ const GooString *gs; \
udstruct *uin; \
uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \
if (uin->pd != NULL && uin->pd->pc != uin->pc) \
@@ -1807,7 +1808,7 @@ static int m_Object_getNum(lua_State * L)
static int m_Object_getString(lua_State * L)
{
- GooString *gs;
+ const GooString *gs;
udstruct *uin;
uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
@@ -2465,7 +2466,7 @@ m_PDFDoc_INT(getErrorCode);
static int m_PDFDoc_getFileName(lua_State * L)
{
- GooString *gs;
+ const GooString *gs;
udstruct *uin;
uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
@@ -2553,7 +2554,7 @@ m_PDFDoc_INT(getNumPages);
static int m_PDFDoc_readMetadata(lua_State * L)
{
- GooString *gs;
+ const GooString *gs;
udstruct *uin;
uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
@@ -2571,7 +2572,7 @@ static int m_PDFDoc_readMetadata(lua_State * L)
static int m_PDFDoc_getStructTreeRoot(lua_State * L)
{
- StructTreeRoot *obj;
+ const StructTreeRoot *obj;
udstruct *uin, *uout;
uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
@@ -2579,7 +2580,8 @@ static int m_PDFDoc_getStructTreeRoot(lua_State * L)
if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
uout = new_StructTreeRoot_userdata(L);
- uout->d = obj;
+ uout->d = (void *)(obj);
+ uout->atype = ALLOC_POPPLER;
uout->pc = uin->pc;
uout->pd = uin->pd;
} else
@@ -2610,7 +2612,7 @@ static int m_PDFDoc_findPage(lua_State * L)
static int m_PDFDoc_getLinks(lua_State * L)
{
int i, pages;
- Links *links;
+ const Links *links;
udstruct *uin, *uout;
uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
@@ -2621,7 +2623,8 @@ static int m_PDFDoc_getLinks(lua_State * L)
links = ((PdfDocument *) uin->d)->doc->getLinks(i);
if (links != NULL) {
uout = new_Links_userdata(L);
- uout->d = links;
+ uout->d = (void *)(links);
+ uout->atype = ALLOC_POPPLER;
uout->pc = uin->pc;
uout->pd = uin->pd;
} else
@@ -2634,7 +2637,7 @@ static int m_PDFDoc_getLinks(lua_State * L)
static int m_PDFDoc_findDest(lua_State * L)
{
GooString *name;
- LinkDest *dest;
+ const LinkDest *dest;
const char *s;
size_t len;
udstruct *uin, *uout;
@@ -2647,7 +2650,8 @@ static int m_PDFDoc_findDest(lua_State * L)
dest = ((PdfDocument *) uin->d)->doc->findDest(name);
if (dest != NULL) {
uout = new_LinkDest_userdata(L);
- uout->d = dest;
+ uout->d = (void *)(dest);
+ uout->atype = ALLOC_POPPLER;
uout->pc = uin->pc;
uout->pd = uin->pd;
} else
@@ -3227,7 +3231,7 @@ static int m_StructElement_setRevision(lua_State * L)
static int m_StructElement_getText(lua_State * L)
{
GBool i;
- GooString *gs;
+ const GooString *gs;
udstruct *uin;
uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
Index: texk/web2c/xetexdir/pdfimage.cpp
===================================================================
--- texk/web2c/xetexdir/pdfimage.cpp
+++ texk/web2c/xetexdir/pdfimage.cpp
@@ -78,7 +78,7 @@ pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
Page* page = doc->getCatalog()->getPage(page_num);
- PDFRectangle* r;
+ const PDFRectangle* r;
switch (pdf_box) {
default:
case pdfbox_crop:
@@ -98,32 +98,33 @@ pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
break;
}
+ PDFRectangle r2 = *r;
int RotAngle = 0;
RotAngle = (int)page->getRotate() % 360;
if (RotAngle < 0)
RotAngle += 360;
if (RotAngle == 90 || RotAngle == 270) {
double tmpvalue;
- if (r->x1 > r->x2) {
- tmpvalue = r->x1;
- r->x1 = r->x2;
- r->x2 = tmpvalue;
+ if (r2.x1 > r2.x2) {
+ tmpvalue = r2.x1;
+ r2.x1 = r2.x2;
+ r2.x2 = tmpvalue;
}
- if (r->y1 > r->y2) {
- tmpvalue = r->y1;
- r->y1 = r->y2;
- r->y2 = tmpvalue;
+ if (r2.y1 > r2.y2) {
+ tmpvalue = r2.y1;
+ r2.y1 = r2.y2;
+ r2.y2 = tmpvalue;
}
- tmpvalue = r->x2;
- r->x2 = r->x1 + r->y2 - r->y1;
- r->y2 = r->y1 + tmpvalue - r->x1;
+ tmpvalue = r2.x2;
+ r2.x2 = r2.x1 + r2.y2 - r2.y1;
+ r2.y2 = r2.y1 + tmpvalue - r2.x1;
}
- box->x = 72.27 / 72 * my_fmin(r->x1, r->x2);
- box->y = 72.27 / 72 * my_fmin(r->y1, r->y2);
- box->wd = 72.27 / 72 * fabs(r->x2 - r->x1);
- box->ht = 72.27 / 72 * fabs(r->y2 - r->y1);
+ box->x = 72.27 / 72 * my_fmin(r2.x1, r2.x2);
+ box->y = 72.27 / 72 * my_fmin(r2.y1, r2.y2);
+ box->wd = 72.27 / 72 * fabs(r2.x2 - r2.x1);
+ box->ht = 72.27 / 72 * fabs(r2.y2 - r2.y1);
delete doc;

View File

@ -1,14 +0,0 @@
---
texk/web2c/synctexdir/am/synctex.am | 1 +
1 file changed, 1 insertion(+)
--- texk/web2c/synctexdir/am/synctex.am
+++ texk/web2c/synctexdir/am/synctex.am
@@ -55,6 +55,7 @@
if SYNCTEX
syncinclude_HEADERS = \
synctexdir/synctex_parser.h \
+ synctexdir/synctex_version.h \
synctexdir/synctex_parser_utils.h
pkgconfig_DATA = synctexdir/synctex.pc

View File

@ -1,47 +0,0 @@
From bcac61bbec874191c5efa748be5246e0a6835d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sat, 22 Dec 2018 03:37:33 +0100
Subject: [PATCH] Fix tautological (always false) compare
The current code compares the PDF document change counter with itself, which
is always false. Compare change counter of the wrapped document with the
counter of the wrapper instead.
---
luatexdir/lua/lepdflib.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
index 795550e..63fcc11 100644
--- a/texk/web2c/luatexdir/lua/lepdflib.cc
+++ b/texk/web2c/luatexdir/lua/lepdflib.cc
@@ -1966,7 +1966,7 @@ static int m_Object_arrayAdd(lua_State * L)
if (uin->pd != NULL && uobj->pd != NULL && uin->pd != uobj->pd)
pdfdoc_differs_error(L);
if ((uin->pd != NULL && uin->pd->pc != uin->pc)
- || (uobj->pd != NULL && uobj->pd->pc != uobj->pd->pc))
+ || (uobj->pd != NULL && uobj->pd->pc != uobj->pc))
pdfdoc_changed_error(L);
if (!((Object *) uin->d)->isArray())
luaL_error(L, "Object is not an Array");
@@ -2047,7 +2047,7 @@ static int m_Object_dictAdd(lua_State * L)
if (uin->pd != NULL && uobj->pd != NULL && uin->pd != uobj->pd)
pdfdoc_differs_error(L);
if ((uin->pd != NULL && uin->pd->pc != uin->pc)
- || (uobj->pd != NULL && uobj->pd->pc != uobj->pd->pc))
+ || (uobj->pd != NULL && uobj->pd->pc != uobj->pc))
pdfdoc_changed_error(L);
if (!((Object *) uin->d)->isDict())
luaL_error(L, "Object is not a Dict");
@@ -2065,7 +2065,7 @@ static int m_Object_dictSet(lua_State * L)
if (uin->pd != NULL && uobj->pd != NULL && uin->pd != uobj->pd)
pdfdoc_differs_error(L);
if ((uin->pd != NULL && uin->pd->pc != uin->pc)
- || (uobj->pd != NULL && uobj->pd->pc != uobj->pd->pc))
+ || (uobj->pd != NULL && uobj->pd->pc != uobj->pc))
pdfdoc_changed_error(L);
if (!((Object *) uin->d)->isDict())
luaL_error(L, "Object is not a Dict");
--
2.19.2

View File

@ -1,25 +0,0 @@
--- utils/m-tx/mtx-src/preamble.c 2018-01-09 14:14:43.000000000 +0000
+++ utils/m-tx/mtx-src/preamble.c 2018-04-08 12:23:37.000000000 +0100
@@ -801,8 +801,8 @@
stave_size[i] = unspec;
for (i = 0; i <= maxstaves; i++)
nspace[i] = unspec;
- nspace[i] = unspec;
- stave_size[i-1] = unspec;
+ /* next line seems to be spurious. 0.63a RDT */
+ /* begin nspace[i]:=unspec; stave_size[i]:=unspec; end; */
n_pages = 1;
n_systems = 1;
readStyles();
--- utils/m-tx/mtx-src/preamble.pas 2018-01-09 14:14:43.000000000 +0000
+++ utils/m-tx/mtx-src/preamble.pas 2018-04-08 12:21:23.000000000 +0100
@@ -501,7 +501,8 @@
for i:=1 to maxvoices do setVocal(i,false);
for i:=1 to maxstaves do stave_size[i]:=unspec;
for i:=0 to maxstaves do nspace[i]:=unspec;
- begin nspace[i]:=unspec; stave_size[i]:=unspec; end;
+ { next line seems to be spurious. 0.63a RDT }
+ { begin nspace[i]:=unspec; stave_size[i]:=unspec; end; }
n_pages:=1; n_systems:=1;
readStyles; old_known_styles := known_styles;
for i:=1 to lines_in_paragraph do omit_line[i]:=false;

View File

@ -4,7 +4,7 @@
--- utils/lacheck/lacheck.test --- utils/lacheck/lacheck.test
+++ utils/lacheck/lacheck.test 2018-04-10 08:57:17.672625041 +0000 +++ utils/lacheck/lacheck.test 2018-04-10 08:57:17.672625041 +0000
@@ -7,5 +7,6 @@ @@ -9,5 +9,6 @@
./lacheck $srcdir/test.tex | \ ./lacheck $srcdir/test.tex | \
sed -e "s!$srcdir/test.tex!./test.tex!g" >test.out || exit 1 sed -e "s!$srcdir/test.tex!./test.tex!g" >test.out || exit 1

View File

@ -1,17 +0,0 @@
---
texk/web2c/patgen.ch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- texk/web2c/patgen.ch
+++ texk/web2c/patgen.ch 2018-05-03 15:37:08.333623698 +0000
@@ -78,8 +78,8 @@ begin
|trie_size| and greater than the number of occurrences of any pattern in
the dictionary}
@y
-@!trie_size=550000; {space for pattern trie}
-@!triec_size=260000; {space for pattern count trie, must be less than
+@!trie_size=10000000; {space for pattern trie}
+@!triec_size=5000000; {space for pattern count trie, must be less than
|trie_size| and greater than the number of occurrences of any pattern in
the dictionary}
@z

View File

@ -4,42 +4,17 @@ Date: Sat, 22 Dec 2018 03:00:04 +0100
Subject: [PATCH] Avoid leaking string copy Subject: [PATCH] Avoid leaking string copy
--- ---
luatexdir/lua/lepdflib.cc | 4 ++-- texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc | 2 +-
pdftexdir/pdftoepdf.cc | 2 +- texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-) 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 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/luatexdir/lua/lepdflib.cc b/luatexdir/lua/lepdflib.cc diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc
index 6ac6f7a..8239518 100644 --- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc
--- a/texk/web2c/luatexdir/lua/lepdflib.cc +++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc
+++ b/texk/web2c/luatexdir/lua/lepdflib.cc
@@ -1125,12 +1125,12 @@ m_poppler_get_INT(Dict, getLength);
static int m_Dict_add(lua_State * L)
{
- char *s;
+ const char *s;
udstruct *uin, *uobj;
uin = (udstruct *) luaL_checkudata(L, 1, M_Dict);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
- s = copyString(luaL_checkstring(L, 2));
+ s = luaL_checkstring(L, 2);
uobj = (udstruct *) luaL_checkudata(L, 3, M_Object);
((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d)));
return 0;
@@ -2051,7 +2051,7 @@ static int m_Object_dictAdd(lua_State * L)
pdfdoc_changed_error(L);
if (!((Object *) uin->d)->isDict())
luaL_error(L, "Object is not a Dict");
- ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d)));
+ ((Object *) uin->d)->dictAdd(s, std::move(*((Object *) uobj->d)));
return 0;
}
diff --git a/pdftexdir/pdftoepdf.cc b/pdftexdir/pdftoepdf.cc
index 98156ca..2ea5555 100644
--- a/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -977,7 +977,7 @@ The changes below seem to work fine. @@ -977,7 +977,7 @@ The changes below seem to work fine.
} }
l = dic1.getLength(); l = dic1.getLength();
@ -49,6 +24,63 @@ index 98156ca..2ea5555 100644
dic1.getValNF(i)); dic1.getValNF(i));
} }
// end modification // end modification
-- diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc
2.19.2 --- 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
@@ -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.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

View File

@ -4,133 +4,24 @@ Date: Sat, 22 Dec 2018 00:42:23 +0100
Subject: [PATCH] std::string Subject: [PATCH] std::string
--- ---
luatexdir/image/pdftoepdf.w | 2 +- texk/web2c/pdftexdir/pdftoepdf.cc | 6 +++---
luatexdir/lua/lepdflib.cc | 20 ++++++++++++-------- texk/web2c/pdftexdir/pdftosrc.cc | 6 +++---
pdftexdir/pdftoepdf.cc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
pdftexdir/pdftosrc.cc | 6 +++---
4 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w
index dedc489..241bf1d 100644
--- a/texk/web2c/luatexdir/image/pdftoepdf.w
+++ b/texk/web2c/luatexdir/image/pdftoepdf.w
@@ -366,7 +366,7 @@ static void copyString(PDF pdf, const GooString * string)
const char *p;
unsigned char c;
size_t i, l;
- p = string->getCString();
+ p = string->c_str();
l = (size_t) string->getLength();
if (pdf->cave)
pdf_out(pdf, ' ');
diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
index 36f1601..b816745 100644
--- a/texk/web2c/luatexdir/lua/lepdflib.cc
+++ b/texk/web2c/luatexdir/lua/lepdflib.cc
@@ -240,7 +240,7 @@ static int l_new_Attribute(lua_State * L)
if (uobj->pd != NULL && uobj->pd->pc != uobj->pc)
pdfdoc_changed_error(L);
uout = new_Attribute_userdata(L);
- uout->d = new Attribute(n, nlen, (Object *)uobj->d);
+ uout->d = new Attribute({n, nlen}, (Object *)uobj->d);
uout->atype = ALLOC_LEPDF;
uout->pc = uobj->pc;
uout->pd = uobj->pd;
@@ -677,7 +677,7 @@ static int m_##in##_##function(lua_State * L) \
pdfdoc_changed_error(L); \
gs = ((in *) uin->d)->function(); \
if (gs != NULL) \
- lua_pushlstring(L, gs->getCString(), gs->getLength()); \
+ lua_pushlstring(L, gs->c_str(), gs->getLength()); \
else \
lua_pushnil(L); \
return 1; \
@@ -912,7 +912,7 @@ static int m_Array_getString(lua_State * L)
if (i > 0 && i <= len) {
gs = new GooString();
if (((Array *) uin->d)->getString(i - 1, gs))
- lua_pushlstring(L, gs->getCString(), gs->getLength());
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
else
lua_pushnil(L);
delete gs;
@@ -1064,7 +1064,7 @@ static int m_Catalog_getJS(lua_State * L)
if (i > 0 && i <= len) {
gs = ((Catalog *) uin->d)->getJS(i - 1);
if (gs != NULL)
- lua_pushlstring(L, gs->getCString(), gs->getLength());
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
else
lua_pushnil(L);
delete gs;
@@ -1379,7 +1379,7 @@ static int m_GooString__tostring(lua_State * L)
uin = (udstruct *) luaL_checkudata(L, 1, M_GooString);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
- lua_pushlstring(L, ((GooString *) uin->d)->getCString(),
+ lua_pushlstring(L, ((GooString *) uin->d)->c_str(),
((GooString *) uin->d)->getLength());
return 1;
}
@@ -1815,7 +1815,7 @@ static int m_Object_getString(lua_State * L)
pdfdoc_changed_error(L);
if (((Object *) uin->d)->isString()) {
gs = ((Object *) uin->d)->getString();
- lua_pushlstring(L, gs->getCString(), gs->getLength());
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
} else
lua_pushnil(L);
return 1;
@@ -2473,7 +2473,7 @@ static int m_PDFDoc_getFileName(lua_State * L)
pdfdoc_changed_error(L);
gs = ((PdfDocument *) uin->d)->doc->getFileName();
if (gs != NULL)
- lua_pushlstring(L, gs->getCString(), gs->getLength());
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
else
lua_pushnil(L);
return 1;
@@ -2562,7 +2562,7 @@ static int m_PDFDoc_readMetadata(lua_State * L)
if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
gs = ((PdfDocument *) uin->d)->doc->readMetadata();
if (gs != NULL)
- lua_pushlstring(L, gs->getCString(), gs->getLength());
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
else
lua_pushnil(L);
} else
@@ -3239,7 +3239,7 @@ static int m_StructElement_getText(lua_State * L)
i = lua_toboolean(L, 2);
gs = ((StructElement *) uin->d)->getText(i);
if (gs != NULL)
- lua_pushlstring(L, gs->getCString(), gs->getLength());
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
else
lua_pushnil(L);
return 1;
diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc
index d26ac61..7c14570 100644 index d26ac61..7c14570 100644
--- a/texk/web2c/pdftexdir/pdftoepdf.cc --- a/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf.cc +++ b/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -22,7 +22,7 @@ This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at @@ -437,7 +437,7 @@ static void copyFont(const char *tag, Ob
https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk fd = epdf_create_fontdescriptor(fontmap, zround(stemV->getNum()));
by Arch Linux. A little modifications are made to avoid a crash for if (fontdesc->dictLookup("CharSet", &charset) &&
some kind of pdf images, such as figure_missing.pdf in gnuplot. charset->isString() && is_subsetable(fontmap))
-The poppler should be 0.59.0 or newer versions. - epdf_mark_glyphs(fd, charset->getString()->getCString());
+The poppler should be 0.72.0 or newer versions. + epdf_mark_glyphs(fd, charset->getString()->c_str());
POPPLER_VERSION should be defined.
*/
@@ -427,7 +427,7 @@ static void copyFont(const char *tag, Object * fontRef)
charset = fontdesc.dictLookup("CharSet");
if (!charset.isNull() &&
charset.isString() && is_subsetable(fontmap))
- epdf_mark_glyphs(fd, charset.getString()->getCString());
+ epdf_mark_glyphs(fd, charset.getString()->c_str());
else else
embed_whole_font(fd); embed_whole_font(fd);
addFontDesc(fontdescRef.getRef(), fd); addFontDesc(fontdescRef->getRef(), fd);
@@ -566,7 +566,7 @@ static void copyObject(Object * obj) @@ -576,7 +576,7 @@ static void copyObject(Object * obj)
pdf_printf("%s", convertNumToPDF(obj->getNum())); pdf_printf("%s", convertNumToPDF(obj->getNum()));
} else if (obj->isString()) { } else if (obj->isString()) {
s = obj->getString(); s = obj->getString();
@ -143,16 +34,16 @@ diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
index 7dbee00..cc44daf 100644 index 7dbee00..cc44daf 100644
--- a/texk/web2c/pdftexdir/pdftosrc.cc --- a/texk/web2c/pdftexdir/pdftosrc.cc
+++ b/texk/web2c/pdftexdir/pdftosrc.cc +++ b/texk/web2c/pdftexdir/pdftosrc.cc
@@ -109,7 +109,7 @@ int main(int argc, char *argv[]) @@ -114,7 +114,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "No SourceName found\n"); fprintf(stderr, "No SourceName found\n");
exit(1); exit(1);
} }
- outname = srcName.getString()->getCString(); - outname = (char *)srcName.getString()->getCString();
+ outname = srcName.getString()->c_str(); + outname = (char *)srcName.getString()->c_str();
// We cannot free srcName, as objname shares its string. // We cannot free srcName, as objname shares its string.
// srcName.free(); // srcName.free();
} else if (objnum > 0) { } else if (objnum > 0) {
@@ -118,7 +118,7 @@ int main(int argc, char *argv[]) @@ -123,7 +123,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Not a Stream object\n"); fprintf(stderr, "Not a Stream object\n");
exit(1); exit(1);
} }
@ -161,7 +52,7 @@ index 7dbee00..cc44daf 100644
if ((p = strrchr(buf, '.')) == 0) if ((p = strrchr(buf, '.')) == 0)
p = strchr(buf, 0); p = strchr(buf, 0);
if (objgen == 0) if (objgen == 0)
@@ -128,7 +128,7 @@ int main(int argc, char *argv[]) @@ -133,7 +133,7 @@ int main(int argc, char *argv[])
outname = buf; outname = buf;
} else { // objnum < 0 means we are extracting the XRef table } else { // objnum < 0 means we are extracting the XRef table
extract_xref_table = true; extract_xref_table = true;

View File

@ -3,15 +3,14 @@
texk/web2c/synctexdir/synctex_parser_api_level | 1 + texk/web2c/synctexdir/synctex_parser_api_level | 1 +
2 files changed, 2 insertions(+), 1 deletion(-) 2 files changed, 2 insertions(+), 1 deletion(-)
--- texk/web2c/synctexdir/ac/synctex.ac --- texk/web2c/synctexdir/ac/synctex.ac
+++ texk/web2c/synctexdir/ac/synctex.ac 2018-04-23 11:57:26.371746955 +0000 +++ texk/web2c/synctexdir/ac/synctex.ac 2019-04-18 07:52:09.402744074 +0000
@@ -5,7 +5,7 @@ dnl You may freely use, modify and/or di @@ -6,7 +6,7 @@ dnl
dnl
dnl Additional code for synctex dnl Additional code for synctex
dnl dnl
-m4_define([synctex_version], m4_chomp(m4_include([synctexdir/synctex_parser_version.txt]))[.0]) m4_define([synctex_version],
+m4_define([synctex_version], m4_chomp(m4_include([synctexdir/synctex_parser_api_level]))[.0]) - m4_chomp(m4_include([synctexdir/synctex_parser_api_level.txt])))
+ m4_chomp(m4_include([synctexdir/synctex_parser_api_level])))
AC_SUBST([SYNCTEXVERSION], [synctex_version]) AC_SUBST([SYNCTEXVERSION], [synctex_version])
KPSE_LT_VERSION([synctex]) KPSE_LT_VERSION([synctex])

View File

@ -4,7 +4,7 @@
--- utils/texdoctk/texdoctk.pl --- utils/texdoctk/texdoctk.pl
+++ utils/texdoctk/texdoctk.pl 2008-09-24 14:56:14.000000000 +0000 +++ utils/texdoctk/texdoctk.pl 2008-09-24 14:56:14.000000000 +0000
@@ -1461,7 +1461,7 @@ sub writerc { @@ -1476,7 +1476,7 @@ sub writerc {
mv $myrc,"$myrc.save" if (-e $myrc); mv $myrc,"$myrc.save" if (-e $myrc);
open(MYRC,">$myrc"); open(MYRC,">$myrc");
print MYRC "# user's .texdocrc, generated by program\n print MYRC "# user's .texdocrc, generated by program\n
@ -13,7 +13,7 @@
# can be left empty if \$TEXMFHOME is undefined # can be left empty if \$TEXMFHOME is undefined
HOMEDOCPATH=$homedocpath_tmp HOMEDOCPATH=$homedocpath_tmp
# general viewer behaviour (y or yes to make active) # general viewer behaviour (y or yes to make active)
@@ -1624,9 +1624,9 @@ sub readrc { @@ -1639,9 +1639,9 @@ sub readrc {
$localdocpath="$texmflocal/$localdocpath"; $localdocpath="$texmflocal/$localdocpath";
} }
} }

View File

@ -1,69 +0,0 @@
--- texk/dvipdfm-x/tt_cmap.c (revision 47624)
+++ texk/dvipdfm-x/tt_cmap.c (revision 47625)
@@ -1,6 +1,6 @@
/* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- Copyright (C) 2007-2017 by Jin-Hwan Cho and Shunsaku Hirata,
+ Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata,
the dvipdfmx project team.
This program is free software; you can redistribute it and/or modify
@@ -928,7 +928,6 @@
}
#undef MAX_UNICODES
if (unicode_count == -1) {
-#if defined(LIBDPX)
if(verbose > VERBOSE_LEVEL_MIN) {
if (name)
MESG("No Unicode mapping available: GID=%u, name=%s\n", gid, name);
@@ -935,12 +934,6 @@
else
MESG("No Unicode mapping available: GID=%u\n", gid);
}
-#else
- if (name)
- MESG("No Unicode mapping available: GID=%u, name=%s\n", gid, name);
- else
- MESG("No Unicode mapping available: GID=%u\n", gid);
-#endif /* LIBDPX */
} else {
/* the Unicode characters go into wbuf[2] and following, in UTF16BE */
/* we rely on WBUF_SIZE being more than adequate for MAX_UNICODES */
@@ -1021,13 +1014,7 @@
{
USHORT count = 0;
USHORT cid = cffont ? cff_charsets_lookup_inverse(cffont, gid) : gid;
-
- /* Skip PUA characters and alphabetic presentation forms, allowing
- * handle_subst_glyphs() as it might find better mapping. Fixes the
- * mapping of ligatures encoded in PUA in fonts like Linux Libertine
- * and old Adobe fonts.
- */
- if (is_used_char2(used_chars, cid) && !is_PUA_or_presentation(ch)) {
+ if (is_used_char2(used_chars, cid)) {
int len;
unsigned char *p = wbuf + 2;
@@ -1038,11 +1025,18 @@
len = UC_UTF16BE_encode_char((int32_t) ch, &p, wbuf + WBUF_SIZE);
CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len);
- /* Avoid duplicate entry
- * There are problem when two Unicode code is mapped to
- * single glyph...
+ /* Skip PUA characters and alphabetic presentation forms, allowing
+ * handle_subst_glyphs() as it might find better mapping. Fixes the
+ * mapping of ligatures encoded in PUA in fonts like Linux Libertine
+ * and old Adobe fonts.
*/
- used_chars[cid / 8] &= ~(1 << (7 - (cid % 8)));
+ if (!is_PUA_or_presentation(ch)) {
+ /* Avoid duplicate entry
+ * There are problem when two Unicode code is mapped to
+ * single glyph...
+ */
+ used_chars[cid / 8] &= ~(1 << (7 - (cid % 8)));
+ }
}
return count;

View File

@ -13,7 +13,7 @@
--- libs/gmp/Makefile.in --- libs/gmp/Makefile.in
+++ libs/gmp/Makefile.in 2016-06-07 13:29:33.925651292 +0000 +++ libs/gmp/Makefile.in 2016-06-07 13:29:33.925651292 +0000
@@ -306,7 +306,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -480,7 +480,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent am__v_lt_0 = --silent
am__v_lt_1 = am__v_lt_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -64,26 +64,10 @@
/* The number of units needed is ceil(DECNUMDIGITS/DECDPUN) */ /* The number of units needed is ceil(DECNUMDIGITS/DECDPUN) */
#define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN) #define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN)
--- libs/lua52/Makefile.in
+++ libs/lua52/Makefile.in 2016-06-07 13:29:33.925651292 +0000
@@ -201,11 +201,11 @@ depcomp = $(SHELL) $(top_srcdir)/../../b
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
+ $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
--- libs/lua53/Makefile.in --- libs/lua53/Makefile.in
+++ libs/lua53/Makefile.in 2016-06-07 13:29:33.925651292 +0000 +++ libs/lua53/Makefile.in 2016-06-07 13:29:33.925651292 +0000
@@ -202,11 +202,11 @@ depcomp = $(SHELL) $(top_srcdir)/../../b @@ -238,11 +238,11 @@ depcomp = $(SHELL) $(top_srcdir)/../../b
am__depfiles_maybe = depfiles @LUA53_TREE@/src/$(DEPDIR)/lzio.Plo
am__mv = mv -f am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -98,7 +82,7 @@
am__v_CC_0 = @echo " CC " $@; am__v_CC_0 = @echo " CC " $@;
--- libs/mpfr/Makefile.in --- libs/mpfr/Makefile.in
+++ libs/mpfr/Makefile.in 2016-06-07 13:29:33.925651292 +0000 +++ libs/mpfr/Makefile.in 2016-06-07 13:29:33.925651292 +0000
@@ -234,7 +234,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -337,7 +337,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent am__v_lt_0 = --silent
am__v_lt_1 = am__v_lt_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

View File

@ -338,7 +338,7 @@
--- texk/kpathsea/progname.c --- texk/kpathsea/progname.c
+++ texk/kpathsea/progname.c 2018-04-10 09:02:17.862982147 +0000 +++ texk/kpathsea/progname.c 2018-04-10 09:02:17.862982147 +0000
@@ -661,9 +661,9 @@ kpathsea_set_program_name (kpathsea kpse @@ -662,9 +662,9 @@ kpathsea_set_program_name (kpathsea kpse
/* SELFAUTODIR is actually the parent of the invocation directory, /* SELFAUTODIR is actually the parent of the invocation directory,
and SELFAUTOPARENT the grandparent. This is how teTeX did it. */ and SELFAUTOPARENT the grandparent. This is how teTeX did it. */
kpathsea_xputenv (kpse, "SELFAUTOLOC", fix_selfdir (sdir)); kpathsea_xputenv (kpse, "SELFAUTOLOC", fix_selfdir (sdir));
@ -351,7 +351,7 @@
sdir_greatgrandparent = xdirname (sdir_grandparent); sdir_greatgrandparent = xdirname (sdir_grandparent);
kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent)); kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
--- texk/kpathsea/texmf.cnf --- texk/kpathsea/texmf.cnf
+++ texk/kpathsea/texmf.cnf 2018-04-10 09:11:07.729004411 +0000 +++ texk/kpathsea/texmf.cnf 2019-04-18 09:16:14.042022295 +0000
@@ -61,20 +61,20 @@ @@ -61,20 +61,20 @@
TEXMFROOT = $SELFAUTOPARENT TEXMFROOT = $SELFAUTOPARENT
@ -381,11 +381,11 @@
TEXMFHOME = ~/texmf TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2018/texmf-var -TEXMFVAR = ~/.texlive2019/texmf-var
+TEXMFVAR = ${TEXMFSYSVAR} +TEXMFVAR = ${TEXMFSYSVAR}
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2018/texmf-config -TEXMFCONFIG = ~/.texlive2019/texmf-config
+TEXMFCONFIG = ${TEXMFSYSVAR} +TEXMFCONFIG = ${TEXMFSYSVAR}
% This is the value manipulated by tlmgr's auxtrees subcommand in the % This is the value manipulated by tlmgr's auxtrees subcommand in the
@ -397,12 +397,12 @@
-TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} -TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
+TEXMF = {$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMF = {$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
% Where to look for ls-R files. There need not be an ls-R in the % Where to look for, and where mktexlsr creates, ls-R files. By default,
% directories in this path, but if there is one, Kpathsea will use it. % this is all and only the !! elements of TEXMF, so that mktexlsr does not
@@ -115,24 +115,23 @@ TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEX @@ -115,24 +115,23 @@ TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEX
% does not create ls-R files in the non-!! elements -- because if an % present, it will be used, and the disk will not (usually) be searched,
% ls-R is present, it will be used, and the disk will not be searched. % regardless of !!. Although in principle a directory listed here need
% This is arguably a bug in kpathsea. % not contain an ls-R file, in practice they all should.
-TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} -TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
+TEXMFDBS = $TEXMF;$VARTEXFONTS;$HOMECACHE +TEXMFDBS = $TEXMF;$VARTEXFONTS;$HOMECACHE
@ -444,120 +444,57 @@
-WEB2C = $TEXMF/web2c -WEB2C = $TEXMF/web2c
+WEB2C = ${TEXMFHOME}/web2c;${TEXMFSYSCONFIG}/web2c;${TEXMFSYSVAR}/web2c;$TEXMF/web2c +WEB2C = ${TEXMFHOME}/web2c;${TEXMFSYSCONFIG}/web2c;${TEXMFSYSVAR}/web2c;$TEXMF/web2c
% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input % This variable exists only to be redefined; it is used in nearly all
% or \openin, including .sty, .eps, etc. We specify paths for all known % search paths. If a document has source files not only in the current
@@ -192,18 +192,18 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{ @@ -285,7 +285,7 @@ TEXINPUTS = $TEXMFDOTDIR;$
TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// TTF2TFMINPUTS = $TEXMFDOTDIR;$TEXMF/ttf2pk//
% pdfTeX.
-TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}//
+TEXINPUTS.pdfcslatex = .;$TEXMF/{pdftex,tex}/{cslatex,csplain,latex,generic,}//
+TEXINPUTS.pdfcsplain = .;$TEXMF/{pdftex,tex}/{csplain,plain,generic,}//
+TEXINPUTS.pdflatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}//
+TEXINPUTS.pdfmex = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}//
+TEXINPUTS.utf8mex = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}//
+TEXINPUTS.pdftex = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
+TEXINPUTS.pdftexinfo = .;$TEXMF/{pdftex,tex}/{texinfo,plain,generic,}//
+TEXINPUTS.pdfamstex = .;$TEXMF/{pdftex,tex}/{amstex,plain,generic,}//
% pdfeTeX.
-TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.pdfelatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}//
+TEXINPUTS.pdfetex = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
% LuaTeX.
TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}//
@@ -256,18 +256,18 @@ BSTINPUTS.upbibtex = .;$TEXMF/{upbi
TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}//
% jadetex.
-TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}//
-TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,generic,}//
+TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,xmltex,latex,plain,generic,}//
+TEXINPUTS.pdfjadetex = .;$TEXMF/{pdftex,tex}/{jadetex,xmltex,latex,plain,generic,}//
% XMLTeX.
-TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
+TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,plain,generic,}//
+TEXINPUTS.pdfxmltex = .;$TEXMF/{pdftex,tex}/{xmltex,latex,plain,generic,}//
% Miscellany, no longer built.
TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}//
TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}//
-TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}//
+TEXINPUTS.frpdflatex = .;$TEXMF/{pdftex,tex}/{french,latex,generic,}//
+TEXINPUTS.frpdftex = .;$TEXMF/{pdftex,tex}/{french,plain,generic,}//
% Earlier entries override later ones, so put this generic one last.
TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
@@ -276,7 +276,7 @@ TEXINPUTS = .;$TEXMF/tex/{
TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
% Metafont, MetaPost inputs. % Metafont, MetaPost inputs.
-MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source// -MFINPUTS = $TEXMFDOTDIR;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
+MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/source// +MFINPUTS = $TEXMFDOTDIR;$TEXMF/metafont//;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/source//
MPINPUTS = .;$TEXMF/metapost// MPINPUTS = $TEXMFDOTDIR;$TEXMF/metapost//
% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read. % Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
@@ -286,31 +286,31 @@ MPINPUTS = .;$TEXMF/metapost// @@ -295,31 +295,31 @@ MPINPUTS = $TEXMFDOTDIR;$TEXMF/metapost/
% We repeat the same definition three times because of the way fmtutil % We repeat the same definition three times because of the way fmtutil
% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats % is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
% will not be found. % will not be found.
-TEXFORMATS = .;$TEXMF/web2c{/$engine,} -TEXFORMATS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}
-MFBASES = .;$TEXMF/web2c{/$engine,} -MFBASES = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}
-MPMEMS = .;$TEXMF/web2c{/$engine,} -MPMEMS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}
+TEXFORMATS = .;$WEB2C/{$engine,}// +TEXFORMATS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}//
+MFBASES = .;$WEB2C/{$engine,}// +MFBASES = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}//
+MPMEMS = .;$WEB2C/{$engine,}// +MPMEMS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}//
% %
% As of 2008, pool files don't exist any more (the strings are compiled % As of 2008, pool files don't exist any more (the strings are compiled
% into the binaries), but just in case something expects to find these: % into the binaries), but just in case something expects to find these:
-TEXPOOL = .;$TEXMF/web2c -TEXPOOL = $TEXMFDOTDIR;$TEXMF/web2c
+TEXPOOL = .;$WEB2C +TEXPOOL = $TEXMFDOTDIR;$WEB2C
MFPOOL = ${TEXPOOL} MFPOOL = ${TEXPOOL}
MPPOOL = ${TEXPOOL} MPPOOL = ${TEXPOOL}
% support the original xdvi. Must come before the generic settings. % support the original xdvi. Must come before the generic settings.
-PKFONTS.XDvi = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}// -PKFONTS.XDvi = $TEXMFDOTDIR;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}//
+PKFONTS.XDvi = .;$TEXMF/%s;{$HOMECACHE,$VARTEXFONTS}/pk/{%m,modeless}// +PKFONTS.XDvi = $TEXMFDOTDIR;$TEXMF/%s;{$HOMECACHE,$VARTEXFONTS}/pk/{%m,modeless}//
VFFONTS.XDvi = .;$TEXMF/%s VFFONTS.XDvi = $TEXMFDOTDIR;$TEXMF/%s
PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}// PSHEADERS.XDvi = $TEXMFDOTDIR;$TEXMF/%q{dvips,fonts/type1}//
TEXPICTS.XDvi = .;$TEXMF/%q{dvips,tex}// TEXPICTS.XDvi = $TEXMFDOTDIR;$TEXMF/%q{dvips,tex}//
% Device-independent font metric files. % Device-independent font metric files.
VFFONTS = .;$TEXMF/fonts/vf// VFFONTS = $TEXMFDOTDIR;$TEXMF/fonts/vf//
-TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm// -TFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/tfm//
+TFMFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/tfm// +TFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}}/tfm//
% The $MAKETEX_MODE below means the drivers will not use a cx font when % The $MAKETEX_MODE below means the drivers will not use a cx font when
% the mode is ricoh. If no mode is explicitly specified, kpse_prog_init % the mode is ricoh. If no mode is explicitly specified, kpse_prog_init
% sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual. % sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual.
% The modeless part guarantees that bitmaps for PostScript fonts are found. % The modeless part guarantees that bitmaps for PostScript fonts are found.
-PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}// -PKFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
+PKFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}// +PKFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
% Similarly for the GF format, which only remains in existence because % Similarly for the GF format, which only remains in existence because
% Metafont outputs it (and MF isn't going to change). % Metafont outputs it (and MF isn't going to change).
@@ -320,7 +320,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD @@ -415,8 +415,8 @@ MPSUPPORT = $TEXMFDOTDIR;$TEXMF/metapost
GLYPHFONTS = .;$TEXMF/fonts
% A place to puth everything that doesn't fit the other font categories.
-MISCFONTS = .;$TEXMF/fonts/misc//
+MISCFONTS = .;$TEXMF/fonts/misc//;$TEXMF/fonts/hbf//
% font name map files. This isn't just fonts/map// because ConTeXt
% wants support for having files with the same name in the different
@@ -406,8 +406,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
% For xdvi to find mime.types and .mailcap, if they do not exist in % For xdvi to find mime.types and .mailcap, if they do not exist in
% ~. These are single directories, not paths. % ~. These are single directories, not paths.
% (But the default mime.types, at least, may well suffice.) % (But the default mime.types, at least, may well suffice.)
@ -568,22 +505,22 @@
% Default settings for the fontconfig library as used by the Windows % Default settings for the fontconfig library as used by the Windows
% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. % versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems.
@@ -426,10 +426,10 @@ WEBINPUTS = .;$TEXMF/web// @@ -440,10 +440,10 @@ WEBINPUTS = $TEXMFDOTDIR;$TEXMF/web//
CWEBINPUTS = .;$TEXMF/cweb// CWEBINPUTS = $TEXMFDOTDIR;$TEXMF/cweb//
% Omega-related fonts and other files. % Omega-related fonts and other files.
-OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}// -OFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//
-OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl// -OPLFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/opl//
-OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}// -OVFFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}//
-OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp// -OVPFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/ovp//
+OFMFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ofm,tfm}// +OFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ofm,tfm}//
+OPLFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/opl// +OPLFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/opl//
+OVFFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ovf,vf}// +OVFFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ovf,vf}//
+OVPFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/ovp// +OVPFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/ovp//
OTPINPUTS = .;$TEXMF/omega/otp// OTPINPUTS = $TEXMFDOTDIR;$TEXMF/omega/otp//
OCPINPUTS = .;$TEXMF/omega/ocp// OCPINPUTS = $TEXMFDOTDIR;$TEXMF/omega/ocp//
@@ -512,32 +512,38 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna @@ -526,32 +526,38 @@ RUBYINPUTS = $TEXMFDOTDIR;$TEXMF/scrip
% explicitly list every directory. Arguably more understandable anyway. % explicitly list every directory. Arguably more understandable anyway.
% %
TEXMFCNF = {\ TEXMFCNF = {\
@ -647,7 +584,7 @@
% %
% For reference, here is the old brace-using definition: % For reference, here is the old brace-using definition:
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} %TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
@@ -821,3 +827,33 @@ max_cols.gftype = 8191 @@ -836,3 +842,33 @@ max_cols.gftype = 8191
% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends? % Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
% Default is 1, to guess. Used on Windows only. % Default is 1, to guess. Used on Windows only.
guess_input_kanji_encoding = 1 guess_input_kanji_encoding = 1
@ -712,50 +649,7 @@
while (--argc > 0 && (*++argv)[0] == '-') { while (--argc > 0 && (*++argv)[0] == '-') {
done=0; done=0;
@@ -62,26 +61,36 @@ int main(int argc, char *argv[]) @@ -103,7 +102,7 @@ int main(int argc, char *argv[])
switch (c) {
case 'c':
if (*++argv[0] == '\0') {
- argc--; argv++;
+ if (--argc == 0) {
+err:
+ printf("%s: illegal value for option %c\n", myname, c);
+ exit(1);
+ }
+ argv++;
}
C = *argv[0];
done = 1; break;
case 'o':
if (*++argv[0] == '\0') {
- argc--; ++argv;
+ if (--argc == 0) goto err;
+ ++argv;
}
- C = atoo(argv[0]);
+ C = strtol(argv[0], &endptr, 8);
+ if (endptr==argv[0] || *endptr) goto err;
done = 1; break;
case 'H':
if (*++argv[0] == '\0') {
- argc--; argv++;
+ if (--argc == 0) goto err;
+ argv++;
}
- h = atoi(argv[0]);
+ h = strtol(argv[0], &endptr, 10);
+ if (endptr==argv[0] || *endptr) goto err;
done=1;
break;
case 'W':
if (*++argv[0] == '\0') {
- argc--; argv++;
+ if (--argc == 0) goto err;
+ argv++;
}
w = atoi(argv[0]);
done=1;
@@ -98,7 +107,7 @@ int main(int argc, char *argv[])
} }
} }
@ -764,7 +658,7 @@
msg ("pk2bm (ps2pk) version " PACKAGE_VERSION "\n"); msg ("pk2bm (ps2pk) version " PACKAGE_VERSION "\n");
printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname); printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
exit(1); exit(1);
@@ -216,11 +225,3 @@ dots(quarterword u, int n) @@ -221,11 +220,3 @@ dots(quarterword u, int n)
bit>>=1; bit>>=1;
} }
} }
@ -778,7 +672,7 @@
-} -}
--- texk/texlive/linked_scripts/musixtex/musixtex.lua --- texk/texlive/linked_scripts/musixtex/musixtex.lua
+++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2018-04-10 09:12:50.395048030 +0000 +++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2018-04-10 09:12:50.395048030 +0000
@@ -192,15 +192,26 @@ end @@ -200,15 +200,26 @@ end
-- possible by exploiting the the fact that Lua has two false values. -- possible by exploiting the the fact that Lua has two false values.
-- dvi == nil "do not produce a DVI file" (but maybe PDF) -- dvi == nil "do not produce a DVI file" (but maybe PDF)
-- dvi == false "do not process the DVI file" (but stop after TeX) -- dvi == false "do not process the DVI file" (but stop after TeX)
@ -914,7 +808,7 @@
# #
# from cslatex: # from cslatex:
cslatex pdftex - -etex cslatex.ini cslatex pdftex - -etex cslatex.ini
@@ -65,8 +66,8 @@ pdfcsplain luatex - -etex csplain.ini @@ -66,8 +67,8 @@ pdfcsplain luatex - -etex csplain.ini
eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
# #
# from jadetex: # from jadetex:
@ -925,7 +819,7 @@
# #
# from latex-bin: # from latex-bin:
latex pdftex language.dat -translate-file=cp227.tcx *latex.ini latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
@@ -131,5 +132,5 @@ xetex xetex language.def -etex xetex.ini @@ -132,5 +133,5 @@ xetex xetex language.def -etex xetex.ini
xelatex xetex language.dat -etex xelatex.ini xelatex xetex language.dat -etex xelatex.ini
# #
# from xmltex: # from xmltex:
@ -1137,7 +1031,7 @@
case $unlink in case $unlink in
--- texk/web2c/Makefile.in --- texk/web2c/Makefile.in
+++ texk/web2c/Makefile.in 2018-04-10 09:02:17.870981997 +0000 +++ texk/web2c/Makefile.in 2018-04-10 09:02:17.870981997 +0000
@@ -4117,7 +4117,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m @@ -4947,7 +4947,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
md5main_CPPFLAGS = -I$(srcdir)/libmd5 md5main_CPPFLAGS = -I$(srcdir)/libmd5
md5main_SOURCES = libmd5/md5main.c md5main_SOURCES = libmd5/md5main.c
md5main_LDADD = libmd5.a md5main_LDADD = libmd5.a
@ -1146,7 +1040,7 @@
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES: .SUFFIXES:
@@ -4164,6 +4164,11 @@ w2c/c-auto.h: w2c/stamp-h1 @@ -4994,6 +4994,11 @@ w2c/c-auto.h: w2c/stamp-h1
w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
@rm -f w2c/stamp-h1 @rm -f w2c/stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h

View File

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

View File

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

View File

@ -1,8 +1,41 @@
-------------------------------------------------------------------
Fri May 10 13:04:02 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Update to TeXLive 2018
- Modify patches
* biber-certs.dif
* source-64.dif
* source-configure.dif
* source-dviutils.dif
* 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-synctex-bump-soname.dif
* source-texdoc.dif
* source-warns.dif
* source.dif
- Drop obsolate patches
* freetype-use-pkg-config.patch
* source-bsc1109673.dif
* source-dvipdfm-x.dif
* source-fix-synctex-missing-header-install.dif
* source-lua-fix-bad-compare.patch
* source-m-tx-0.63a-buffer-overflow.dif
* source-patgen.dif
* source-tounicode.dif
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 24 17:42:03 UTC 2019 - Martin Liška <mliska@suse.cz> Wed Apr 24 17:42:03 UTC 2019 - Martin Liška <mliska@suse.cz>
- Disable LTO (boo#1133287). - Disable LTO (boo#1133287).
-------------------------------------------------------------------
Wed Apr 17 12:35:06 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Update to biber 2.12
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 21 23:59:40 UTC 2018 - Stefan Brüns <stefan.bruens@rwth-aachen.de> Fri Dec 21 23:59:40 UTC 2018 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -16,11 +16,11 @@
# #
%define texlive_version 2018 %define texlive_version 2019
%define texlive_previous 2016 %define texlive_previous 2018
%define texlive_release 20180414 %define texlive_release 20190407
%define texlive_noarch 158 %define texlive_noarch 159
%define texlive_source texlive-20180414-source %define texlive_source texlive-20190407-source
%define __perl_requires %{nil} %define __perl_requires %{nil}
%define __os_install_post /usr/lib/rpm/brp-compress \\\ %define __os_install_post /usr/lib/rpm/brp-compress \\\
@ -46,9 +46,7 @@
# #
# poppler -- use system wide libpoppler # poppler -- use system wide libpoppler
# #
%if 0%{suse_version} > 1320
%global with_poppler 1 %global with_poppler 1
%endif
%bcond_with poppler %bcond_with poppler
# #
@ -230,7 +228,7 @@ BuildRequires: perl(XML::Writer::String)
%endif %endif
# Download at ftp://tug.org/texlive/historic/%{texlive_version}/ # Download at ftp://tug.org/texlive/historic/%{texlive_version}/
Source0: %{texlive_source}.tar.xz Source0: %{texlive_source}.tar.xz
Source3: biblatex-biber-2.11.tar.xz Source3: biber-2.12.tar.xz
Source4: cnf-to-paths.awk Source4: cnf-to-paths.awk
Source30: texlive-rpmlintrc Source30: texlive-rpmlintrc
Source50: public.c Source50: public.c
@ -252,37 +250,21 @@ Patch18: source-a2ping.dif
Patch19: source-dvipng.dif Patch19: source-dvipng.dif
Patch20: source-missed-scripts.dif Patch20: source-missed-scripts.dif
# PATCH-FIX-TEXLIVE # PATCH-FIX-TEXLIVE
Patch21: source-m-tx-0.63a-buffer-overflow.dif
# PATCH-FIX-TEXLIVE
Patch22: source-synctex-bump-soname.dif Patch22: source-synctex-bump-soname.dif
# PATCH-FIX-TEXLIVE
Patch23: source-fix-synctex-missing-header-install.dif
# PATCH-FIX-TEXLIVE
Patch25: source-patgen.dif
# PATCH-FIX-SUSE Make biber work with our perl # PATCH-FIX-SUSE Make biber work with our perl
Patch42: biblatex-encoding.dif Patch42: biblatex-encoding.dif
# PATCH-FIX-SUSE Old problem back: we do not use internal Certs! # PATCH-FIX-SUSE Old problem back: we do not use internal Certs!
Patch44: biber-certs.dif Patch44: biber-certs.dif
# PATCH-FIX-SUSE Make biber work with perl 5.18.2 # PATCH-FIX-SUSE Make biber work with perl 5.18.2
Patch47: biber-perl-5.18.2.dif Patch47: biber-perl-5.18.2.dif
# PATCH-FIX-SUSE https://sourceforge.net/p/xetex/bugs/151/ -- Fix OOB access when generating alpha mask for 1/2/4-bit indexed PNGs
Patch50: source-dvipdfm-x.dif
# PATCH-FIX-SUSE Use pkg-config to find freetype2
Patch51: freetype-use-pkg-config.patch
# PATCH-FIX-TEXLIVE
Patch52: source-tounicode.dif
# PATCH-FIX-TEXLIVE # PATCH-FIX-TEXLIVE
Patch53: source-fix-const-poppler0.66.0.patch Patch53: source-fix-const-poppler0.66.0.patch
# PATCH-FIX-TEXLIVE # PATCH-FIX-TEXLIVE
Patch54: source-bsc1109673.dif
# PATCH-FIX-TEXLIVE
Patch55: source-fix-bool-poppler.patch Patch55: source-fix-bool-poppler.patch
# PATCH-FIX-TEXLIVE # PATCH-FIX-TEXLIVE
Patch56: source-poppler-use-std_string.patch Patch56: source-poppler-use-std_string.patch
# PATCH-FIX-SUSE Fix leaking string copy # PATCH-FIX-SUSE Fix leaking string copy
Patch57: source-poppler-fix-dict-memleak.patch Patch57: source-poppler-fix-dict-memleak.patch
# PATCH-FIX-SUSE Fix bad comparison
Patch58: source-lua-fix-bad-compare.patch
Prefix: %{_bindir} Prefix: %{_bindir}
Provides: pdfjam = %{version} Provides: pdfjam = %{version}
Obsoletes: pdfjam < %{version} Obsoletes: pdfjam < %{version}
@ -387,7 +369,7 @@ Prefix: %{_bindir}
Binary files of adhocfilelist Binary files of adhocfilelist
%package afm2pl-bin %package afm2pl-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of afm2pl Summary: Binary files of afm2pl
License: LPPL-1.0 License: LPPL-1.0
@ -401,7 +383,7 @@ Prefix: %{_bindir}
Binary files of afm2pl Binary files of afm2pl
%package aleph-bin %package aleph-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50700
Release: 0 Release: 0
Summary: Binary files of aleph Summary: Binary files of aleph
License: LPPL-1.0 License: LPPL-1.0
@ -446,7 +428,7 @@ Prefix: %{_bindir}
Binary files of arara Binary files of arara
%package asymptote-bin %package asymptote-bin
Version: %{texlive_version}.%{texlive_release}.svn47391 Version: %{texlive_version}.%{texlive_release}.svn50721
Release: 0 Release: 0
Summary: Binary files of asymptote Summary: Binary files of asymptote
License: LPPL-1.0 License: LPPL-1.0
@ -474,7 +456,7 @@ Prefix: %{_bindir}
Binary files of authorindex Binary files of authorindex
%package autosp-bin %package autosp-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of autosp Summary: Binary files of autosp
License: LPPL-1.0 License: LPPL-1.0
@ -488,7 +470,7 @@ Prefix: %{_bindir}
Binary files of autosp Binary files of autosp
%package axodraw2-bin %package axodraw2-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of axodraw2 Summary: Binary files of axodraw2
License: LPPL-1.0 License: LPPL-1.0
@ -516,7 +498,7 @@ Prefix: %{_bindir}
Binary files of bib2gls Binary files of bib2gls
%package biber-bin %package biber-bin
Version: %{texlive_version}.%{texlive_release}.svn46862 Version: %{texlive_version}.%{texlive_release}.svn49068
Release: 0 Release: 0
Summary: Binary files of biber Summary: Binary files of biber
License: LPPL-1.0 License: LPPL-1.0
@ -556,7 +538,7 @@ Prefix: %{_bindir}
Binary files of bibexport Binary files of bibexport
%package bibtex-bin %package bibtex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of bibtex Summary: Binary files of bibtex
License: LPPL-1.0 License: LPPL-1.0
@ -573,7 +555,7 @@ Prefix: %{_bindir}
Binary files of bibtex Binary files of bibtex
%package bibtex8-bin %package bibtex8-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of bibtex8 Summary: Binary files of bibtex8
License: LPPL-1.0 License: LPPL-1.0
@ -590,7 +572,7 @@ Prefix: %{_bindir}
Binary files of bibtex8 Binary files of bibtex8
%package bibtexu-bin %package bibtexu-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of bibtexu Summary: Binary files of bibtexu
License: LPPL-1.0 License: LPPL-1.0
@ -663,7 +645,7 @@ Prefix: %{_bindir}
Binary files of checklistings Binary files of checklistings
%package chktex-bin %package chktex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of chktex Summary: Binary files of chktex
License: LPPL-1.0 License: LPPL-1.0
@ -694,7 +676,7 @@ Prefix: %{_bindir}
Binary files of cjk-gs-integrate Binary files of cjk-gs-integrate
%package cjkutils-bin %package cjkutils-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of cjkutils Summary: Binary files of cjkutils
License: LPPL-1.0 License: LPPL-1.0
@ -708,6 +690,23 @@ Prefix: %{_bindir}
%description cjkutils-bin %description cjkutils-bin
Binary files of cjkutils Binary files of cjkutils
%package cluttex-bin
Version: %{texlive_version}.%{texlive_release}.svn48871
Release: 0
Summary: Binary files of cluttex
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-cluttex >= %{texlive_version}
#!BuildIgnore: texlive-cluttex
Recommends: texlive-collection-fontsrecommended >= %{texlive_version}
Recommends: texlive-collection-genericrecommended >= %{texlive_version}
Recommends: texlive-collection-basic >= %{texlive_version}
Prefix: %{_bindir}
%description cluttex-bin
Binary files of cluttex
%package context-bin %package context-bin
Version: %{texlive_version}.%{texlive_release}.svn34112 Version: %{texlive_version}.%{texlive_release}.svn34112
Release: 0 Release: 0
@ -771,7 +770,7 @@ Prefix: %{_bindir}
Binary files of cslatex Binary files of cslatex
%package csplain-bin %package csplain-bin
Version: %{texlive_version}.%{texlive_release}.svn33902 Version: %{texlive_version}.%{texlive_release}.svn50528
Release: 0 Release: 0
Summary: Binary files of csplain Summary: Binary files of csplain
License: LPPL-1.0 License: LPPL-1.0
@ -798,6 +797,20 @@ Prefix: %{_bindir}
%description ctan-o-mat-bin %description ctan-o-mat-bin
Binary files of ctan-o-mat 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
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-ctanbib >= %{texlive_version}
#!BuildIgnore: texlive-ctanbib
Prefix: %{_bindir}
%description ctanbib-bin
Binary files of ctanbib
%package ctanify-bin %package ctanify-bin
Version: %{texlive_version}.%{texlive_release}.svn24061 Version: %{texlive_version}.%{texlive_release}.svn24061
Release: 0 Release: 0
@ -827,7 +840,7 @@ Prefix: %{_bindir}
Binary files of ctanupload Binary files of ctanupload
%package ctie-bin %package ctie-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of ctie Summary: Binary files of ctie
License: LPPL-1.0 License: LPPL-1.0
@ -841,7 +854,7 @@ Prefix: %{_bindir}
Binary files of ctie Binary files of ctie
%package cweb-bin %package cweb-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of cweb Summary: Binary files of cweb
License: LPPL-1.0 License: LPPL-1.0
@ -883,7 +896,7 @@ Prefix: %{_bindir}
Binary files of de-macro Binary files of de-macro
%package detex-bin %package detex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of detex Summary: Binary files of detex
License: LPPL-1.0 License: LPPL-1.0
@ -929,7 +942,7 @@ Prefix: %{_bindir}
Binary files of dosepsbin Binary files of dosepsbin
%package dtl-bin %package dtl-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of dtl Summary: Binary files of dtl
License: LPPL-1.0 License: LPPL-1.0
@ -971,7 +984,7 @@ Prefix: %{_bindir}
Binary files of dviasm Binary files of dviasm
%package dvicopy-bin %package dvicopy-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of dvicopy Summary: Binary files of dvicopy
License: LPPL-1.0 License: LPPL-1.0
@ -985,7 +998,7 @@ Prefix: %{_bindir}
Binary files of dvicopy Binary files of dvicopy
%package dvidvi-bin %package dvidvi-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of dvidvi Summary: Binary files of dvidvi
License: LPPL-1.0 License: LPPL-1.0
@ -1013,7 +1026,7 @@ Prefix: %{_bindir}
Binary files of dviinfox Binary files of dviinfox
%package dviljk-bin %package dviljk-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of dviljk Summary: Binary files of dviljk
License: LPPL-1.0 License: LPPL-1.0
@ -1028,8 +1041,22 @@ Prefix: %{_bindir}
%description dviljk-bin %description dviljk-bin
Binary files of dviljk Binary files of dviljk
%package dviout-util-bin
Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0
Summary: Binary files of dviout-util
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-dviout-util >= %{texlive_version}
#!BuildIgnore: texlive-dviout-util
Prefix: %{_bindir}
%description dviout-util-bin
Binary files of dviout-util
%package dvipdfmx-bin %package dvipdfmx-bin
Version: %{texlive_version}.%{texlive_release}.svn40273 Version: %{texlive_version}.%{texlive_release}.svn50700
Release: 0 Release: 0
Summary: Binary files of dvipdfmx Summary: Binary files of dvipdfmx
License: LPPL-1.0 License: LPPL-1.0
@ -1046,7 +1073,7 @@ Prefix: %{_bindir}
Binary files of dvipdfmx Binary files of dvipdfmx
%package dvipng-bin %package dvipng-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50853
Release: 0 Release: 0
Summary: Binary files of dvipng Summary: Binary files of dvipng
License: LPPL-1.0 License: LPPL-1.0
@ -1060,7 +1087,7 @@ Prefix: %{_bindir}
Binary files of dvipng Binary files of dvipng
%package dvipos-bin %package dvipos-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of dvipos Summary: Binary files of dvipos
License: LPPL-1.0 License: LPPL-1.0
@ -1074,7 +1101,7 @@ Prefix: %{_bindir}
Binary files of dvipos Binary files of dvipos
%package dvips-bin %package dvips-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50790
Release: 0 Release: 0
Summary: Binary files of dvips Summary: Binary files of dvips
License: LPPL-1.0 License: LPPL-1.0
@ -1088,7 +1115,7 @@ Prefix: %{_bindir}
Binary files of dvips Binary files of dvips
%package dvisvgm-bin %package dvisvgm-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50358
Release: 0 Release: 0
Summary: Binary files of dvisvgm Summary: Binary files of dvisvgm
License: LPPL-1.0 License: LPPL-1.0
@ -1234,7 +1261,7 @@ Prefix: %{_bindir}
Binary files of fontools Binary files of fontools
%package fontware-bin %package fontware-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of fontware Summary: Binary files of fontware
License: LPPL-1.0 License: LPPL-1.0
@ -1290,7 +1317,7 @@ Prefix: %{_bindir}
Binary files of glossaries Binary files of glossaries
%package gregoriotex-bin %package gregoriotex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50358
Release: 0 Release: 0
Summary: Binary files of gregoriotex Summary: Binary files of gregoriotex
License: LPPL-1.0 License: LPPL-1.0
@ -1307,7 +1334,7 @@ Prefix: %{_bindir}
Binary files of gregoriotex Binary files of gregoriotex
%package gsftopk-bin %package gsftopk-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of gsftopk Summary: Binary files of gsftopk
License: LPPL-1.0 License: LPPL-1.0
@ -1353,7 +1380,7 @@ Prefix: %{_bindir}
Binary files of jfmutil Binary files of jfmutil
%package ketcindy-bin %package ketcindy-bin
Version: %{texlive_version}.%{texlive_release}.svn47395 Version: %{texlive_version}.%{texlive_release}.svn49033
Release: 0 Release: 0
Summary: Binary files of ketcindy Summary: Binary files of ketcindy
License: LPPL-1.0 License: LPPL-1.0
@ -1384,7 +1411,7 @@ Prefix: %{_bindir}
Binary files of kotex-utils Binary files of kotex-utils
%package kpathsea-bin %package kpathsea-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of kpathsea Summary: Binary files of kpathsea
License: LPPL-1.0 License: LPPL-1.0
@ -1424,7 +1451,7 @@ Prefix: %{_bindir}
Binary files of l3build Binary files of l3build
%package lacheck-bin %package lacheck-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of lacheck Summary: Binary files of lacheck
License: LPPL-1.0 License: LPPL-1.0
@ -1609,7 +1636,7 @@ Prefix: %{_bindir}
Binary files of latexpand Binary files of latexpand
%package lcdftypetools-bin %package lcdftypetools-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of lcdftypetools Summary: Binary files of lcdftypetools
License: LPPL-1.0 License: LPPL-1.0
@ -1740,7 +1767,7 @@ Prefix: %{_bindir}
Binary files of luaotfload Binary files of luaotfload
%package luatex-bin %package luatex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50893
Release: 0 Release: 0
Summary: Binary files of luatex Summary: Binary files of luatex
License: LPPL-1.0 License: LPPL-1.0
@ -1771,7 +1798,7 @@ Prefix: %{_bindir}
Binary files of lwarp Binary files of lwarp
%package m-tx-bin %package m-tx-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of m-tx Summary: Binary files of m-tx
License: LPPL-1.0 License: LPPL-1.0
@ -1813,7 +1840,7 @@ Prefix: %{_bindir}
Binary files of makedtx Binary files of makedtx
%package makeindex-bin %package makeindex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50594
Release: 0 Release: 0
Summary: Binary files of makeindex Summary: Binary files of makeindex
License: LPPL-1.0 License: LPPL-1.0
@ -1855,7 +1882,7 @@ Prefix: %{_bindir}
Binary files of mathspic Binary files of mathspic
%package metafont-bin %package metafont-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50700
Release: 0 Release: 0
Summary: Binary files of metafont Summary: Binary files of metafont
License: LPPL-1.0 License: LPPL-1.0
@ -1869,7 +1896,7 @@ Prefix: %{_bindir}
Binary files of metafont Binary files of metafont
%package metapost-bin %package metapost-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50594
Release: 0 Release: 0
Summary: Binary files of metapost Summary: Binary files of metapost
License: LPPL-1.0 License: LPPL-1.0
@ -1912,7 +1939,7 @@ Prefix: %{_bindir}
Binary files of mf2pt1 Binary files of mf2pt1
%package mflua-bin %package mflua-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50853
Release: 0 Release: 0
Summary: Binary files of mflua Summary: Binary files of mflua
License: LPPL-1.0 License: LPPL-1.0
@ -1926,7 +1953,7 @@ Prefix: %{_bindir}
Binary files of mflua Binary files of mflua
%package mfware-bin %package mfware-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of mfware Summary: Binary files of mfware
License: LPPL-1.0 License: LPPL-1.0
@ -2050,7 +2077,7 @@ Prefix: %{_bindir}
Binary files of musixtex Binary files of musixtex
%package musixtnt-bin %package musixtnt-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of musixtnt Summary: Binary files of musixtnt
License: LPPL-1.0 License: LPPL-1.0
@ -2064,7 +2091,7 @@ Prefix: %{_bindir}
Binary files of musixtnt Binary files of musixtnt
%package omegaware-bin %package omegaware-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of omegaware Summary: Binary files of omegaware
License: LPPL-1.0 License: LPPL-1.0
@ -2083,7 +2110,7 @@ Prefix: %{_bindir}
Binary files of omegaware Binary files of omegaware
%package patgen-bin %package patgen-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of patgen Summary: Binary files of patgen
License: LPPL-1.0 License: LPPL-1.0
@ -2169,8 +2196,25 @@ Prefix: %{_bindir}
%description pdflatexpicscale-bin %description pdflatexpicscale-bin
Binary files of pdflatexpicscale 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
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-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 %package pdftex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50700
Release: 0 Release: 0
Summary: Binary files of pdftex Summary: Binary files of pdftex
License: LPPL-1.0 License: LPPL-1.0
@ -2187,7 +2231,7 @@ Prefix: %{_bindir}
Binary files of pdftex Binary files of pdftex
%package pdftools-bin %package pdftools-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of pdftools Summary: Binary files of pdftools
License: LPPL-1.0 License: LPPL-1.0
@ -2319,7 +2363,7 @@ Prefix: %{_bindir}
Binary files of platex Binary files of platex
%package pmx-bin %package pmx-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of pmx Summary: Binary files of pmx
License: LPPL-1.0 License: LPPL-1.0
@ -2347,7 +2391,7 @@ Prefix: %{_bindir}
Binary files of pmxchords Binary files of pmxchords
%package ps2pk-bin %package ps2pk-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of ps2pk Summary: Binary files of ps2pk
License: LPPL-1.0 License: LPPL-1.0
@ -2390,7 +2434,7 @@ Prefix: %{_bindir}
Binary files of pst2pdf Binary files of pst2pdf
%package pstools-bin %package pstools-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of pstools Summary: Binary files of pstools
License: LPPL-1.0 License: LPPL-1.0
@ -2421,7 +2465,7 @@ Prefix: %{_bindir}
Binary files of ptex-fontmaps Binary files of ptex-fontmaps
%package ptex-bin %package ptex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50790
Release: 0 Release: 0
Summary: Binary files of ptex Summary: Binary files of ptex
License: LPPL-1.0 License: LPPL-1.0
@ -2517,7 +2561,7 @@ Prefix: %{_bindir}
Binary files of rubik Binary files of rubik
%package seetexk-bin %package seetexk-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of seetexk Summary: Binary files of seetexk
License: LPPL-1.0 License: LPPL-1.0
@ -2590,7 +2634,7 @@ Prefix: %{_bindir}
Binary files of svn-multi Binary files of svn-multi
%package synctex-bin %package synctex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of synctex Summary: Binary files of synctex
License: LPPL-1.0 License: LPPL-1.0
@ -2624,7 +2668,7 @@ Prefix: %{_bindir}
Binary files of tetex Binary files of tetex
%package tex-bin %package tex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50700
Release: 0 Release: 0
Summary: Binary files of tex Summary: Binary files of tex
License: LPPL-1.0 License: LPPL-1.0
@ -2658,7 +2702,7 @@ Prefix: %{_bindir}
Binary files of tex4ebook Binary files of tex4ebook
%package tex4ht-bin %package tex4ht-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of tex4ht Summary: Binary files of tex4ht
License: LPPL-1.0 License: LPPL-1.0
@ -2745,7 +2789,7 @@ Prefix: %{_bindir}
Binary files of texdirflatten Binary files of texdirflatten
%package texdoc-bin %package texdoc-bin
Version: %{texlive_version}.%{texlive_release}.svn29741 Version: %{texlive_version}.%{texlive_release}.svn47948
Release: 0 Release: 0
Summary: Binary files of texdoc Summary: Binary files of texdoc
License: LPPL-1.0 License: LPPL-1.0
@ -2761,6 +2805,23 @@ Prefix: %{_bindir}
%description texdoc-bin %description texdoc-bin
Binary files of texdoc Binary files of texdoc
%package texdoctk-bin
Version: %{texlive_version}.%{texlive_release}.svn29741
Release: 0
Summary: Binary files of texdoctk
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-texdoctk >= %{texlive_version}
#!BuildIgnore: texlive-texdoctk
Recommends: texlive-collection-fontsrecommended >= %{texlive_version}
Recommends: texlive-collection-genericrecommended >= %{texlive_version}
Recommends: texlive-collection-basic >= %{texlive_version}
Prefix: %{_bindir}
%description texdoctk-bin
Binary files of texdoctk
%package texfot-bin %package texfot-bin
Version: %{texlive_version}.%{texlive_release}.svn33155 Version: %{texlive_version}.%{texlive_release}.svn33155
Release: 0 Release: 0
@ -2847,7 +2908,7 @@ Prefix: %{_bindir}
Binary files of texsis Binary files of texsis
%package texware-bin %package texware-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of texware Summary: Binary files of texware
License: LPPL-1.0 License: LPPL-1.0
@ -2878,7 +2939,7 @@ Prefix: %{_bindir}
Binary files of thumbpdf Binary files of thumbpdf
%package tie-bin %package tie-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of tie Summary: Binary files of tie
License: LPPL-1.0 License: LPPL-1.0
@ -2920,7 +2981,7 @@ Prefix: %{_bindir}
Binary files of tlshell Binary files of tlshell
%package tpic2pdftex-bin %package tpic2pdftex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of tpic2pdftex Summary: Binary files of tpic2pdftex
License: LPPL-1.0 License: LPPL-1.0
@ -2937,7 +2998,7 @@ Prefix: %{_bindir}
Binary files of tpic2pdftex Binary files of tpic2pdftex
%package ttfutils-bin %package ttfutils-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of ttfutils Summary: Binary files of ttfutils
License: LPPL-1.0 License: LPPL-1.0
@ -2996,7 +3057,7 @@ Prefix: %{_bindir}
Binary files of uplatex Binary files of uplatex
%package uptex-bin %package uptex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50790
Release: 0 Release: 0
Summary: Binary files of uptex Summary: Binary files of uptex
License: LPPL-1.0 License: LPPL-1.0
@ -3027,7 +3088,7 @@ Prefix: %{_bindir}
Binary files of urlbst Binary files of urlbst
%package velthuis-bin %package velthuis-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of velthuis Summary: Binary files of velthuis
License: LPPL-1.0 License: LPPL-1.0
@ -3041,7 +3102,7 @@ Prefix: %{_bindir}
Binary files of velthuis Binary files of velthuis
%package vlna-bin %package vlna-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of vlna Summary: Binary files of vlna
License: LPPL-1.0 License: LPPL-1.0
@ -3069,7 +3130,7 @@ Prefix: %{_bindir}
Binary files of vpe Binary files of vpe
%package web-bin %package web-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of web Summary: Binary files of web
License: LPPL-1.0 License: LPPL-1.0
@ -3082,6 +3143,20 @@ Prefix: %{_bindir}
%description web-bin %description web-bin
Binary files of web Binary files of web
%package webquiz-bin
Version: %{texlive_version}.%{texlive_release}.svn50419
Release: 0
Summary: Binary files of webquiz
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-webquiz >= %{texlive_version}
#!BuildIgnore: texlive-webquiz
Prefix: %{_bindir}
%description webquiz-bin
Binary files of webquiz
%package wordcount-bin %package wordcount-bin
Version: %{texlive_version}.%{texlive_release}.svn46165 Version: %{texlive_version}.%{texlive_release}.svn46165
Release: 0 Release: 0
@ -3097,7 +3172,7 @@ Prefix: %{_bindir}
Binary files of wordcount Binary files of wordcount
%package xdvi-bin %package xdvi-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50281
Release: 0 Release: 0
Summary: Binary files of xdvi Summary: Binary files of xdvi
License: LPPL-1.0 License: LPPL-1.0
@ -3111,7 +3186,7 @@ Prefix: %{_bindir}
Binary files of xdvi Binary files of xdvi
%package xetex-bin %package xetex-bin
Version: %{texlive_version}.%{texlive_release}.svn47245 Version: %{texlive_version}.%{texlive_release}.svn50700
Release: 0 Release: 0
Summary: Binary files of xetex Summary: Binary files of xetex
License: LPPL-1.0 License: LPPL-1.0
@ -3128,6 +3203,20 @@ Prefix: %{_bindir}
%description xetex-bin %description xetex-bin
Binary files of xetex Binary files of xetex
%package xindex-bin
Version: %{texlive_version}.%{texlive_release}.svn49312
Release: 0
Summary: Binary files of xindex
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-xindex >= %{texlive_version}
#!BuildIgnore: texlive-xindex
Prefix: %{_bindir}
%description xindex-bin
Binary files of xindex
%package xmltex-bin %package xmltex-bin
Version: %{texlive_version}.%{texlive_release}.svn3006 Version: %{texlive_version}.%{texlive_release}.svn3006
Release: 0 Release: 0
@ -3161,7 +3250,7 @@ Prefix: %{_bindir}
Binary files of yplan Binary files of yplan
%package -n libkpathsea6 %package -n libkpathsea6
Version: 6.3.0 Version: 6.3.1
Release: 0 Release: 0
Summary: Path searching library for TeX-related files Summary: Path searching library for TeX-related files
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -3178,13 +3267,13 @@ separately, but rather is released and maintained as part of
the TeX-live sources. the TeX-live sources.
%package -n %{name}-kpathsea-devel %package -n %{name}-kpathsea-devel
Version: 6.3.0 Version: 6.3.1
Release: 0 Release: 0
Summary: Path searching library for TeX-related files Summary: Path searching library for TeX-related files
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Url: http://www.tug.org/texlive/ Url: http://www.tug.org/texlive/
Requires: libkpathsea6 = 6.3.0 Requires: libkpathsea6 = 6.3.1
%description -n %{name}-kpathsea-devel %description -n %{name}-kpathsea-devel
Kpathsea is a library and utility programs which provide path Kpathsea is a library and utility programs which provide path
@ -3195,7 +3284,7 @@ separately, but rather is released and maintained as part of
the TeX-live sources. the TeX-live sources.
%package -n libptexenc1 %package -n libptexenc1
Version: 1.3.6 Version: 1.3.7
Release: 0 Release: 0
Summary: Libraries of Kanji code convert library for pTeX Summary: Libraries of Kanji code convert library for pTeX
License: BSD-3-Clause License: BSD-3-Clause
@ -3209,13 +3298,13 @@ The ptexenc is a useful library for Japanese pTeX
TeX by ASCII Co.) and its surrounding tools. TeX by ASCII Co.) and its surrounding tools.
%package -n %{name}-ptexenc-devel %package -n %{name}-ptexenc-devel
Version: 1.3.6 Version: 1.3.7
Release: 0 Release: 0
Summary: Libraries of Kanji code convert library for pTeX Summary: Libraries of Kanji code convert library for pTeX
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Url: http://www.tug.org/texlive/ Url: http://www.tug.org/texlive/
Requires: libptexenc1 = 1.3.6 Requires: libptexenc1 = 1.3.7
%description -n %{name}-ptexenc-devel %description -n %{name}-ptexenc-devel
This package includes the ptexenc development files. This package includes the ptexenc development files.
@ -3254,19 +3343,6 @@ of recent TeX engines. It allows to synchronize between input
and output, which means to navigate from the source document to and output, which means to navigate from the source document to
the typeset material and vice versa. the typeset material and vice versa.
%package -n libtexlua52-5
Version: 5.2.4
Release: 0
Summary: Libraries of an extended version of pdfTeX using Lua
License: MIT
Group: System/Libraries
Url: http://www.tug.org/texlive/
Prefix: %{_libdir}
%description -n libtexlua52-5
LuaTeX is an extended version of pdfTeX using Lua as an
embedded scripting language
%package -n libtexlua53-5 %package -n libtexlua53-5
Version: 5.3.4 Version: 5.3.4
Release: 0 Release: 0
@ -3328,8 +3404,8 @@ Summary: Basic development packages for TeXLive
License: LGPL-2.1-or-later AND BSD-3-Clause AND SUSE-TeX License: LGPL-2.1-or-later AND BSD-3-Clause AND SUSE-TeX
Group: Development/Languages/Other Group: Development/Languages/Other
Url: http://www.tug.org/texlive/ Url: http://www.tug.org/texlive/
Requires: libkpathsea6 = 6.3.0 Requires: libkpathsea6 = 6.3.1
Requires: libptexenc1 = 1.3.6 Requires: libptexenc1 = 1.3.7
Requires: libsynctex2 = 1.21 Requires: libsynctex2 = 1.21
Requires: libtexlua53-5 = 5.3.4 Requires: libtexlua53-5 = 5.3.4
%if %{with LuaJIT} %if %{with LuaJIT}
@ -3563,13 +3639,10 @@ fi
%patch18 -p0 -b .a2p %patch18 -p0 -b .a2p
%patch19 -p0 -b .dvipng %patch19 -p0 -b .dvipng
%patch20 -p0 -b .missed %patch20 -p0 -b .missed
%patch21 -p0 -b .m-tx
%patch22 -p0 -b .synctexAPI %patch22 -p0 -b .synctexAPI
%patch23 -p0 -b .synctexINC
%patch25 -p0 -b .patgen
%patch0 -p0 -b .p0 %patch0 -p0 -b .p0
%if %{with buildbiber} %if %{with buildbiber}
pushd ../biblatex-biber-* pushd ../*biber-*/
/usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
%patch42 -p0 -b .en %patch42 -p0 -b .en
%patch44 -p0 -b .noica %patch44 -p0 -b .noica
@ -3580,22 +3653,17 @@ rm -vf bin/biber.noica
rm -vf t/*.fastsort rm -vf t/*.fastsort
popd popd
%endif %endif
%patch50 -p0 -b .dvipdfm-x
%patch51 -p1 -b .fft2
%patch52 -p0 -b .2utf8
%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.59.0}}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.59.0}}%{!?pkg_vcmp:0}
%patch53 -p0 -b .poppler %patch53 -p0 -b .poppler
%patch55 -p1 -b .popplerbool %patch55 -p1 -b .popplerbool
%endif %endif
%patch54 -p2 -b .type1
%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.72.0}}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.72.0}}%{!?pkg_vcmp:0}
%patch56 -p1 -b .popplerstring %patch56 -p1 -b .popplerstring
%endif %endif
%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.69.0}}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.69.0}}%{!?pkg_vcmp:0}
%patch57 -p1 -b .popplerdict %patch57 -p1 -b .popplerdict
%endif %endif
%patch58 -p1 -b .luacompare
# Correct FHS paths # Correct FHS paths
paths=$(find -name cnf-to-paths.awk) paths=$(find -name cnf-to-paths.awk)
@ -3828,7 +3896,7 @@ popd
%if %{with buildbiber} %if %{with buildbiber}
# dump a biber executable # dump a biber executable
pushd ../biblatex-biber-* pushd ../*biber-*/
find -name '*.ca' | xargs -r rm -vf find -name '*.ca' | xargs -r rm -vf
if test "$(getconf LONG_BIT)" -lt 64 ; then if test "$(getconf LONG_BIT)" -lt 64 ; then
@ -3922,7 +3990,7 @@ popd
# Biber support # Biber support
# #
%if %{with buildbiber} %if %{with buildbiber}
pushd ../biblatex-biber-* pushd ../*biber-*/
./Build install destdir=%{buildroot} ./Build install destdir=%{buildroot}
sed -rn '\@^#![[:space:]]*/usr/bin/env[[:space:]]+perl@{s@(/usr/bin/)env[[:space:]]+(perl)@\1\2@p}' \ sed -rn '\@^#![[:space:]]*/usr/bin/env[[:space:]]+perl@{s@(/usr/bin/)env[[:space:]]+(perl)@\1\2@p}' \
%{buildroot}%{_bindir}/biber %{buildroot}%{_bindir}/biber
@ -3943,7 +4011,7 @@ popd
popd popd
sed -ri '\@/usr/(share|bin)/.*@d' texlive.files sed -ri '\@/usr/(share|bin)/.*@d' texlive.files
popd popd
mv ../biblatex-biber-*/texlive.files perl-biber.files mv ../*biber-*/texlive.files perl-biber.files
%else %else
(cat > %{buildroot}%{_bindir}/biber)<<-'EOF' (cat > %{buildroot}%{_bindir}/biber)<<-'EOF'
#!/bin/sh #!/bin/sh
@ -4108,7 +4176,7 @@ popd
%endif %endif
pushd ${prefix}/lib/pkgconfig/ pushd ${prefix}/lib/pkgconfig/
for pc in kpathsea ptexenc texlua52 texlua53 texluajit synctex for pc in kpathsea ptexenc texlua texlua53 texluajit synctex
do do
test -e "$pc.pc" || continue test -e "$pc.pc" || continue
sed -ri "s@([^=]+=)${prefix}@\1/usr@" $pc.pc sed -ri "s@([^=]+=)${prefix}@\1/usr@" $pc.pc
@ -4182,9 +4250,6 @@ rm -f /var/run/texlive/run-update
%post -n libsynctex2 -p /sbin/ldconfig %post -n libsynctex2 -p /sbin/ldconfig
%postun -n libsynctex2 -p /sbin/ldconfig %postun -n libsynctex2 -p /sbin/ldconfig
%post -n libtexlua52-5 -p /sbin/ldconfig
%postun -n libtexlua52-5 -p /sbin/ldconfig
%post -n libtexlua53-5 -p /sbin/ldconfig %post -n libtexlua53-5 -p /sbin/ldconfig
%postun -n libtexlua53-5 -p /sbin/ldconfig %postun -n libtexlua53-5 -p /sbin/ldconfig
@ -4339,6 +4404,12 @@ rm -f /var/run/texlive/run-update
%{_bindir}/sjislatex %{_bindir}/sjislatex
%{_bindir}/sjispdflatex %{_bindir}/sjispdflatex
%files cluttex-bin
%defattr(-,root,root,755)
%{_bindir}/cllualatex
%{_bindir}/cluttex
%{_bindir}/clxelatex
%files context-bin %files context-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/context %{_bindir}/context
@ -4371,12 +4442,17 @@ rm -f /var/run/texlive/run-update
%files csplain-bin %files csplain-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/csplain %{_bindir}/csplain
%{_bindir}/luacsplain
%{_bindir}/pdfcsplain %{_bindir}/pdfcsplain
%files ctan-o-mat-bin %files ctan-o-mat-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/ctan-o-mat %{_bindir}/ctan-o-mat
%files ctanbib-bin
%defattr(-,root,root,755)
%{_bindir}/ctanbib
%files ctanify-bin %files ctanify-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/ctanify %{_bindir}/ctanify
@ -4392,6 +4468,9 @@ rm -f /var/run/texlive/run-update
%files cweb-bin %files cweb-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/ctangle %{_bindir}/ctangle
%{_bindir}/ctwill
%{_bindir}/ctwill-refsort
%{_bindir}/ctwill-twinx
%{_bindir}/cweave %{_bindir}/cweave
%files cyrillic-bin-bin %files cyrillic-bin-bin
@ -4449,6 +4528,11 @@ rm -f /var/run/texlive/run-update
%{_bindir}/dvilj4l %{_bindir}/dvilj4l
%{_bindir}/dvilj6 %{_bindir}/dvilj6
%files dviout-util-bin
%defattr(-,root,root,755)
%{_bindir}/chkdvifont
%{_bindir}/dvispc
%files dvipdfmx-bin %files dvipdfmx-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/dvipdfm %{_bindir}/dvipdfm
@ -4458,6 +4542,7 @@ rm -f /var/run/texlive/run-update
%{_bindir}/dvipdft %{_bindir}/dvipdft
%{_bindir}/ebb %{_bindir}/ebb
%{_bindir}/extractbb %{_bindir}/extractbb
%{_bindir}/xdvipdfmx
%files dvipng-bin %files dvipng-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
@ -4689,9 +4774,7 @@ rm -f /var/run/texlive/run-update
%{_bindir}/dviluatex %{_bindir}/dviluatex
%{_bindir}/luajittex %{_bindir}/luajittex
%{_bindir}/luatex %{_bindir}/luatex
%{_bindir}/luatex53
%{_bindir}/texlua %{_bindir}/texlua
%{_bindir}/texlua53
%{_bindir}/texluac %{_bindir}/texluac
%{_bindir}/texluajit %{_bindir}/texluajit
%{_bindir}/texluajitc %{_bindir}/texluajitc
@ -4737,6 +4820,7 @@ rm -f /var/run/texlive/run-update
%{_bindir}/dvitomp %{_bindir}/dvitomp
%{_bindir}/mfplain %{_bindir}/mfplain
%{_bindir}/mpost %{_bindir}/mpost
%{_bindir}/r-mpost
%files mex-bin %files mex-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
@ -4855,6 +4939,10 @@ rm -f /var/run/texlive/run-update
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/pdflatexpicscale %{_bindir}/pdflatexpicscale
%files pdftex-quiet-bin
%defattr(-,root,root,755)
%{_bindir}/pdftex-quiet
%files pdftex-bin %files pdftex-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/etex %{_bindir}/etex
@ -4953,6 +5041,7 @@ rm -f /var/run/texlive/run-update
%{_bindir}/ppltotf %{_bindir}/ppltotf
%{_bindir}/ptex %{_bindir}/ptex
%{_bindir}/ptftopl %{_bindir}/ptftopl
%{_bindir}/r-pmpost
%files ptex2pdf-bin %files ptex2pdf-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
@ -5071,6 +5160,9 @@ rm -f /var/run/texlive/run-update
%files texdoc-bin %files texdoc-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/texdoc %{_bindir}/texdoc
%files texdoctk-bin
%defattr(-,root,root,755)
%{_bindir}/texdoctk %{_bindir}/texdoctk
%files texfot-bin %files texfot-bin
@ -5142,6 +5234,7 @@ rm -f /var/run/texlive/run-update
%files uptex-bin %files uptex-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/euptex %{_bindir}/euptex
%{_bindir}/r-upmpost
%{_bindir}/upbibtex %{_bindir}/upbibtex
%{_bindir}/updvitomp %{_bindir}/updvitomp
%{_bindir}/updvitype %{_bindir}/updvitype
@ -5173,6 +5266,10 @@ rm -f /var/run/texlive/run-update
%{_bindir}/tangle %{_bindir}/tangle
%{_bindir}/weave %{_bindir}/weave
%files webquiz-bin
%defattr(-,root,root,755)
%{_bindir}/webquiz
%files wordcount-bin %files wordcount-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/wordcount %{_bindir}/wordcount
@ -5185,10 +5282,13 @@ rm -f /var/run/texlive/run-update
%files xetex-bin %files xetex-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/teckit_compile %{_bindir}/teckit_compile
%{_bindir}/xdvipdfmx
%{_bindir}/xelatex %{_bindir}/xelatex
%{_bindir}/xetex %{_bindir}/xetex
%files xindex-bin
%defattr(-,root,root,755)
%{_bindir}/xindex
%files xmltex-bin %files xmltex-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/pdfxmltex %{_bindir}/pdfxmltex
@ -5231,10 +5331,6 @@ rm -f /var/run/texlive/run-update
%{_libdir}/libsynctex.so %{_libdir}/libsynctex.so
%{_libdir}/pkgconfig/synctex.pc %{_libdir}/pkgconfig/synctex.pc
%files -n libtexlua52-5
%defattr(-,root,root,755)
%{_libdir}/libtexlua52*so.*
%files -n libtexlua53-5 %files -n libtexlua53-5
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_libdir}/libtexlua53*so.* %{_libdir}/libtexlua53*so.*