Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34e83723cd314fffc39e35c4f8a2b3e7737bf960
commit 34e83723cd314fffc39e35c4f8a2b3e7737bf960
Author: James Buren <r...@frugalware.org>
Date: Tue Sep 13 08:37:54 2011 -0500
poppler-0.16.7-2-i686
* disable qt3 subpkg (absolutely nothing depends on it)
* release bump
diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild
index bfe7e54..69fe126 100644
--- a/source/xlib/poppler/FrugalBuild
+++ b/source/xlib/poppler/FrugalBuild
@@ -3,17 +3,15 @@
if [ "$CARCH" != "arm" ]; then
USE_GTK=${USE_GTK:-"y"}
- USE_QT=${USE_QT:-"y"}
USE_QT4=${USE_QT4:-"y"}
else
USE_GTK=${USE_GTK:-"y"}
- USE_QT=${USE_QT:-"n"}
USE_QT4=${USE_QT4:-"n"}
fi
pkgname=poppler
pkgver=0.16.7
-pkgrel=1
+pkgrel=2
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' 'libxml2>=2.7.8')
@@ -27,6 +25,9 @@
source=(http://poppler.freedesktop.org/$pkgname-$pkgver.tar.gz \
sha1sums=('26c735f863688f62b57d5159863fdad4272be89f' \
'a048348d9a8c6d545714350d3ab66dc7028e4b7f')
options=('scriptlet')
+conflicts=('poppler-qt')
+provides=('poppler-qt')
+replaces=('poppler-qt')
if Fuse $USE_GTK; then
subpkgs=("${subpkgs[@]}" 'poppler-glib')
@@ -44,16 +45,6 @@ subdepends=("${subdepends[@]}" '')
subrodepends=("${subrodepends[@]}" 'poppler')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
-if Fuse $USE_QT; then
- subpkgs=("${subpkgs[@]}" 'poppler-qt')
- subdescs=("${subdescs[@]}" 'Poppler QT bindings')
- subgroups=("${subgroups[@]}" 'xlib-extra')
- subdepends=("${subdepends[@]}" 'qt')
- subrodepends=("${subrodepends[@]}" 'poppler')
- subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
- Fconfopts="${Fconfopts[@]} --enable-poppler-qt"
-fi
-
if Fuse $USE_QT4; then
subpkgs=("${subpkgs[@]}" 'poppler-qt4')
subdescs=("${subdescs[@]}" 'Poppler QT4 bindings')
@@ -81,12 +72,6 @@ build() {
Fsplit poppler-glib usr/lib/pkgconfig/poppler-glib.*
fi
- if Fuse $USE_QT; then
- Fsplit poppler-qt usr/include/poppler/qt3/
- Fsplit poppler-qt usr/lib/libpoppler-qt.*
- Fsplit poppler-qt usr/lib/pkgconfig/poppler-qt.*
- fi
-
if Fuse $USE_QT4; then
Fsplit poppler-qt4 usr/include/poppler/qt4/
Fsplit poppler-qt4 usr/lib/libpoppler-qt4.*
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
