diff options
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler-0.35.0/fix-qt4e-library-dependencies.patch | 28 | ||||
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler_0.41.0.bb (renamed from meta-oe/recipes-support/poppler/poppler_0.37.0.bb) | 4 |
2 files changed, 2 insertions, 30 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler-0.35.0/fix-qt4e-library-dependencies.patch b/meta-oe/recipes-support/poppler/poppler-0.35.0/fix-qt4e-library-dependencies.patch deleted file mode 100644 index f67e1f5039..0000000000 --- a/meta-oe/recipes-support/poppler/poppler-0.35.0/fix-qt4e-library-dependencies.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | Configuration changes needed to allow building with QT4-embedded | ||
| 2 | |||
| 3 | Index: poppler-0.35.0/configure.ac | ||
| 4 | =================================================================== | ||
| 5 | --- poppler-0.35.0.orig/configure.ac | ||
| 6 | +++ poppler-0.35.0/configure.ac | ||
| 7 | @@ -654,17 +654,17 @@ AC_ARG_ENABLE(poppler-qt4, | ||
| 8 | enable_poppler_qt4="try") | ||
| 9 | if test x$enable_poppler_qt4 = xyes; then | ||
| 10 | PKG_CHECK_MODULES(POPPLER_QT4, | ||
| 11 | - QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0) | ||
| 12 | + QtCoreE >= 4.7.0 QtGuiE >= 4.7.0 QtXmlE >= 4.7.0) | ||
| 13 | PKG_CHECK_MODULES(POPPLER_QT4_TEST, | ||
| 14 | - QtTest >= 4.7.0) | ||
| 15 | + QtTestE >= 4.7.0) | ||
| 16 | elif test x$enable_poppler_qt4 = xtry; then | ||
| 17 | PKG_CHECK_MODULES(POPPLER_QT4, | ||
| 18 | - QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0, | ||
| 19 | + QtCoreE >= 4.7.0 QtGuiE >= 4.7.0 QtXmlE >= 4.7.0, | ||
| 20 | [enable_poppler_qt4="yes"], | ||
| 21 | [enable_poppler_qt4="no"]) | ||
| 22 | if test x$enable_poppler_qt4 = xyes; then | ||
| 23 | PKG_CHECK_MODULES(POPPLER_QT4_TEST, | ||
| 24 | - QtTest >= 4.7.0, | ||
| 25 | + QtTestE >= 4.7.0, | ||
| 26 | [enable_poppler_qt4="yes"], | ||
| 27 | [enable_poppler_qt4="no"]) | ||
| 28 | fi | ||
diff --git a/meta-oe/recipes-support/poppler/poppler_0.37.0.bb b/meta-oe/recipes-support/poppler/poppler_0.41.0.bb index 2c6b1a9d96..4320408464 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.37.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.41.0.bb | |||
| @@ -6,8 +6,8 @@ SRC_URI = " \ | |||
| 6 | http://poppler.freedesktop.org/${BP}.tar.xz \ | 6 | http://poppler.freedesktop.org/${BP}.tar.xz \ |
| 7 | file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \ | 7 | file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \ |
| 8 | " | 8 | " |
| 9 | SRC_URI[md5sum] = "c635e1742202cbbd9182cb0255d95652" | 9 | SRC_URI[md5sum] = "849a8bd6af5794efb961b70418414e5a" |
| 10 | SRC_URI[sha256sum] = "b89f9c5eae3bbb1046b0f767714afd75eca102a0406a3a30856778d42a685bee" | 10 | SRC_URI[sha256sum] = "420abaab63caed9e1ee28964a0ba216d1979506726164bc99ad5ade289192a1b" |
| 11 | 11 | ||
| 12 | DEPENDS = "fontconfig zlib cairo lcms" | 12 | DEPENDS = "fontconfig zlib cairo lcms" |
| 13 | 13 | ||
