Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=9d3f890291e5d907aa90e330147228da0f66f6aa

commit 9d3f890291e5d907aa90e330147228da0f66f6aa
Author: Michel Hermier <herm...@frugalware.org>
Date:   Thu Aug 4 19:14:54 2011 +0200

kdelibs-4.7.0-1-i686

* Use kde-version.sh.
* Introduce and use LIBQT*DEP variables.

diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index 96ee222..30891f4 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -14,10 +14,10 @@ depends=()
makedepends=("${makedepends[@]}" "krb5" "libqttest>=$_F_kde_qtver" \
"shared-desktop-ontologies>=0.5" \
"libqtdeclarative>=$_F_kde_qtver")
-source=($source \
+source=("${source[@]}" \
frugalware-menu.patch \
kde-applications-menu.patch)
-sha1sums=('2a7a59ac78a161c7c2393db89179449b495dd2db' \
+sha1sums=("${sha1sums[@]}" \
'c657c474875c155197dde1c846f1791e744febc2' \
'86ee8c8660f19de8141ac99cd6943964d97a1ed7')

@@ -43,7 +43,25 @@ THREADWDEP="libthreadweaver>=$_F_kde_ver"
PHONONDEP="phonon>=4.4.0-2"
POLKIT_QT_1DEP="polkit-qt-1>=0.99.0"

-Qt4="$_F_kde_qtver"
+LIBQT3SUPPORTDEP="libqt3support>=$_F_kde_qtver"
+LIBQTCLUCENEDEP="libqtclucene>=$_F_kde_qtver"
+LIBQTCOREDEP="libqtcore>=$_F_kde_qtver"
+LIBQTDBUSDEP="libqtdbus>=$_F_kde_qtver"
+LIBQTDECLARATIVE="libqtdeclarative>=$_F_kde_qtver"
+LIBQTDESIGNERDEP="libqtdesigner>=$_F_kde_qtver"
+LIBQTGUIDEP="libqtgui>=$_F_kde_qtver"
+LIBQTHELPDEP="libqthelp>=$_F_kde_qtver"
+LIBQTOPENGLDEP="libqtopengl>=$_F_kde_qtver"
+LIBQTPHONONDEP="phonon" # No version check here for regular phonon package
+LIBQTNETWORKDEP="libqtnetwork>=$_F_kde_qtver"
+LIBQTSCRIPTDEP="libqtscript>=$_F_kde_qtver"
+LIBQTSQLDEP="libqtsql>=$_F_kde_qtver"
+LIBQTSVGDEP="libqtsvg>=$_F_kde_qtver"
+LIBQTTESTDEP="libqttest>=$_F_kde_qtver"
+LIBQTUITOOLSDEP="libqtuitools>=$_F_kde_qtver"
+LIBQTWEBKITDEP="libqtwebkit>=$_F_kde_qtver"
+LIBQTXMLDEP="libqtxml>=$_F_kde_qtver"
+LIBQTXMLPATTERNSDEP="libqtxmlpatterns>=$_F_kde_qtver"

##################################
## auto-split magic starts here ##
@@ -52,7 +70,7 @@ Qt4="$_F_kde_qtver"

subpkgs=("${subpkgs[@]}" "libkde3support")
subdescs=("${subdescs[@]}" "Libraries to support KDE3 code.")
-subdepends=("${subdepends[@]}" "libqtcore>=$Qt4 libqtdbus>=$Qt4 
libqt3support>=$Qt4 libqtsvg>=$Qt4
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQT3SUPPORTDEP $LIBQTSVGDEP
$POLKIT_QT_1DEP gamin xfsprogs-attr libsm libxcursor libpng fontconfig libxi")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP $KDESUDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
@@ -60,7 +78,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libplasma")
subdescs=("${subdescs[@]}" "Framework for the KDE desktop shell and its 
widgets.")
-subdepends=("${subdepends[@]}" "libqtuitools>=$Qt4 libqtwebkit>=$Qt4 
libqtopengl>=$Qt4
+subdepends=("${subdepends[@]}" "$LIBQTUITOOLSDEP $LIBQTWEBKITDEP 
$LIBQTOPENGLDEP
qca gamin xfsprogs-attr libqtdbus libxcb libxdamage $POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP $KNEWDEP $THREADWDEP $DNSSDDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
@@ -68,14 +86,14 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libnepomuk")
subdescs=("${subdescs[@]}" "Semantic information retrieval and tagging.")
-subdepends=("${subdepends[@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 soprano>=2.5.3 
bzip2 $POLKIT_QT_1DEP libxext shared-desktop-ontologies")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP soprano>=2.5.3 
bzip2 $POLKIT_QT_1DEP libxext shared-desktop-ontologies")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libdnssd")
subdescs=("${subdescs[@]}" "Interface to support the DNS-SD (Zeroconf) 
protocol.")
-subdepends=("${subdepends[@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 bzip2 libxext 
$POLKIT_QT_1DEP avahi")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP bzip2 libxext 
$POLKIT_QT_1DEP avahi")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -89,7 +107,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libkross")
subdescs=("${subdescs[@]}" "Scripting Libraries.")
-subdepends=("${subdepends[@]}" "libqtcore>=$Qt4 libqtsvg>=$Qt4 libqtdbus>=$Qt4 
libqtdesigner>=$Qt4
+subdepends=("${subdepends[@]}" "$LIBQTSVGDEP $LIBQTDBUSDEP $LIBQTDESIGNERDEP
gamin xfsprogs-attr libpng fontconfig libxi $POLKIT_QT_1DEP libsm libxcursor")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP $KFILEDEP 
libkjsembed>=$_F_kde_ver")
subgroups=("${subgroups[@]}" 'kde kde-core')
@@ -97,35 +115,35 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libkdewebkit")
subdescs=("${subdescs[@]}" "KDE WebKit Library")
-subdepends=("${subdepends[@]}" "libqtwebkit>=$Qt4 libqtgui>=$Qt4 
libqtdbus>=$Qt4 gamin xfsprogs-attr bzip2 libxext libxcb $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTWEBKITDEP $LIBQTGUIDEP $LIBQTDBUSDEP 
gamin xfsprogs-attr bzip2 libxext libxcb $POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libkhtml")
subdescs=("${subdescs[@]}" "HTML rendering widget designed for Konqueror.")
-subdepends=("${subdepends[@]}" "libqtgui>=$Qt4 libqtdbus>=$Qt4 libjpeg>=8a 
libgif pcre libxcb gamin xfsprogs-attr libxext bzip2 $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP libjpeg>=8a libgif 
pcre libxcb gamin xfsprogs-attr libxext bzip2 $POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP 
kdelibs-interfaces>=$_F_kde_ver")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libkfile")
subdescs=("${subdescs[@]}" "File management widgets and dialogs libraries.")
-subdepends=("${subdepends[@]}" "libqtgui>=$Qt4 libqtdbus>=$Qt4 gamin 
xfsprogs-attr bzip2 libxext $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP gamin xfsprogs-attr 
bzip2 libxext $POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libknewstuff")
subdescs=("${subdescs[@]}" "Allows applications to easily download data from 
the Internet.")
-subdepends=("${subdepends[@]}" "libqtgui>=$Qt4 libqtdbus>=$Qt4 gamin 
xfsprogs-attr bzip2 libxext $POLKIT_QT_1DEP attica>=0.1.2")
+subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP gamin xfsprogs-attr 
bzip2 libxext $POLKIT_QT_1DEP attica>=0.1.2")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libkdewidgets")
subdescs=("${subdescs[@]}" "KDE custom widgets for Qt Designer.")
-subdepends=("${subdepends[@]}" "libqtgui>=$Qt4 libqtnetwork>=$Qt4 
libqtdbus>=$Qt4 libqtsql>=$Qt4
+subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTNETWORKDEP $LIBQTDBUSDEP 
$LIBQTSQLDEP
libstdc++ zlib strigi>=0.7.2 xfsprogs-acl libxrender libice libxext 
$POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP $KDESUDEP $KDE3SUPPORTDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
@@ -133,35 +151,35 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libkjsembed")
subdescs=("${subdescs[@]}" "ECMAScript bindings libraries.")
-subdepends=("${subdepends[@]}" "libqtuitools>=$Qt4 libqtdbus>=$Qt4 bzip2 
libx11 $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTUITOOLSDEP $LIBQTDBUSDEP bzip2 libx11 
$POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libkutils")
subdescs=("${subdescs[@]}" "Utility library for printing, chatting and more.")
-subdepends=("${subdepends[@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 libxscrnsaver 
gamin xfsprogs-attr bzip2 $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP libxscrnsaver gamin 
xfsprogs-attr bzip2 $POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libthreadweaver")
subdescs=("${subdescs[@]}" "Job-based threading library.")
-subdepends=("${subdepends[@]}" "libqtcore>=$Qt4 libgcc")
+subdepends=("${subdepends[@]}" "$LIBQTCOREDEP libgcc")
subrodepends=("${subrodepends[@]}" "")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libkimgio")
subdescs=("${subdescs[@]}" "Gimgio class extension libraries.")
-subdepends=("${subdepends[@]}" "libqtgui>=$Qt4 libqtdbus>=$Qt4 jasper libxext 
bzip2 $POLKIT_QT_1DEP openexr>=1.6.1")
+subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP jasper libxext 
bzip2 $POLKIT_QT_1DEP openexr>=1.6.1")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libkunitconversion")
subdescs=("${subdescs[@]}" "KDE Unit conversation library.")
-subdepends=("${subdepends[@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 bzip2 libxext 
$POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP bzip2 libxext 
$POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -174,7 +192,7 @@ _F_kde_subpkgs=("${subpkgs[@]}")

subpkgs=("${subpkgs[@]}" "ksgmltools2")
subdescs=("${subdescs[@]}" "KDE doc tools.")
-subdepends=("${subdepends[@]}" "libqtgui>=$Qt4 libqtdbus>=$Qt4 docbook-xsl 
libxslt bzip2 gamin xfsprogs-attr libxext $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP docbook-xsl libxslt 
bzip2 gamin xfsprogs-attr libxext $POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -190,7 +208,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
## this need kpty
subpkgs=("${subpkgs[@]}" "libkdesu")
subdescs=("${subdescs[@]}" "Library for password entering and handling.")
-subdepends=("${subdepends[@]}" "libqtcore>=$Qt4 libqtdbus>=$Qt4 bzip2 
$POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP bzip2 $POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -209,7 +227,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "libkdecore")
subdescs=("${subdescs[@]}" "KDE4 Core Library.")
-subdepends=("${subdepends[@]}" "libqtnetwork>=$Qt4 pcre xz $POLKIT_QT_1DEP \
+subdepends=("${subdepends[@]}" "$LIBQTNETWORKDEP pcre xz $POLKIT_QT_1DEP \
libdbusmenu-qt>=0.7.0 libgcc strigi>=0.7.2-2 xfsprogs-acl libxrender libice \
libxtst libxfixes libuuid libkrb5 shared-mime-info udev udisks upower")
subrodepends=("${subrodepends[@]}" "")
@@ -242,21 +260,21 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "sonnet-plugin-hspell")
subdescs=("${subdescs[@]}" "Natural language processing for hspell")
-subdepends=("${subdepends[@]}" "libqtcore>=$Qt4 libqtdbus>=$Qt4 bzip2 
$POLKIT_QT_1DEP hspell")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP bzip2 $POLKIT_QT_1DEP hspell")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "sonnet-plugin-aspell")
subdescs=("${subdescs[@]}" "Natural language processing for aspell")
-subdepends=("${subdepends[@]}" "libqtcore>=$Qt4 libqtdbus>=$Qt4 aspell bzip2 
$POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP aspell bzip2 $POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')

subpkgs=("${subpkgs[@]}" "sonnet-plugin-enchant")
subdescs=("${subdescs[@]}" "Natural language processing for enchant")
-subdepends=("${subdepends[@]}" "libqtcore>=$Qt4 libqtdbus>=$Qt4 enchant bzip2 
$POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP enchant bzip2 $POLKIT_QT_1DEP")
subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to