Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=46b2f6559dd41e31690dfcbd70550e67f40dd3d7

commit 46b2f6559dd41e31690dfcbd70550e67f40dd3d7
Author: Michel Hermier <herm...@frugalware.org>
Date:   Wed Apr 21 01:10:40 2010 +0200

qt4-4.6.2-2-i686

* Rebuild with new libs.
* Remove some duplicates packages requirements.

diff --git a/source/xlib-extra/qt4/FrugalBuild 
b/source/xlib-extra/qt4/FrugalBuild
index fa3e6ac..478dcb3 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -10,10 +10,10 @@ pkgrel=2
pkgdesc="The QT4 GUI toolkit."
url="http://qt.nokia.com/products/";
depends=()
-makedepends=('libxft' 'libjpeg' 'libxcursor' \
-       'libsm' 'libpng' 'libxtst' 'fontconfig' 'cups' 'bison' \
+makedepends=('libxft' 'libxcursor' \
+       'libxtst' 'cups>=1.3.11-4' 'bison' \
'flex' 'imake' 'openssl' 'linuxwacom' \
-       'libxdamage' 'alsa-lib' 'gtk+2')
+       'libxdamage' 'alsa-lib' 'gtk+2>=2.10.0-2')
groups=('xlib-extra')
archs=('i686' 'x86_64' 'ppc')
options=('scriptlet' 'nodocs')
@@ -134,7 +134,7 @@ subprovides=("${subprovid...@]}" 'libqtdesignercomponents')

subpkgs=("${subpk...@]}" "libqtgui")
subdescs=("${subdes...@]}" 'Qt4 Gui Library')
-subdepends=("${subdepen...@]}" "libpng libmng libsm fontconfig libxcursor 
libxrandr libxi libxinerama libxt")
+subdepends=("${subdepen...@]}" "libjpeg>=8a libpng>=1.4.1 libmng>=1.0.10-2 
libtiff libsm fontconfig libxcursor libxrandr libxi libxinerama libxt")
subrodepends=("${subrodepen...@]}" "$LIBQTCOREDEP $LIBQTSVGDEP")
subgroups=("${subgrou...@]}" 'xlib qt4-libs')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
@@ -265,7 +265,7 @@ subprovides=("${subprovid...@]}" '')

subpkgs=("${subpk...@]}" "libqtwebkit")
subdescs=("${subdes...@]}" 'Qt4 WebKit Library')
-subdepends=("${subdepen...@]}" "sqlite3 libx11 util-linux-ng")
+subdepends=("${subdepen...@]}" "sqlite3 util-linux-ng")
subrodepends=("${subrodepen...@]}" "$LIBQTXMLPATTERNSDEP $LIBQTPHONONDEP")
subgroups=("${subgrou...@]}" 'xlib qt4-libs')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
@@ -275,7 +275,7 @@ subprovides=("${subprovid...@]}" '')

subpkgs=("${subpk...@]}" "$pkgname-assistant")
subdescs=("${subdes...@]}" 'Qt4 Document Browser')
-subdepends=("${subdepen...@]}" "libx11 glib2 libstdc++")
+subdepends=("${subdepen...@]}" "")
subrodepends=("${subrodepen...@]}" "$LIBQTHELPDEP $LIBQTNETWORKDEP")
subgroups=("${subgrou...@]}" 'xapps-extra')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
@@ -297,7 +297,7 @@ if Fuse $USE_DEMOS; then
Fconfopts="$Fconfopts -demosdir /usr/share/doc/$pkgname/demos -examplesdir 
/usr/share/doc/$pkgname/examples"
subpkgs=("${subpk...@]}" "$pkgname-demos")
subdescs=("${subdes...@]}" 'Qt4 Demo and Example Programs.')
-subdepends=("${subdepen...@]}" "fontconfig libxdamage")
+subdepends=("${subdepen...@]}" "libxdamage")
subrodepends=("${subrodepen...@]}" "$LIBQTASSISTANTCLIENTDEP $LIBQTDESIGNERDEP 
$LIBQTDBUSDEP $LIBQTHELPDEP $LIBQTOPENGLDEP $LIBQTSCRIPTDEP $LIBQTUITOOLSDEP 
$LIBQT3SUPPORTDEP $LIBQTSVGDEP $LIBQTTESTDEP $LIBQTWEBKITDEP")
subgroups=("${subgrou...@]}" 'xapps-extra')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
@@ -310,7 +310,7 @@ fi

subpkgs=("${subpk...@]}" "$pkgname-designer")
subdescs=("${subdes...@]}" 'Qt4 Interface Designer')
-subdepends=("${subdepen...@]}" "libpng libsm fontconfig")
+subdepends=("${subdepen...@]}" "")
subrodepends=("${subrodepen...@]}" "$LIBQT3SUPPORTDEP $LIBQTDESIGNERDEP 
$LIBQTSCRIPTDEP $LIBQTWEBKITDEP")
subgroups=("${subgrou...@]}" 'xapps')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
@@ -407,8 +407,8 @@ subprovides=("${subprovid...@]}" '')

subpkgs=("${subpk...@]}" "$pkgname-tools")
subdescs=("${subdes...@]}" 'Qt4 Tools')
-subdepends=("${subdepen...@]}" "glib2 libstdc++  libpng libxrandr libxinerama 
fontconfig util-linux-ng")
-subrodepends=("${subrodepen...@]}" "$LIBQT3SUPPORTDEP ")
+subdepends=("${subdepen...@]}" "util-linux-ng")
+subrodepends=("${subrodepen...@]}" "$LIBQT3SUPPORTDEP")
subgroups=("${subgrou...@]}" 'xapps-extra')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
subconflicts=("${subconflic...@]}" '')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to