[arch-commits] Commit in poppler/trunk (PKGBUILD poppler-0.24.2-mocversiongrep.patch)

[Andreas Radke]

    Date: Friday, August 22, 2014 @ 17:10:47
  Author: andyrtr
Revision: 220548

drop patch

Modified:
  poppler/trunk/PKGBUILD
Deleted:
  poppler/trunk/poppler-0.24.2-mocversiongrep.patch

-------------------------------------+
 PKGBUILD                            |    4 ----
 poppler-0.24.2-mocversiongrep.patch |   28 ----------------------------
 2 files changed, 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-22 15:09:01 UTC (rev 220547)
+++ PKGBUILD	2014-08-22 15:10:47 UTC (rev 220548)
@@ -18,10 +18,6 @@
 
 prepare() {
   ln -sf test-${_testtag} test
-#  cd ${pkgbase}-${pkgver}
-#  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-#  sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac
-#  autoreconf -fi
 }
 
 build() {

Deleted: poppler-0.24.2-mocversiongrep.patch
===================================================================
--- poppler-0.24.2-mocversiongrep.patch	2014-08-22 15:09:01 UTC (rev 220547)
+++ poppler-0.24.2-mocversiongrep.patch	2014-08-22 15:10:47 UTC (rev 220548)
@@ -1,28 +0,0 @@
-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;
-