diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-04 03:38:30 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-04 03:38:30 +0000 |
| commit | 94ed6c971085d22c2a544227879b672266b4af90 (patch) | |
| tree | f9f6c023aeaccc8d869a160ee9a2e5f4890566e4 /extra/poppler/poppler-0.24.2-mocversiongrep.patch | |
| parent | f72cb0ced39aca827b5269eba5455dbf846410e2 (diff) | |
Sat Jan 4 03:36:23 UTC 2014
Diffstat (limited to 'extra/poppler/poppler-0.24.2-mocversiongrep.patch')
| -rw-r--r-- | extra/poppler/poppler-0.24.2-mocversiongrep.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/extra/poppler/poppler-0.24.2-mocversiongrep.patch b/extra/poppler/poppler-0.24.2-mocversiongrep.patch new file mode 100644 index 000000000..1343f8f9c --- /dev/null +++ b/extra/poppler/poppler-0.24.2-mocversiongrep.patch @@ -0,0 +1,28 @@ +diff -up poppler-0.24.2/configure.ac.mocversiongrep poppler-0.24.2/configure.ac +--- poppler-0.24.2/configure.ac.mocversiongrep 2013-10-18 09:51:24.223114884 -0500 ++++ poppler-0.24.2/configure.ac 2013-10-18 09:54:33.408681067 -0500 +@@ -661,20 +661,20 @@ if test x$enable_poppler_qt5 = xyes; the + AC_CHECK_TOOL(MOCQT5, moc) + AC_MSG_CHECKING([for Qt5 moc]) + mocversion=`$MOCQT5 -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5"` ++ mocversiongrep=`echo $mocversion | grep " 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"` ++ mocversiongrep=`echo $mocversion | grep " 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"` ++ mocversiongrep=`echo $mocversion | grep " 5\."` + if test x"$mocversiongrep" != x"$mocversion"; then + # no valid moc found + enable_poppler_qt5=no; + |