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

Accepting request 624117 from home:alarrosa:branches:Publishing:TeXLive

Browse Source 
- Add source-fix-const-poppler0.66.0.patch to fix several const
  issues that broke the build of texlive with poppler 0.66.0.

OBS-URL: https://build.opensuse.org/request/show/624117
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=304
This commit is contained in:
Dr. Werner Fink 2018-07-20 09:53:16 +00:00 committed by Git OBS Bridge
parent 798b3d5e96
commit d7b0ca997a
3 changed files with 134 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
source-fix-const-poppler0.66.0.patch Normal file
View File

@ -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

6
texlive.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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

8
texlive.spec
View File

@ -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}
@ -3521,7 +3523,7 @@ This package is required by the package texlive-biber-bin.
tar --use-compress-program=xz --strip-components=1 -xf %{S:0}
%if %{with buildbiber}
pushd ../
pushd ../
tar --use-compress-program=xz -xf %{S:3}
popd
%endif
@ -3575,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