mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-02-23 05:10:42 +00:00
Code Issues Projects Releases Wiki Activity

poppler: update to 0.43.0

Browse Source 
* patch was applied upstream
* a PACKAGECONFIG for nss was added - enabled by default

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller
2016-05-17 01:04:40 +02:00
committed by Martin Jansa
parent 207e97112b
commit 5ce609fa34
2 changed files with 4 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
meta-oe/recipes-support/poppler/poppler/0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch
View File

@@ -1,39 +0,0 @@
From a8e3399487258e53df0fd4a79c570c8d71188bed Mon Sep 17 00:00:00 2001
From: Takahiro Hashimoto <kenya888.en@gmail.com>
Date: Wed, 27 Apr 2016 00:16:52 +0200
Subject: [PATCH] Compile with C++11 compilers that don't define isinfinite
Bug #94761
---
poppler/SplashOutputDev.cc | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 13d090c..0e50702 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -36,6 +36,7 @@
// Copyright (C) 2014 Richard PALO <richard@netbsd.org>
// Copyright (C) 2015 Tamas Szekeres <szekerest@gmail.com>
// Copyright (C) 2015 Kenji Uno <ku@digitaldolphins.jp>
+// Copyright (C) 2016 Takahiro Hashimoto <kenya888.en@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -94,6 +95,13 @@ extern "C" int unlink(char *filename);
#endif
#endif
+#if __cplusplus > 199711L
+#include <cmath>
+#ifndef isfinite
+#define isfinite(x) std::isfinite(x)
+#endif
+#endif
+
static inline void convertGfxColor(SplashColorPtr dest,
SplashColorMode colorMode,
GfxColorSpace *colorSpace,
--
2.8.2

8
meta-oe/recipes-support/poppler/poppler_0.41.0.bb → meta-oe/recipes-support/poppler/poppler_0.43.0.bb
View File

@@ -5,16 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SRC_URI = " \
http://poppler.freedesktop.org/${BP}.tar.xz \
file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \
file://0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch \
"
SRC_URI[md5sum] = "849a8bd6af5794efb961b70418414e5a"
SRC_URI[sha256sum] = "420abaab63caed9e1ee28964a0ba216d1979506726164bc99ad5ade289192a1b"
SRC_URI[md5sum] = "1d2b001663119855cdfbc0713dbfb9c6"
SRC_URI[sha256sum] = "c720e26a26ee10b7ebc9e256d2ee7adcdb536cf85f9f1c4777a38f7f81fb2456"
DEPENDS = "fontconfig zlib cairo lcms"
inherit autotools pkgconfig gtk-doc gobject-introspection
PACKAGECONFIG ??= "jpeg openjpeg png tiff ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}"
PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}"
PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg"
PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng"
PACKAGECONFIG[tiff] = "--enable-libtiff,--disable-libtiff,tiff"
@@ -22,6 +21,7 @@ PACKAGECONFIG[curl] = "--enable-libcurl,--disable-libcurl,curl"
PACKAGECONFIG[openjpeg] = "--enable-libopenjpeg=openjpeg2,--disable-libopenjpeg,openjpeg"
PACKAGECONFIG[qt5] = "--enable-poppler-qt5 --with-moc-qt5=${STAGING_BINDIR_NATIVE}/qt5/moc,--disable-poppler-qt5,qtbase"
PACKAGECONFIG[qt4e] = "--enable-poppler-qt4 --with-moc-qt4=${STAGING_BINDIR_NATIVE}/moc4,--disable-poppler-qt4,qt4-embedded"
PACKAGECONFIG[nss] = "--enable-libnss,--disable-libnss,nss"
# Needed for qt5
CXXFLAGS += "--std=c++11"