[Frugalware-git] kdetesting: qt4-4.6.0-2-i686

Michel Hermier hermier at frugalware.org
Mon Jan 4 22:50:57 CET 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=e8a7c717beaad338b199a7cadbc9bd0e7b88ba27

commit e8a7c717beaad338b199a7cadbc9bd0e7b88ba27
Author: Michel Hermier <hermier at frugalware.org>
Date:   Mon Jan 4 22:49:35 2010 +0100

qt4-4.6.0-2-i686

* pkgrel++ to fix some library dependecies.

diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild
index 4683b57..fd46a59 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -1,10 +1,12 @@
# Compiling Time: 40.04 SBU
# Maintainer: crazy <crazy at frugalware.org>

+USE_DEMOS=${USE_DEMOS:-"n"}
+
pkgname=qt4
_F_archive_name=qt-everywhere-opensource-src
pkgver=4.6.0
-pkgrel=1
+pkgrel=2
## Dummy package is empty ..
pkgdesc="The QT4 GUI toolkit."
url="http://qt.nokia.com/products/"
@@ -90,7 +92,7 @@ subprovides=("${subprovides[@]}" '')

subpkgs=("${subpkgs[@]}" "libqtcore")
subdescs=("${subdescs[@]}" 'Qt4 Core Library')
-subdepends=("${subdepends[@]}" "glib2 libgcc libstdc++ zlib")
+subdepends=("${subdepends[@]}" "glib2 libstdc++ zlib")
subrodepends=("${subrodepends[@]}" "")
subgroups=("${subgroups[@]}" 'lib-extra qt4-libs')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -252,7 +254,7 @@ subprovides=("${subprovides[@]}" '')
subpkgs=("${subpkgs[@]}" "libqtxmlpatterns")
subdescs=("${subdescs[@]}" 'Qt4 XmlPatterns Library')
subdepends=("${subdepends[@]}" "")
-subrodepends=("${subrodepends[@]}" "libqtcore=$pkgver")
+subrodepends=("${subrodepends[@]}" "libqtnetwork=$pkgver")
subgroups=("${subgroups[@]}" 'lib-extra qt4-libs')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subconflicts=("${subconflicts[@]}" '')
@@ -272,7 +274,7 @@ subprovides=("${subprovides[@]}" '')
subpkgs=("${subpkgs[@]}" "libqtwebkit")
subdescs=("${subdescs[@]}" 'Qt4 WebKit Library')
subdepends=("${subdepends[@]}" "sqlite3 libx11 e2fsprogs")
-subrodepends=("${subrodepends[@]}" "libqtphonon=$pkgver libqtxml=$pkgver libqtnetwork=$pkgver")
+subrodepends=("${subrodepends[@]}" "libqtphonon=$pkgver libqtxmlpatterns=$pkgver")
subgroups=("${subgroups[@]}" 'xlib-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subconflicts=("${subconflicts[@]}" '')
@@ -299,6 +301,8 @@ subconflicts=("${subconflicts[@]}" '')
subreplaces=("${subreplaces[@]}" '')
subprovides=("${subprovides[@]}" '')

+if Fuse $USE_DEMOS; then
+Fconfopts="$Fconfopts -demosdir /usr/share/doc/$pkgname/demos -examplesdir /usr/share/doc/$pkgname/examples"
subpkgs=("${subpkgs[@]}" "$pkgname-demos")
subdescs=("${subdescs[@]}" 'Qt4 Demo and Example Programs.')
subdepends=("${subdepends[@]}" "fontconfig libxdamage")
@@ -308,6 +312,9 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subconflicts=("${subconflicts[@]}" '')
subreplaces=("${subreplaces[@]}" '')
subprovides=("${subprovides[@]}" '')
+else
+Fconfopts="$Fconfopts -nomake demos -nomake examples"
+fi

subpkgs=("${subpkgs[@]}" "$pkgname-designer")
subdescs=("${subdescs[@]}" 'Qt4 Interface Designer')
@@ -509,9 +516,7 @@ build()
-v -confirm-license -opensource \
-prefix /usr \
-datadir /usr/share/$pkgname \
-		-demosdir /usr/share/doc/$pkgname/demos \
-docdir /usr/share/doc/$pkgname \
-		-examplesdir /usr/share/doc/$pkgname/examples \
-libdir /usr/lib \
-plugindir /usr/lib/$pkgname/plugins \
-sysconfdir /etc/$pkgname \
@@ -624,10 +629,12 @@ build()
Fsplit $pkgname-assistant-compat /usr/share/applications/assistant4-compat.desktop
#	Fsplit $pkgname-assistant-compat /usr/share/pixmaps/assistant-compat.png

+	if Fuse $USE_DEMOS; then
Fsplit $pkgname-demos /usr/bin/qtdemo
Fsplit $pkgname-demos /usr/lib/$pkgname/plugins/designer/{libarthurplugin,libcontainerextension,libcustomwidgetplugin,libtaskmenuextension,libworldtimeclockplugin}.so
Fsplit $pkgname-demos /usr/share/applications/qtdemo.desktop
Fsplit $pkgname-demos /usr/share/doc/$pkgname/examples
+	fi

#	Fmkdir usr/share/applications usr/share/pixmaps
#	cp -a examples/widgets/icons/images/designer.png $Fdestdir/usr/share/pixmaps/ || Fdie


More information about the Frugalware-git mailing list