Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f7bf117dc3778e6ec14d6b15db42c5e80c5649cb
commit f7bf117dc3778e6ec14d6b15db42c5e80c5649cb Author: Melko <[email protected]> Date: Thu Aug 14 20:08:42 2014 +0200 poppler-0.24.1-3-x86_64 * enable qt5 support diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild index fe4c274..31291ed 100644 --- a/source/xlib/poppler/FrugalBuild +++ b/source/xlib/poppler/FrugalBuild @@ -4,27 +4,33 @@ if [ "$CARCH" != "arm" ]; then USE_GTK=${USE_GTK:-"y"} USE_QT4=${USE_QT4:-"y"} + USE_QT5=${USE_QT5:-"y"} else USE_GTK=${USE_GTK:-"y"} USE_QT4=${USE_QT4:-"n"} + USE_QT5=${USE_QT5:-"n"} fi +options+=('asneeded') + pkgname=poppler pkgver=0.24.1 -pkgrel=2 +pkgrel=3 pkgdesc="A PDF rendering library" url="http://poppler.freedesktop.org/"; depends=('libxext' 'fontconfig' 'libstdc++' 'cairo>=1.8.10-2' 'libjpeg>=8a' 'libxrender' 'libpng>=1.4.1' 'lcms>=1.18a-1' 'lcms2' 'libxml2>=2.7.8') -makedepends=('gtk-doc') +makedepends=('gtk-doc' 'libqt5core' 'libqt5test') rodepends=('poppler-data') groups=('xlib') archs=('i686' 'x86_64' 'arm') up2date="Flasttar $url/releases.html" source=(http://poppler.freedesktop.org/$pkgname-$pkgver.tar.xz \ - 01-poppler.conf) + 01-poppler.conf find-moc-qt5.diff) sha1sums=('f805db83a4cf1c2169574a21b43582998bc03011' \ - 'a048348d9a8c6d545714350d3ab66dc7028e4b7f') -options=('scriptlet' 'force') + 'a048348d9a8c6d545714350d3ab66dc7028e4b7f' \ + '573bf38f6c892207b87d314eb97b96bcf801df16') +options+=('scriptlet' 'force') +Finclude cmake conflicts=('poppler-qt') provides=('poppler-qt') replaces=('poppler-qt') @@ -54,6 +60,15 @@ if Fuse $USE_QT4; then subarchs=("${subarchs[@]}" 'i686 x86_64 arm') fi +if Fuse $USE_QT5; then + subpkgs=("${subpkgs[@]}" 'poppler-qt5') + subdescs=("${subdescs[@]}" 'Poppler QT5 bindings') + subgroups=("${subgroups[@]}" 'xlib') + subdepends=("${subdepends[@]}" 'libqt5widgets libqt5xml') + subrodepends=("${subrodepends[@]}" 'poppler') + subarchs=("${subarchs[@]}" 'i686 x86_64 arm') +fi + build() { Fbuild \ --enable-gtk-doc \ @@ -77,6 +92,13 @@ build() { Fsplit poppler-qt4 usr/lib/libpoppler-qt4.* Fsplit poppler-qt4 usr/lib/pkgconfig/poppler-qt4.* fi + + if Fuse $USE_QT5; then + Fsplit poppler-qt5 usr/include/poppler/qt5/ + Fsplit poppler-qt5 usr/lib/libpoppler-qt5.* + Fsplit poppler-qt5 usr/lib/pkgconfig/poppler-qt5.* + fi + Frm usr/bin Frm usr/share/man } diff --git a/source/xlib/poppler/find-moc-qt5.diff b/source/xlib/poppler/find-moc-qt5.diff new file mode 100644 index 0000000..d1bb5a6 --- /dev/null +++ b/source/xlib/poppler/find-moc-qt5.diff @@ -0,0 +1,14 @@ +--- 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
