3 files changed, 30 insertions, 2 deletions
diff --git a/deps/poppler/poppler.SlackBuild b/deps/poppler/poppler.SlackBuild
index 0ad28a4..e36953a 100755
--- a/deps/poppler/poppler.SlackBuild
+++ b/deps/poppler/poppler.SlackBuild
@@ -22,7 +22,7 @@
 
 
 PKGNAM=poppler
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.24.3}
 BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -82,7 +82,7 @@ tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
 # Properly detect Qt5:
-zcat $CWD/poppler.mocversiongrep.patch.gz | patch -p1 --verbose || exit 1
+cat $CWD/poppler.mocversiongrep.patch | patch -p1 --verbose || exit 1
 
 chown -R root:root .
 find . \
diff --git a/deps/poppler/poppler.mocversiongrep.patch b/deps/poppler/poppler.mocversiongrep.patch
new file mode 100644
index 0000000..1343f8f
--- /dev/null
+++ b/deps/poppler/poppler.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;
+
diff --git a/deps/poppler/poppler.mocversiongrep.patch.gz b/deps/poppler/poppler.mocversiongrep.patch.gz
deleted file mode 100644
index c478695..0000000
--- a/deps/poppler/poppler.mocversiongrep.patch.gz
+++ /dev/null