diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-support/poppler')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch | 39 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch | 14 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch | 11 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.47.0.bb (renamed from import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.41.0.bb) | 9 |
4 files changed, 23 insertions, 50 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch deleted file mode 100644 index d5c34a6a0..000000000 --- a/import-layers/meta-openembedded/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 <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 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch index 560b07323..4e80d240f 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch @@ -14,10 +14,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 1 file changed, 8 insertions(+), 47 deletions(-) diff --git a/configure.ac b/configure.ac -index 67599c0..40fa596 100644 +index c4cfc2c..8e961c7 100644 --- a/configure.ac +++ b/configure.ac -@@ -622,25 +622,10 @@ AC_SUBST(POPPLER_QT4_LIBS) +@@ -712,25 +712,10 @@ AC_SUBST(POPPLER_QT4_LIBS) AC_SUBST(POPPLER_QT4_TEST_LIBS) if test x$enable_poppler_qt4 = xyes; then @@ -47,27 +47,27 @@ index 67599c0..40fa596 100644 AC_SUBST(MOCQT4) AC_MSG_RESULT([$MOCQT4]) fi -@@ -679,34 +664,10 @@ AC_SUBST(POPPLER_QT5_LIBS) +@@ -769,34 +754,10 @@ AC_SUBST(POPPLER_QT5_LIBS) AC_SUBST(POPPLER_QT5_TEST_LIBS) if test x$enable_poppler_qt5 = xyes; then - AC_CHECK_TOOL(MOCQT5, moc) - AC_MSG_CHECKING([for Qt5 moc]) - mocversion=`$MOCQT5 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` +- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` - if test x"$mocversiongrep" != x"$mocversion"; then - AC_MSG_RESULT([no]) - # moc was not the qt5 one, try with moc-qt5 - AC_CHECK_TOOL(MOCQT52, moc-qt5) - AC_MSG_CHECKING([for Qt5 moc-qt5]) - mocversion=`$MOCQT52 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"` +- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"` - if test x"$mocversiongrep" != x"$mocversion"; then - AC_CHECK_TOOL(QTCHOOSER, qtchooser) - AC_MSG_CHECKING([for qtchooser]) - qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` - mocversion=`$qt5tooldir/moc -v 2>&1` -- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` +- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` - if test x"$mocversiongrep" != x"$mocversion"; then - # no valid moc found - enable_poppler_qt5=no; @@ -87,5 +87,5 @@ index 67599c0..40fa596 100644 AC_MSG_RESULT([$MOCQT5]) fi -- -1.9.3 +2.5.5 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch new file mode 100644 index 000000000..406009f4f --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch @@ -0,0 +1,11 @@ +--- poppler-0.45.0/poppler/CairoOutputDev.cc.orig 2016-06-17 14:23:35.399083929 -0400 ++++ poppler-0.45.0/poppler/CairoOutputDev.cc 2016-06-17 14:36:53.351097825 -0400 +@@ -42,7 +42,7 @@ + #endif + + #include <string.h> +-#include <math.h> ++#include <cmath> + #include <assert.h> + #include <cairo.h> + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.41.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.47.0.bb index f7cc07681..071cfb26e 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.41.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.47.0.bb @@ -5,16 +5,16 @@ 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 \ + file://0002-fix-gcc-6-math-ambiguous-errors.patch \ " -SRC_URI[md5sum] = "849a8bd6af5794efb961b70418414e5a" -SRC_URI[sha256sum] = "420abaab63caed9e1ee28964a0ba216d1979506726164bc99ad5ade289192a1b" +SRC_URI[md5sum] = "669b195ff24173d35cacf1d20b6fe4fa" +SRC_URI[sha256sum] = "b872e7228fc34a71ce4b47a5aea2a57ae67528818fa846e1e0eda089319bd242" 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 +22,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" |