diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2016-09-27 07:55:32 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-10-03 19:19:57 +0200 |
| commit | a0c3cea1ca5f9231a498a9dedd6eb18ee41b1d5a (patch) | |
| tree | 1e5f0c9c3d277ab7055b3d14eedbbdfe0e93c52b /meta-oe/recipes-support | |
| parent | b77869aa3840d759168385db31d3d18e6faeba14 (diff) | |
| download | meta-openembedded-contrib-a0c3cea1ca5f9231a498a9dedd6eb18ee41b1d5a.tar.gz | |
poppler: update to 0.47.0
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch | 14 | ||||
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler_0.47.0.bb (renamed from meta-oe/recipes-support/poppler/poppler_0.43.0.bb) | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch b/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch index 560b073239..4e80d240fa 100644 --- a/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch +++ b/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/meta-oe/recipes-support/poppler/poppler_0.43.0.bb b/meta-oe/recipes-support/poppler/poppler_0.47.0.bb index 9abcd2ca87..071cfb26e4 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.43.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.47.0.bb @@ -7,8 +7,8 @@ SRC_URI = " \ file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \ file://0002-fix-gcc-6-math-ambiguous-errors.patch \ " -SRC_URI[md5sum] = "1d2b001663119855cdfbc0713dbfb9c6" -SRC_URI[sha256sum] = "c720e26a26ee10b7ebc9e256d2ee7adcdb536cf85f9f1c4777a38f7f81fb2456" +SRC_URI[md5sum] = "669b195ff24173d35cacf1d20b6fe4fa" +SRC_URI[sha256sum] = "b872e7228fc34a71ce4b47a5aea2a57ae67528818fa846e1e0eda089319bd242" DEPENDS = "fontconfig zlib cairo lcms" |