Hello community,
here is the log from the commit of package texlive for openSUSE:Factory checked
in at 2020-01-19 20:55:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive (Old)
and /work/SRC/openSUSE:Factory/.texlive.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive"
Sun Jan 19 20:55:51 2020 rev:61 rq:765170 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive/texlive.changes 2020-01-16
18:19:07.928903244 +0100
+++ /work/SRC/openSUSE:Factory/.texlive.new.26092/texlive.changes
2020-01-19 20:57:48.872062131 +0100
@@ -1,0 +2,10 @@
+Thu Jan 16 10:41:17 UTC 2020 - Dr. Werner Fink <wer...@suse.de>
+
+- Make patch suffix unique
+
+-------------------------------------------------------------------
+Wed Jan 15 12:21:14 UTC 2020 - Bjørn Lie <bjorn....@gmail.com>
+
+- Add source-poppler0.84.0.patch: Fix build with poppler-0.84.
+
+-------------------------------------------------------------------
New:
----
source-poppler0.84.0.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive.spec ++++++
--- /var/tmp/diff_new_pack.VfqEPE/_old 2020-01-19 20:57:50.212062835 +0100
+++ /var/tmp/diff_new_pack.VfqEPE/_new 2020-01-19 20:57:50.216062837 +0100
@@ -281,6 +281,8 @@
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 @@
%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
++++++ source-poppler0.84.0.patch ++++++
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>
