From eeac9ad0cc9aa667209f693b1a8e2b9fe3a8b423 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 24 Apr 2016 16:18:14 +0200 Subject: poppler: update to 0.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * remove leftover patches * run tested against evince and qpdfview Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- .../fix-qt4e-library-dependencies.patch | 28 ------------ meta-oe/recipes-support/poppler/poppler_0.37.0.bb | 51 ---------------------- meta-oe/recipes-support/poppler/poppler_0.41.0.bb | 51 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 79 deletions(-) delete mode 100644 meta-oe/recipes-support/poppler/poppler-0.35.0/fix-qt4e-library-dependencies.patch delete mode 100644 meta-oe/recipes-support/poppler/poppler_0.37.0.bb create mode 100644 meta-oe/recipes-support/poppler/poppler_0.41.0.bb 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 @@ -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 diff --git a/meta-oe/recipes-support/poppler/poppler_0.37.0.bb b/meta-oe/recipes-support/poppler/poppler_0.37.0.bb deleted file mode 100644 index 2c6b1a9d96..0000000000 --- a/meta-oe/recipes-support/poppler/poppler_0.37.0.bb +++ /dev/null @@ -1,51 +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 \ -" -SRC_URI[md5sum] = "c635e1742202cbbd9182cb0255d95652" -SRC_URI[sha256sum] = "b89f9c5eae3bbb1046b0f767714afd75eca102a0406a3a30856778d42a685bee" - -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" - -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.41.0.bb b/meta-oe/recipes-support/poppler/poppler_0.41.0.bb new file mode 100644 index 0000000000..4320408464 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler_0.41.0.bb @@ -0,0 +1,51 @@ +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] = "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" + +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