Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=450d7ee2a2bb8e86e330bd57edc3596ab2990200
commit 450d7ee2a2bb8e86e330bd57edc3596ab2990200 Author: crazy <[email protected]> Date: Tue Jan 5 14:30:58 2016 +0100 poppler-0.39.0-1-x86_64 * Version bump * depends() / subdepends() / makedepends() fixes * QT4/QT5 is disabled for now untill we get there * renamed USE_GTK to USE_GLIB since is glib an not gtk the gtk+2/3 depend here is wrong since is only used to build a test app we don't even install * added TODO diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild index c381c8b..eb3f4c7 100644 --- a/source/xlib/poppler/FrugalBuild +++ b/source/xlib/poppler/FrugalBuild @@ -1,43 +1,48 @@ # Compiling time: 0.89 SBU # Maintainer: crazy <[email protected]> -if [ "$CARCH" != "arm" ]; then - USE_GTK=${USE_GTK:-"y"} - USE_QT4=${USE_QT4:-"y"} - USE_QT5=${USE_QT5:-"y"} +if [[ "$CARCH" != "arm" ]]; then + USE_GLIB=${USE_GLIB:-"y"} + USE_QT4=${USE_QT4:-"n"} + USE_QT5=${USE_QT5:-"n"} else - USE_GTK=${USE_GTK:-"y"} + USE_GLIB=${USE_GLIB:-"y"} USE_QT4=${USE_QT4:-"n"} USE_QT5=${USE_QT5:-"n"} fi +## TODO: figure curl +## switch to cmake + pkgname=poppler -pkgver=0.32.0 -pkgrel=3 +pkgver=0.39.0 +pkgrel=1 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' 'openjpeg') -makedepends=('gtk-doc' 'x11-protos') +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') +makedepends=('x11-protos' 'gobject-introspection') 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) -sha1sums=('1b8d45b88d3ea4e86505a03e576736757142b5f5' \ +sha1sums=('5cb511429eeef484f64ffe7e608f594c689bc334' \ 'a048348d9a8c6d545714350d3ab66dc7028e4b7f') options+=('scriptlet' 'force') -Finclude cmake conflicts=('poppler-qt') provides=('poppler-qt') replaces=('poppler-qt') -if Fuse $USE_GTK; then +if Fuse $USE_GLIB; then + ## builds gtk-test and demo app we don't even install it + ## than need gtk+3 + Fconfopts+=" --disable-gtk-test" subpkgs=("${subpkgs[@]}" 'poppler-glib') - subdescs=("${subdescs[@]}" 'Poppler glib/GTK+ bindings') + subdescs=("${subdescs[@]}" 'Poppler glib bindings') subgroups=("${subgroups[@]}" 'xlib') - subdepends=("${subdepends[@]}" 'pango gtk+2>=2.20.0-2') - subrodepends=("${subrodepends[@]}" 'poppler') + subdepends=("${subdepends[@]}" 'cairo>=1.14.6-2 libffi>=3.2.1 libpng>=1.6.20 libstdc++>=5.3.0-2') + subrodepends=("${subrodepends[@]}" "poppler>=$pkgver") subarchs=("${subarchs[@]}" 'i686 x86_64 arm') subreplaces=("${subreplaces[@]}" '') subprovides=("${subprovides[@]}" '') @@ -46,7 +51,7 @@ fi subpkgs=("${subpkgs[@]}" 'poppler-pdftools') subdescs=("${subdescs[@]}" 'Poppler xpdf tools') subgroups=("${subgroups[@]}" 'xapps') -subdepends=("${subdepends[@]}" '') +subdepends=("${subdepends[@]}" 'lcms2>=2.7-3 cairo>=1.14.6-2 libffi>=3.2.1 libpng>=1.6.20 libstdc++>=5.3.0-2') subrodepends=("${subrodepends[@]}" 'poppler') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') subreplaces=("${subreplaces[@]}" 'xpdf') @@ -77,9 +82,10 @@ fi build() { Fbuild \ - --enable-gtk-doc \ + --disable-gtk-doc \ --enable-xpdf-headers \ - --enable-zlib + --enable-zlib \ + --enable-build-type=release Ffile 01-poppler.conf /etc/fonts/conf.avail/01-poppler.conf Fln /etc/fonts/conf.avail/01-poppler.conf /etc/fonts/conf.d/01-poppler.conf @@ -87,7 +93,7 @@ build() { Fsplit poppler-pdftools usr/bin/* Fsplit poppler-pdftools usr/share/man/man1/* - if Fuse $USE_GTK; then + if Fuse $USE_GLIB; then Fsplit poppler-glib usr/include/poppler/glib/ Fsplit poppler-glib usr/lib/libpoppler-glib* Fsplit poppler-glib usr/lib/pkgconfig/poppler-glib.* _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
