poppler: fix configure by pointing on moc

As discussed in [1] configure was detecting host's moc and failing in some
configurations.

To get this fixed configure gets a parameter by which the location of moc
is set.

[1] http://lists.openembedded.org/pipermail/openembedded-devel/2015-May/101641.html

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

2 files changed, 93 insertions, 1 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
new file mode 100644
index 0000000000..560b073239
--- /dev/null
+++ b/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch
@@ -0,0 +1,91 @@
+From 91b6275f0e91c25beb040b4ef9484053ae305d86 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 26 May 2015 12:45:47 +0200
+Subject: [PATCH] add manadatory options to find qt4/qt5 moc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 55 ++++++++-----------------------------------------------
+ 1 file changed, 8 insertions(+), 47 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67599c0..40fa596 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -622,25 +622,10 @@ AC_SUBST(POPPLER_QT4_LIBS)
+ AC_SUBST(POPPLER_QT4_TEST_LIBS)
+ 
+ if test x$enable_poppler_qt4 = xyes; then
+-  AC_CHECK_TOOL(MOCQT4, moc)
+-  AC_MSG_CHECKING([for Qt4 moc])
+-  mocversion=`$MOCQT4 -v 2>&1`
+-  mocversiongrep=`echo $mocversion | grep "Qt 4"`
+-  if test x"$mocversiongrep" != x"$mocversion"; then
+-    AC_MSG_RESULT([no])
+-    # moc was not the qt4 one, try with moc-qt4
+-    AC_CHECK_TOOL(MOCQT42, moc-qt4)
+-    AC_MSG_CHECKING([for Qt4 moc-qt4])
+-    mocversion=`$MOCQT42 -v 2>&1`
+-    mocversiongrep=`echo $mocversion | grep "Qt 4"`
+-    if test x"$mocversiongrep" != x"$mocversion"; then
+-      # no valid moc found
+-      enable_poppler_qt4=no;
+-      MOCQT4="not found"
+-    else
+-      MOCQT4=$MOCQT42
+-    fi
+-  fi
++  AC_ARG_WITH([moc-qt4],
++              AS_HELP_STRING([--with-moc-qt4], [Set location of qt4 moc]),
++              [MOCQT4=$withval]
++  )
+   AC_SUBST(MOCQT4)
+   AC_MSG_RESULT([$MOCQT4])
+ fi
+@@ -679,34 +664,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"`
+-  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"`
+-    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"`
+-      if test x"$mocversiongrep" != x"$mocversion"; then
+-        # no valid moc found
+-        enable_poppler_qt5=no;
+-        MOCQT5="not found"
+-      else
+-        MOCQT5=$qt5tooldir/moc
+-      fi
+-    else
+-      MOCQT5=$MOCQT52
+-    fi
+-  fi
++  AC_ARG_WITH([moc-qt5],
++              AS_HELP_STRING([--with-moc-qt5], [Set location of qt5 moc]),
++              [MOCQT5=$withval]
++  )
+   AC_SUBST(MOCQT5)
+   AC_MSG_RESULT([$MOCQT5])
+ fi
+-- 
+1.9.3
+
diff --git a/meta-oe/recipes-support/poppler/poppler_0.33.0.bb b/meta-oe/recipes-support/poppler/poppler_0.33.0.bb
index 6e8446b872..d5362a0588 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.33.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.33.0.bb
@@ -4,6 +4,7 @@ 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] = "69927d1614d6704021c0b0dd0ee6a852"
 SRC_URI[sha256sum] = "a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6"
@@ -18,7 +19,7 @@ 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,--disable-poppler-qt5,qtbase"
+PACKAGECONFIG[qt5] = "--enable-poppler-qt5 --with-moc-qt5=${STAGING_BINDIR_NATIVE}/qt5/moc,--disable-poppler-qt5,qtbase"
 
 EXTRA_OECONF = "\
     --enable-xpdf-headers \