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

Accepting request 756076 from home:mgorse:factory

Browse Source 
- Add  source-poppler0.83.0.patch: support poppler 0.83.

OBS-URL: https://build.opensuse.org/request/show/756076
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=336
This commit is contained in:
Dr. Werner Fink 2019-12-12 14:30:53 +00:00 committed by Git OBS Bridge
parent a056176453
commit 2533f588d2
3 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
source-poppler0.83.0.patch Normal file
View File

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

5
texlive.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Dec 11 21:35:59 UTC 2019 - Michael Gorse <mgorse@suse.com>
- Add source-poppler0.83.0.patch: support poppler 0.83.
-------------------------------------------------------------------
Tue Nov 26 09:54:59 UTC 2019 - Dr. Werner Fink <werner@suse.de>

7
texlive.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package texlive
#
# Copyright (c) 2019 SUSE LLC.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -277,6 +277,8 @@ Patch58: source-poppler0.79.0.patch
Patch59: 0001-Updated-tests-after-U-C-upgrade-changed-sortinit-hashes.patch
# PATCH-FIX-UPSTREAM Bug bsc#1155411 - (CVE-2019-18604) VUL-1: CVE-2019-18604: texlive: improper use of sprintf
Patch60: source-fix-axohelp.patch
# PATCH-FIX-TEXLIVE
Patch61: source-poppler0.83.0.patch
Prefix: %{_bindir}
Provides: pdfjam = %{version}
Obsoletes: pdfjam < %{version}
@ -3678,6 +3680,9 @@ popd
%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.73.0}}%{!?pkg_vcmp:0}
%patch58 -p1 -b .poppler75
%endif
%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.83.0}}%{!?pkg_vcmp:0}
%patch61 -p1 -b .poppler79
%endif
pver=$(pkg-config --modversion poppler)
%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.79.0}}%{!?pkg_vcmp:0}
cp ./texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc ./texk/web2c/pdftexdir/pdftoepdf-poppler${pver}.cc