Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1bfc8bafd96f59b75f222a82e839fe0eee97811b
commit 1bfc8bafd96f59b75f222a82e839fe0eee97811b Author: crazy <[email protected]> Date: Mon Feb 29 13:38:52 2016 +0100 poppler-0.41.0-1-x86_64 * Version bump diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild index a01d9f3..ffbcaf4 100644 --- a/source/xlib/poppler/FrugalBuild +++ b/source/xlib/poppler/FrugalBuild @@ -15,8 +15,8 @@ fi ## switch to cmake pkgname=poppler -pkgver=0.40.0 -pkgrel=2 +pkgver=0.41.0 +pkgrel=1 pkgdesc="A PDF rendering library" url="http://poppler.freedesktop.org/"; depends=('fontconfig>=2.11.94-3' 'cairo>=1.14.6-2' 'libjpeg>=9a' 'libpng>=1.6.20' 'openjpeg>=1.5.2' 'libstdc++>=5.3.0-2') @@ -27,7 +27,7 @@ archs=('i686' 'x86_64' 'arm') up2date="Flasttar $url/releases.html" source=(http://poppler.freedesktop.org/$pkgname-$pkgver.tar.xz \ 01-poppler.conf) -sha1sums=('8c3be50ff6cd5174a7c37f4f038a7ef8386e9a5f' \ +sha1sums=('af3a941866095312cf5b51086cff3a2a48bcc816' \ 'a048348d9a8c6d545714350d3ab66dc7028e4b7f') options+=('scriptlet' 'force') conflicts=('poppler-qt') diff --git a/source/xlib/poppler/find-moc-qt5.diff b/source/xlib/poppler/find-moc-qt5.diff deleted file mode 100644 index d1bb5a6..0000000 --- a/source/xlib/poppler/find-moc-qt5.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- poppler-0.24.1/configure.old 2014-08-14 19:44:17.015262710 +0200 -+++ poppler-0.24.1/configure 2014-08-14 19:46:56.487530815 +0200 -@@ -23296,9 +23296,9 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qtchooser" >&5 - $as_echo_n "checking for qtchooser... " >&6; } -- qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` -+ qt5tooldir="/usr/lib/qt5/bin" - mocversion=`$qt5tooldir/moc -v 2>&1` -- mocversiongrep=`echo $mocversion | grep "Qt 5"` -+ mocversiongrep=`echo $mocversion | grep "moc"` - if test x"$mocversiongrep" != x"$mocversion"; then - # no valid moc found - enable_poppler_qt5=no; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
