poppler: update to 0.4.1

* remove leftover patches
* run tested against evince and qpdfview

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-04-24 16:18:14 +02:00
committed by Martin Jansa
parent dad9a7847f
commit eeac9ad0cc
2 changed files with 2 additions and 30 deletions
@@ -1,28 +0,0 @@
Configuration changes needed to allow building with QT4-embedded
Index: poppler-0.35.0/configure.ac
===================================================================
--- poppler-0.35.0.orig/configure.ac
+++ poppler-0.35.0/configure.ac
@@ -654,17 +654,17 @@ AC_ARG_ENABLE(poppler-qt4,
enable_poppler_qt4="try")
if test x$enable_poppler_qt4 = xyes; then
PKG_CHECK_MODULES(POPPLER_QT4,
- QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0)
+ QtCoreE >= 4.7.0 QtGuiE >= 4.7.0 QtXmlE >= 4.7.0)
PKG_CHECK_MODULES(POPPLER_QT4_TEST,
- QtTest >= 4.7.0)
+ QtTestE >= 4.7.0)
elif test x$enable_poppler_qt4 = xtry; then
PKG_CHECK_MODULES(POPPLER_QT4,
- QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0,
+ QtCoreE >= 4.7.0 QtGuiE >= 4.7.0 QtXmlE >= 4.7.0,
[enable_poppler_qt4="yes"],
[enable_poppler_qt4="no"])
if test x$enable_poppler_qt4 = xyes; then
PKG_CHECK_MODULES(POPPLER_QT4_TEST,
- QtTest >= 4.7.0,
+ QtTestE >= 4.7.0,
[enable_poppler_qt4="yes"],
[enable_poppler_qt4="no"])
fi
@@ -6,8 +6,8 @@ SRC_URI = " \
http://poppler.freedesktop.org/${BP}.tar.xz \
file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \
"
SRC_URI[md5sum] = "c635e1742202cbbd9182cb0255d95652"
SRC_URI[sha256sum] = "b89f9c5eae3bbb1046b0f767714afd75eca102a0406a3a30856778d42a685bee"
SRC_URI[md5sum] = "849a8bd6af5794efb961b70418414e5a"
SRC_URI[sha256sum] = "420abaab63caed9e1ee28964a0ba216d1979506726164bc99ad5ade289192a1b"
DEPENDS = "fontconfig zlib cairo lcms"