diff options
Diffstat (limited to 'meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch')
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch | 14 |
1 files changed, 7 insertions, 7 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 index 560b07323..4e80d240f 100644 --- 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 | |||
@@ -14,10 +14,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | |||
14 | 1 file changed, 8 insertions(+), 47 deletions(-) | 14 | 1 file changed, 8 insertions(+), 47 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index 67599c0..40fa596 100644 | 17 | index c4cfc2c..8e961c7 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -622,25 +622,10 @@ AC_SUBST(POPPLER_QT4_LIBS) | 20 | @@ -712,25 +712,10 @@ AC_SUBST(POPPLER_QT4_LIBS) |
21 | AC_SUBST(POPPLER_QT4_TEST_LIBS) | 21 | AC_SUBST(POPPLER_QT4_TEST_LIBS) |
22 | 22 | ||
23 | if test x$enable_poppler_qt4 = xyes; then | 23 | if test x$enable_poppler_qt4 = xyes; then |
@@ -47,27 +47,27 @@ index 67599c0..40fa596 100644 | |||
47 | AC_SUBST(MOCQT4) | 47 | AC_SUBST(MOCQT4) |
48 | AC_MSG_RESULT([$MOCQT4]) | 48 | AC_MSG_RESULT([$MOCQT4]) |
49 | fi | 49 | fi |
50 | @@ -679,34 +664,10 @@ AC_SUBST(POPPLER_QT5_LIBS) | 50 | @@ -769,34 +754,10 @@ AC_SUBST(POPPLER_QT5_LIBS) |
51 | AC_SUBST(POPPLER_QT5_TEST_LIBS) | 51 | AC_SUBST(POPPLER_QT5_TEST_LIBS) |
52 | 52 | ||
53 | if test x$enable_poppler_qt5 = xyes; then | 53 | if test x$enable_poppler_qt5 = xyes; then |
54 | - AC_CHECK_TOOL(MOCQT5, moc) | 54 | - AC_CHECK_TOOL(MOCQT5, moc) |
55 | - AC_MSG_CHECKING([for Qt5 moc]) | 55 | - AC_MSG_CHECKING([for Qt5 moc]) |
56 | - mocversion=`$MOCQT5 -v 2>&1` | 56 | - mocversion=`$MOCQT5 -v 2>&1` |
57 | - mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` | 57 | - mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` |
58 | - if test x"$mocversiongrep" != x"$mocversion"; then | 58 | - if test x"$mocversiongrep" != x"$mocversion"; then |
59 | - AC_MSG_RESULT([no]) | 59 | - AC_MSG_RESULT([no]) |
60 | - # moc was not the qt5 one, try with moc-qt5 | 60 | - # moc was not the qt5 one, try with moc-qt5 |
61 | - AC_CHECK_TOOL(MOCQT52, moc-qt5) | 61 | - AC_CHECK_TOOL(MOCQT52, moc-qt5) |
62 | - AC_MSG_CHECKING([for Qt5 moc-qt5]) | 62 | - AC_MSG_CHECKING([for Qt5 moc-qt5]) |
63 | - mocversion=`$MOCQT52 -v 2>&1` | 63 | - mocversion=`$MOCQT52 -v 2>&1` |
64 | - mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"` | 64 | - mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"` |
65 | - if test x"$mocversiongrep" != x"$mocversion"; then | 65 | - if test x"$mocversiongrep" != x"$mocversion"; then |
66 | - AC_CHECK_TOOL(QTCHOOSER, qtchooser) | 66 | - AC_CHECK_TOOL(QTCHOOSER, qtchooser) |
67 | - AC_MSG_CHECKING([for qtchooser]) | 67 | - AC_MSG_CHECKING([for qtchooser]) |
68 | - qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` | 68 | - qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` |
69 | - mocversion=`$qt5tooldir/moc -v 2>&1` | 69 | - mocversion=`$qt5tooldir/moc -v 2>&1` |
70 | - mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` | 70 | - mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` |
71 | - if test x"$mocversiongrep" != x"$mocversion"; then | 71 | - if test x"$mocversiongrep" != x"$mocversion"; then |
72 | - # no valid moc found | 72 | - # no valid moc found |
73 | - enable_poppler_qt5=no; | 73 | - enable_poppler_qt5=no; |
@@ -87,5 +87,5 @@ index 67599c0..40fa596 100644 | |||
87 | AC_MSG_RESULT([$MOCQT5]) | 87 | AC_MSG_RESULT([$MOCQT5]) |
88 | fi | 88 | fi |
89 | -- | 89 | -- |
90 | 1.9.3 | 90 | 2.5.5 |
91 | 91 | ||