Accepting request 624235 from Publishing:TeXLive

- Add source-fix-const-poppler0.66.0.patch to fix several const
  issues that broke the build of texlive with poppler 0.66.0. (forwarded request 624117 from alarrosa)

OBS-URL: https://build.opensuse.org/request/show/624235
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive?expand=0&rev=50

source-fix-const-poppler0.66.0.patch

@@ -0,0 +1,121 @@
+Index: texk/web2c/pdftexdir/pdftosrc.cc
+===================================================================
+--- texk/web2c/pdftexdir/pdftosrc.cc
++++ texk/web2c/pdftexdir/pdftosrc.cc
+@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
+     Stream *s;
+     Object srcStream, srcName, catalogDict;
+     FILE *outfile;
+-    char *outname;
++    const char *outname = NULL;
+     int objnum = 0, objgen = 0;
+     bool extract_xref_table = false;
+     int c;
+Index: texk/web2c/pdftexdir/pdftoepdf.cc
+===================================================================
+--- texk/web2c/pdftexdir/pdftoepdf.cc
++++ texk/web2c/pdftexdir/pdftoepdf.cc
+@@ -306,7 +306,7 @@ static int getNewObjectNumber(Ref ref)
+ 
+ static void copyObject(Object *);
+ 
+-static void copyName(char *s)
++static void copyName(const char *s)
+ {
+     pdf_puts("/");
+     for (; *s != 0; s++) {
+@@ -318,7 +318,7 @@ static void copyName(char *s)
+     }
+ }
+ 
+-static void copyDictEntry(Object * obj, int i)
++static void copyDictEntry(const Object * obj, int i)
+ {
+     Object obj1;
+     copyName(obj->dictGetKey(i));
+@@ -328,7 +328,7 @@ static void copyDictEntry(Object * obj,
+     pdf_puts("\n");
+ }
+ 
+-static void copyDict(Object * obj)
++static void copyDict(const Object * obj)
+ {
+     int i, l;
+     if (!obj->isDict())
+@@ -338,7 +338,7 @@ static void copyDict(Object * obj)
+         copyDictEntry(obj, i);
+ }
+ 
+-static void copyFontDict(Object * obj, InObj * r)
++static void copyFontDict(const Object * obj, InObj * r)
+ {
+     int i, l;
+     char *key;
+@@ -394,7 +394,7 @@ static void copyProcSet(Object * obj)
+     return false;
+ }
+ 
+-static void copyFont(char *tag, Object * fontRef)
++static void copyFont(const char *tag, Object * fontRef)
+ {
+     Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
+         stemV;
+@@ -561,8 +561,8 @@ static void copyObject(Object * obj)
+     Object obj1;
+     int i, l, c;
+     Ref ref;
+-    char *p;
+-    GString *s;
++    const char *p;
++    const GString *s;
+     if (obj->isBool()) {
+         pdf_printf("%s", obj->getBool()? "true" : "false");
+     } else if (obj->isInt()) {
+Index: 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)
+  * leading slashes, but without blanks between them, like: /a/b/c
+ ***********************************************************************/
+ 
+-void epdf_mark_glyphs(fd_entry * fd, char *charset)
++void epdf_mark_glyphs(fd_entry * fd, const char *charset)
+ {
+     char *p, *q, *s;
+     char *glyph;
+Index: texk/web2c/pdftexdir/mapfile.c
+===================================================================
+--- texk/web2c/pdftexdir/mapfile.c
++++ texk/web2c/pdftexdir/mapfile.c
+@@ -682,7 +682,7 @@ static boolean fm_valid_for_font_replace
+  * used for Type1 font replacement when embedding of PDF files
+  */
+ 
+-fm_entry *lookup_fontmap(char *ps_name)
++fm_entry *lookup_fontmap(const char *ps_name)
+ {
+     fm_entry *fm, *fm2, tmp;
+     char *a, *b, *c, *d, *e, *s;
+Index: texk/web2c/pdftexdir/pdftex-common.h
+===================================================================
+--- texk/web2c/pdftexdir/pdftex-common.h
++++ texk/web2c/pdftexdir/pdftex-common.h
+@@ -67,7 +67,7 @@ extern void zpdfbeginobj(integer, intege
+ extern void embed_whole_font(fd_entry *);
+ extern fd_entry *epdf_create_fontdescriptor(fm_entry *, int);
+ extern void epdf_free(void);
+-extern void epdf_mark_glyphs(fd_entry *, char *);
++extern void epdf_mark_glyphs(fd_entry *, const char *);
+ extern int get_fd_objnum(fd_entry *);
+ extern int get_fn_objnum(fd_entry *);
+ extern int is_subsetable(fm_entry *);
+@@ -76,7 +76,7 @@ extern int is_subsetable(fm_entry *);
+ extern char notdef[];
+ 
+ /* mapfile.c */
+-extern fm_entry *lookup_fontmap(char *);
++extern fm_entry *lookup_fontmap(const char *);
+ #undef fd_entry
+ #undef fm_entry
+ 

texlive.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jul 19 12:19:08 UTC 2018 - alarrosa@suse.com
+
+- Add source-fix-const-poppler0.66.0.patch to fix several const
+  issues that broke the build of texlive with poppler 0.66.0.
+
+-------------------------------------------------------------------
+Mon Jul 16 10:55:34 UTC 2018 - werner@suse.de
+
+- Add a view dependencies to perl-biber
+
 -------------------------------------------------------------------
 Thu May 10 10:10:29 UTC 2018 - werner@suse.de
 

texlive.spec

@@ -19,7 +19,7 @@
 %define texlive_version  2018
 %define texlive_previous 2016
 %define texlive_release  20180414
-%define texlive_noarch   154
+%define texlive_noarch   158
 %define texlive_source   texlive-20180414-source
 
 %define __perl_requires		%{nil}
@@ -273,6 +273,8 @@ Patch50:        source-dvipdfm-x.dif
 Patch51:        freetype-use-pkg-config.patch
 # PATCH-FIX-TEXLIVE
 Patch52:        source-tounicode.dif
+# PATCH-FIX-TEXLIVE
+Patch53:        source-fix-const-poppler0.66.0.patch
 Prefix:         %{_bindir}
 Provides:       pdfjam = %{version}
 Obsoletes:      pdfjam < %{version}
@@ -3358,6 +3360,8 @@ Requires:       perl(Encode::EUCJPASCII)
 Requires:       perl(Encode::HanExtra)
 Requires:       perl(Encode::JIS2K)
 Requires:       perl(File::Slurp)
+Requires:       perl(File::Slurp::Unicode)
+Requires:       perl(File::Slurper)
 Requires:       perl(IPC::Cmd)
 Requires:       perl(IPC::Run3)
 Requires:       perl(LWP::Protocol::https)
@@ -3573,6 +3577,10 @@ popd
 %patch51 -p1 -b .fft2
 %patch52 -p0 -b .2utf8
 
+%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.66.0}}%{!?pkg_vcmp:0}
+%patch53 -p0 -b .poppler
+%endif
+
     # Correct FHS paths
     paths=$(find -name cnf-to-paths.awk)
     test -n "$paths" || exit 1
@@ -4118,15 +4126,16 @@ popd
 %endif
 
 %pre kpathsea-bin
-if test "$1" = 1 -a -z "$(%{_bindir}/getent group %{texgrp} 2>/dev/null)"; then
+%{_bindir}/getent group %{texgrp} > /dev/null 2>&1 || %{_sbindir}/groupadd -r %{?texgid:-g %texgid} %{texgrp}
-    %{_sbindir}/groupadd -r %{?texgid:-g %texgid} %{texgrp}
-fi
 
 %post kpathsea-bin
 %if %{defined set_permissions}
 %set_permissions %{_libexecdir}/mktex/public
 %endif
 
+%pre
+%{_bindir}/getent group %{texgrp} > /dev/null 2>&1 || %{_sbindir}/groupadd -r %{?texgid:-g %texgid} %{texgrp}
+
 %post
 mkdir -p /var/run/texlive
 > /var/run/texlive/run-mktexlsr