Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2019-10-10 11:52:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler (Old) and /work/SRC/openSUSE:Factory/.poppler.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler" Thu Oct 10 11:52:40 2019 rev:153 rq:736318 version:0.81.0 Changes: -------- --- /work/SRC/openSUSE:Factory/poppler/poppler.changes 2019-10-03 16:13:41.333155750 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new.2352/poppler.changes 2019-10-10 11:52:41.843440331 +0200 @@ -1,0 +2,14 @@ +Tue Oct 8 17:12:53 UTC 2019 - Stefan Brüns <[email protected]> + +- Avoid unconditional dependency on boost_headers when using the + (private) splash headers. Depending on the used classes (e.g. + SplashXPathScanner), the boost headers may still be needed, add + + 0001-Include-SplashMath.h-only-where-needed.patch + + 0002-Move-the-non-trivial-part-of-the-clip-test-to-the-im.patch + +------------------------------------------------------------------- +Tue Oct 8 06:18:42 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Define %cmake_build for Leap 15.0. + +------------------------------------------------------------------- New: ---- 0001-Include-SplashMath.h-only-where-needed.patch 0002-Move-the-non-trivial-part-of-the-clip-test-to-the-im.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.BjPWAK/_old 2019-10-10 11:52:42.459438696 +0200 +++ /var/tmp/diff_new_pack.BjPWAK/_new 2019-10-10 11:52:42.459438696 +0200 @@ -40,6 +40,9 @@ Url: https://poppler.freedesktop.org/ Source: http://poppler.freedesktop.org/%{sname}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM -- Avoid dependency on boost_headers from splash headers +Patch0: 0001-Include-SplashMath.h-only-where-needed.patch +Patch1: 0002-Move-the-non-trivial-part-of-the-clip-test-to-the-im.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: glib2-devel @@ -71,7 +74,6 @@ BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(nss) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -168,8 +170,13 @@ %prep %setup -q -n poppler-%{version} +%patch0 -p1 +%patch1 -p1 %build +# Leap 15.0 doesn't know %%cmake_build +%{?!cmake_build:%define cmake_build() make %{?_smp_mflags} VERBOSE=1} + %if "%{flavor}" == "qt5" export MOCQT5='%{_libqt5_bindir}/moc' export MOCQT52='%{_libqt5_bindir}/moc' ++++++ 0001-Include-SplashMath.h-only-where-needed.patch ++++++ >From 9d875adabdc94f50de78d72528d373b46a8ed280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Mon, 7 Oct 2019 19:57:32 +0200 Subject: [PATCH 1/3] Include SplashMath.h only where needed --- poppler/SplashOutputDev.cc | 1 + splash/SplashClip.cc | 1 + splash/SplashClip.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc index 440ee307..214302a7 100644 --- a/poppler/SplashOutputDev.cc +++ b/poppler/SplashOutputDev.cc @@ -74,6 +74,7 @@ #include "splash/SplashFont.h" #include "splash/SplashFontFile.h" #include "splash/SplashFontFileID.h" +#include "splash/SplashMath.h" #include "splash/Splash.h" #include "SplashOutputDev.h" #include <algorithm> diff --git a/splash/SplashClip.cc b/splash/SplashClip.cc index 8a07f24f..a58fd29e 100644 --- a/splash/SplashClip.cc +++ b/splash/SplashClip.cc @@ -25,6 +25,7 @@ #include <string.h> #include "goo/gmem.h" #include "SplashErrorCodes.h" +#include "SplashMath.h" #include "SplashPath.h" #include "SplashXPath.h" #include "SplashXPathScanner.h" diff --git a/splash/SplashClip.h b/splash/SplashClip.h index ddc48974..a6ab1870 100644 --- a/splash/SplashClip.h +++ b/splash/SplashClip.h @@ -23,7 +23,6 @@ #define SPLASHCLIP_H #include "SplashTypes.h" -#include "SplashMath.h" #include "SplashXPathScanner.h" class SplashPath; -- 2.23.0 ++++++ 0002-Move-the-non-trivial-part-of-the-clip-test-to-the-im.patch ++++++ >From 194e57f21e6a7fe2a5eb3cf687599978b09e03f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Mon, 7 Oct 2019 20:46:33 +0200 Subject: [PATCH 2/3] Move the non-trivial part of the clip test to the implementation file This allows to only have a SplashXPathScanner forward declaration in the header file. --- splash/SplashClip.cc | 15 +++++++++++++++ splash/SplashClip.h | 21 +++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/splash/SplashClip.cc b/splash/SplashClip.cc index a58fd29e..a4c2e73e 100644 --- a/splash/SplashClip.cc +++ b/splash/SplashClip.cc @@ -406,3 +406,18 @@ void SplashClip::clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y, bool a } } } + +bool SplashClip::testClipPaths(int x, int y) { + if (antialias) { + x *= splashAASize; + y *= splashAASize; + } + + for (int i = 0; i < length; ++i) { + if (!scanners[i]->test(x, y)) { + return false; + } + } + + return true; +} diff --git a/splash/SplashClip.h b/splash/SplashClip.h index a6ab1870..77b5e6c3 100644 --- a/splash/SplashClip.h +++ b/splash/SplashClip.h @@ -23,10 +23,10 @@ #define SPLASHCLIP_H #include "SplashTypes.h" -#include "SplashXPathScanner.h" class SplashPath; class SplashXPath; +class SplashXPathScanner; class SplashBitmap; //------------------------------------------------------------------------ @@ -72,29 +72,13 @@ public: // Returns true if (<x>,<y>) is inside the clip. bool test(int x, int y) { - int i; - // check the rectangle if (x < xMinI || x > xMaxI || y < yMinI || y > yMaxI) { return false; } // check the paths - if (antialias) { - for (i = 0; i < length; ++i) { - if (!scanners[i]->test(x * splashAASize, y * splashAASize)) { - return false; - } - } - } else { - for (i = 0; i < length; ++i) { - if (!scanners[i]->test(x, y)) { - return false; - } - } - } - - return true; + return testClipPaths(x, y); } // Tests a rectangle against the clipping region. Returns one of: @@ -137,6 +121,7 @@ protected: SplashClip(SplashClip *clip); void grow(int nPaths); + bool testClipPaths(int x, int y); bool antialias; SplashCoord xMin, yMin, xMax, yMax; -- 2.23.0
