pool/texlive
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 765170 from Publishing:TeXLive

Browse Source 
Now we can submit it - would have been a shame to hold back a staging just for poppler. Thanks for waiting

OBS-URL: https://build.opensuse.org/request/show/765170
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive?expand=0&rev=61
This commit is contained in:
Dominique Leuenberger 2020-01-19 19:55:51 +00:00 committed by Git OBS Bridge
commit 6d9f816735
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source-poppler0.84.0.patch Normal file
View File

@ -0,0 +1,31 @@
pdfTeX 3.14159265-2.6-1.40.18 (TeX Live 2017) (April 27, 2017)
diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c
index c93a87819..7f5e50416 100644
--- a/texk/web2c/pdftexdir/utils.c
+++ b/texk/web2c/pdftexdir/utils.c
@@ -33,7 +33,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "ptexlib.h"
#include <png.h>
#ifdef POPPLER_VERSION
-#include <poppler-config.h>
+/* POPPLER_VERSION should be a proper version string */
#define xpdfVersion POPPLER_VERSION
#define xpdfString "poppler"
#else
diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c
index 4968ee41e..0aee4ee38 100644
--- a/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/texk/web2c/xetexdir/XeTeX_ext.c
@@ -38,7 +38,10 @@ authorization from the copyright holders.
#include <w2c/config.h>
+#ifndef POPPLER_VERSION
#include <poppler-config.h>
+#endif
+
#include <png.h>
#include <zlib.h>
#include <graphite2/Font.h>

10
texlive.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Jan 16 10:41:17 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Make patch suffix unique
-------------------------------------------------------------------
Wed Jan 15 12:21:14 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
- Add source-poppler0.84.0.patch: Fix build with poppler-0.84.
-------------------------------------------------------------------
Thu Jan 9 12:02:09 UTC 2020 - Dr. Werner Fink <werner@suse.de>

5
texlive.spec
View File

@ -281,6 +281,8 @@ Patch60: source-fix-axohelp.patch
Patch61: source-poppler0.83.0.patch
# PATCH-FIX-SUSE Avoid common variable (boo#1160417)
Patch62: source-common.patch
# PATCH-FIX-UPSTREAM source-poppler0.84.0.patch
Patch63: source-poppler0.84.0.patch
Prefix: %{_bindir}
Provides: pdfjam = %{version}
Obsoletes: pdfjam < %{version}
@ -3685,6 +3687,9 @@ popd
%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.83.0}}%{!?pkg_vcmp:0}
%patch61 -p1 -b .poppler79
%endif
%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.84.0}}%{!?pkg_vcmp:0}
%patch63 -p1 -b .poppler84
%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