On Sun, Apr 24, 2016 at 04:18:14PM +0200, Andreas Müller wrote: > * remove leftover patches > * run tested against evince and qpdfview
BTW; This seems to fail with Qt 5.7 from meta-qt5/master-next: | x86_64-oe-linux-libtool: compile: x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64 -DHAVE_CONFIG_H -I. -I../../../poppler-0.41.0/qt5/src -I../.. -I../../poppler -I../../../poppler-0.41.0 -I../../../poppler-0.41.0/poppler -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5/QtXml -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5 -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5/QtWidgets -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5 -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5/QtGui -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5 -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5/QtCore -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5 -Dpoppler_qt5_EXPORTS -fPIC -Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-check-new -fno-common -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/poppler/0.41.0-r0=/usr/src/debug/poppler/0.41.0-r0 -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux= -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64= -fvisibility-inlines-hidden -c ../../../poppler-0.41.0/qt5/src/ArthurOutputDev.cc -fPIC -DPIC -o .libs/libpoppler_qt5_la-ArthurOutputDev.o | In file included from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5/QtCore/qatomic.h:46:0, | from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5/QtCore/qglobal.h:1140, | from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5/QtCore/qchar.h:43, | from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5/QtCore/qstring.h:48, | from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5/QtCore/qdatetime.h:43, | from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5/QtCore/QDateTime:1, | from ../../../poppler-0.41.0/qt5/src/poppler-annotation.h:31, | from ../../../poppler-0.41.0/qt5/src/poppler-qt5.h:37, | from ../../../poppler-0.41.0/qt5/src/poppler-page.cc:34: | /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/include/qt5/QtCore/qbasicatomic.h:61:4: error: #error "Qt requires C++11 support" | # error "Qt requires C++11 support" | ^ > > Signed-off-by: Andreas Müller <[email protected]> > --- > .../fix-qt4e-library-dependencies.patch | 28 > ---------------------- > .../{poppler_0.37.0.bb => poppler_0.41.0.bb} | 4 ++-- > 2 files changed, 2 insertions(+), 30 deletions(-) > delete mode 100644 > meta-oe/recipes-support/poppler/poppler-0.35.0/fix-qt4e-library-dependencies.patch > rename meta-oe/recipes-support/poppler/{poppler_0.37.0.bb => > poppler_0.41.0.bb} (93%) > > 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 f67e1f5..0000000 > --- > 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.41.0.bb > similarity index 93% > rename from meta-oe/recipes-support/poppler/poppler_0.37.0.bb > rename to meta-oe/recipes-support/poppler/poppler_0.41.0.bb > index 2c6b1a9..4320408 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 = " \ > 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" > > -- > 2.5.5 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
