From 5ce609fa3429b317bfda7daf4e442c50d037939c Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 17 May 2016 01:04:40 +0200 Subject: poppler: update to 0.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * patch was applied upstream * a PACKAGECONFIG for nss was added - enabled by default Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- ...h-C-11-compilers-that-don-t-define-isinfi.patch | 39 --------------- meta-oe/recipes-support/poppler/poppler_0.41.0.bb | 55 ---------------------- meta-oe/recipes-support/poppler/poppler_0.43.0.bb | 55 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 94 deletions(-) delete mode 100644 meta-oe/recipes-support/poppler/poppler/0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch delete mode 100644 meta-oe/recipes-support/poppler/poppler_0.41.0.bb create mode 100644 meta-oe/recipes-support/poppler/poppler_0.43.0.bb (limited to 'meta-oe/recipes-support/poppler') diff --git a/meta-oe/recipes-support/poppler/poppler/0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch b/meta-oe/recipes-support/poppler/poppler/0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch deleted file mode 100644 index d5c34a6a02..0000000000 --- a/meta-oe/recipes-support/poppler/poppler/0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a8e3399487258e53df0fd4a79c570c8d71188bed Mon Sep 17 00:00:00 2001 -From: Takahiro Hashimoto -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 - // Copyright (C) 2015 Tamas Szekeres - // Copyright (C) 2015 Kenji Uno -+// Copyright (C) 2016 Takahiro Hashimoto - // - // 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 -+#ifndef isfinite -+#define isfinite(x) std::isfinite(x) -+#endif -+#endif -+ - static inline void convertGfxColor(SplashColorPtr dest, - SplashColorMode colorMode, - GfxColorSpace *colorSpace, --- -2.8.2 - diff --git a/meta-oe/recipes-support/poppler/poppler_0.41.0.bb b/meta-oe/recipes-support/poppler/poppler_0.41.0.bb deleted file mode 100644 index f7cc07681c..0000000000 --- a/meta-oe/recipes-support/poppler/poppler_0.41.0.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -LICENSE = "GPLv2" -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" - -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] = "--enable-libjpeg,--disable-libjpeg,jpeg" -PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng" -PACKAGECONFIG[tiff] = "--enable-libtiff,--disable-libtiff,tiff" -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" - -# Needed for qt5 -CXXFLAGS += "--std=c++11" - -EXTRA_OECONF = "\ - --enable-xpdf-headers \ - --disable-gtk-test \ - --enable-zlib \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/poppler/.libs" -} - -# Adjust library names when building for QT4e -QT4E_PATCHES = "${@bb.utils.contains('PACKAGECONFIG', 'qt4e', 'file://fix-qt4e-library-dependencies.patch', '', d)}" -SRC_URI_append = "${QT4E_PATCHES}" - -# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -def get_poppler_fpu_setting(bb, d): - if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: - return "--enable-fixedpoint" - return "" - -EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}" - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-oe/recipes-support/poppler/poppler_0.43.0.bb b/meta-oe/recipes-support/poppler/poppler_0.43.0.bb new file mode 100644 index 0000000000..95cd5e5daf --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler_0.43.0.bb @@ -0,0 +1,55 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +LICENSE = "GPLv2" +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 \ +" +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 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" +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" + +EXTRA_OECONF = "\ + --enable-xpdf-headers \ + --disable-gtk-test \ + --enable-zlib \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/poppler/.libs" +} + +# Adjust library names when building for QT4e +QT4E_PATCHES = "${@bb.utils.contains('PACKAGECONFIG', 'qt4e', 'file://fix-qt4e-library-dependencies.patch', '', d)}" +SRC_URI_append = "${QT4E_PATCHES}" + +# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +def get_poppler_fpu_setting(bb, d): + if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: + return "--enable-fixedpoint" + return "" + +EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}" + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES_libpoppler = "${libdir}/libpoppler.so.*" +FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS_libpoppler = "poppler-data" -- cgit 1.2.3-korg