From 360fe7d12039a1dea85850d870d70627b606fad8 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Fri, 25 Mar 2016 02:44:22 +0700 Subject: libraries/poppler-qt5: Updated for version 0.42.0. Signed-off-by: Willy Sudiarto Raharjo --- .../poppler-0.24.2-mocversiongrep.patch | 27 ---------------------- libraries/poppler-qt5/poppler-qt5.SlackBuild | 7 ++---- libraries/poppler-qt5/poppler-qt5.info | 8 +++---- libraries/poppler-qt5/slack-desc | 2 +- 4 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 libraries/poppler-qt5/poppler-0.24.2-mocversiongrep.patch diff --git a/libraries/poppler-qt5/poppler-0.24.2-mocversiongrep.patch b/libraries/poppler-qt5/poppler-0.24.2-mocversiongrep.patch deleted file mode 100644 index 8325e3d029..0000000000 --- a/libraries/poppler-qt5/poppler-0.24.2-mocversiongrep.patch +++ /dev/null @@ -1,27 +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; diff --git a/libraries/poppler-qt5/poppler-qt5.SlackBuild b/libraries/poppler-qt5/poppler-qt5.SlackBuild index 640e1db459..eb2b9f691f 100644 --- a/libraries/poppler-qt5/poppler-qt5.SlackBuild +++ b/libraries/poppler-qt5/poppler-qt5.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=poppler-qt5 -VERSION=${VERSION:-0.24.3} +VERSION=${VERSION:-0.42.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -67,10 +67,7 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -patch -p1 < $CWD/poppler-0.24.2-mocversiongrep.patch -autoreconf -if + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/poppler-qt5/poppler-qt5.info b/libraries/poppler-qt5/poppler-qt5.info index dac864f5c3..48a7e22797 100644 --- a/libraries/poppler-qt5/poppler-qt5.info +++ b/libraries/poppler-qt5/poppler-qt5.info @@ -1,8 +1,8 @@ PRGNAM="poppler-qt5" -VERSION="0.24.3" -HOMEPAGE="http://poppler.freedesktop.org/" -DOWNLOAD="http://poppler.freedesktop.org/poppler-0.24.3.tar.xz" -MD5SUM="31299f26a998029c85295dbbf4c30beb" +VERSION="0.42.0" +HOMEPAGE="https://poppler.freedesktop.org/" +DOWNLOAD="https://poppler.freedesktop.org/poppler-0.42.0.tar.xz" +MD5SUM="c63efcde7d52b4135bb7463b04790862" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" diff --git a/libraries/poppler-qt5/slack-desc b/libraries/poppler-qt5/slack-desc index 23ef49d874..36dc7add70 100644 --- a/libraries/poppler-qt5/slack-desc +++ b/libraries/poppler-qt5/slack-desc @@ -14,6 +14,6 @@ poppler-qt5: library, whenever a flaw was found potentially dozens of applicatio poppler-qt5: incorporating code from xpdf would have to be patched. By providing poppler-qt5: a centralized PDF library this duplicated effort will be eliminated. poppler-qt5: -poppler-qt5: Homepage: http://poppler.freedesktop.org/ +poppler-qt5: Homepage: https://poppler.freedesktop.org/ poppler-qt5: poppler-qt5: -- cgit v1.2.3