Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=e551e638efa05cf400fe44abc2f0a841a6448c0f
commit e551e638efa05cf400fe44abc2f0a841a6448c0f
Author: Michel Hermier <herm...@frugalware.org>
Date: Mon Aug 8 15:37:13 2011 +0200
kdelibs-4.7.0-5-i686
* Split kdelibs-core in subpackages, it is required at run time but not
at build time.
* Let's try to reduice the dependecy madness a little.
* Some dependencies in new subpackages are broken but depending on
kdelibs-core is ok (should be more or less fixed on next run).
diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index 6b76582..6b3ef39 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: centuri0 <achevaux at gmail dot com>
pkgname=kdelibs
-pkgrel=4
+pkgrel=5
pkgdesc="KDE4 Core Libraries."
groups=('kde')
replaces=('kat')
@@ -21,16 +21,22 @@ sha1sums=("${sha1sums[@]}" \
DNSSDDEP="libdnssd>=$_F_kde_ver"
KDE3SUPPORTDEP="libkde3support>=$_F_kde_ver"
+KDECOREDEP="libkdecore>=$_F_kde_ver"
+KDEUIDEP="libkdeui>=$_F_kde_ver"
KDESUDEP="libkdesu>=$_F_kde_ver"
+KIODEP="libkio>=$_F_kde_ver"
+KJSDEP="libkjs>=$_F_kde_ver"
WEBKITDEP="libkdewebkit>=$_F_kde_ver"
KFILEDEP="libkfile>=$_F_kde_ver"
KHTMLDEP="libkhtml>=$_F_kdever"
KNEWDEP="libknewstuff>=$_F_kde_ver"
KNOTITYDEP="libknotify>=$_F_kde_ver"
+KPARTSDEP="libkparts>=$_F_kde_ver"
KROSSDEP="libkross>=$_F_kde_ver"
KUTILSDEP="libkutils>=$_F_kde_ver"
NEPOMUKDEP="libnepomuk>=$_F_kde_ver"
PLASMADEP="libplasma>=$_F_kde_ver"
+SOLIDDEP="libsolid>=$_F_kde_ver"
THREADWDEP="libthreadweaver>=$_F_kde_ver"
KDELIBS_COREDEP="kdelibs-core>=$_F_kde_ver"
@@ -65,29 +71,71 @@ LIBQTXMLPATTERNSDEP="libqtxmlpatterns>=$_F_kde_qtver"
subpkgs=("${subpkgs[@]}" "libkde3support")
subdescs=("${subdescs[@]}" "Libraries to support KDE3 code.")
subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQT3SUPPORTDEP $LIBQTSVGDEP
- $POLKIT_QT_1DEP gamin xfsprogs-attr libsm libxcursor libpng fontconfig
libxi")
+ xfsprogs-attr libsm libxcursor libpng fontconfig libxi")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP $KDESUDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+subpkgs=("${subpkgs[@]}" "libkdecore")
+subdescs=("${subdescs[@]}" "KDE core library.")
+subdepends=("${subdepends[@]}" "$POLKIT_QT_1DEP $LIBQTNETWORKDEP bzip2 gamin
xz")
+subrodepends=("${subrodepends[@]}" "")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "libkdeui")
+subdescs=("${subdescs[@]}" "KDE core UI library.")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP attica libdbusmenu-qt libxtst")
+subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "libkio")
+subdescs=("${subdescs[@]}" "KDE core IO library.")
+subdepends=("${subdepends[@]}" "")
+subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "libkjs")
+subdescs=("${subdescs[@]}" "KDE core JavaScript library.")
+subdepends=("${subdepends[@]}" "")
+subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "libkparts")
+subdescs=("${subdescs[@]}" "KDE core loadable parts components library.")
+subdepends=("${subdepends[@]}" "")
+subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "libsolid")
+subdescs=("${subdescs[@]}" "KDE core hardware support library.")
+subdepends=("${subdepends[@]}" "")
+subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
subpkgs=("${subpkgs[@]}" "libplasma")
subdescs=("${subdescs[@]}" "Framework for the KDE desktop shell and its
widgets.")
subdepends=("${subdepends[@]}" "$LIBQTUITOOLSDEP $LIBQTWEBKITDEP $LIBQTOPENGLDEP
- qca gamin xfsprogs-attr libqtdbus libxcb libxdamage $POLKIT_QT_1DEP")
+ qca xfsprogs-attr libqtdbus libxcb libxdamage")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP $KNEWDEP $THREADWDEP
$DNSSDDEP")
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[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP bzip2 libxext
$POLKIT_QT_1DEP avahi")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP libxext avahi")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libknotify")
subdescs=("${subdescs[@]}" "User Notification Libraries.")
-subdepends=("${subdepends[@]}" "$PHONONDEP gamin xfsprogs-attr bzip2 libxext
$POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$PHONONDEP xfsprogs-attr libxext")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP phonon-backend-vlc")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -95,35 +143,35 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libkross")
subdescs=("${subdescs[@]}" "Scripting Libraries.")
subdepends=("${subdepends[@]}" "$LIBQTSVGDEP $LIBQTDBUSDEP $LIBQTDESIGNERDEP
- gamin xfsprogs-attr libpng fontconfig libxi $POLKIT_QT_1DEP libsm
libxcursor")
+ xfsprogs-attr libpng fontconfig libxi libsm libxcursor")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP $KFILEDEP
libkjsembed>=$_F_kde_ver")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libkdewebkit")
subdescs=("${subdescs[@]}" "KDE WebKit Library")
-subdepends=("${subdepends[@]}" "$LIBQTWEBKITDEP $LIBQTGUIDEP $LIBQTDBUSDEP
gamin xfsprogs-attr bzip2 libxext libxcb $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTWEBKITDEP $LIBQTGUIDEP $LIBQTDBUSDEP
xfsprogs-attr libxext libxcb")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libkhtml")
subdescs=("${subdescs[@]}" "HTML rendering widget designed for Konqueror.")
-subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP libjpeg>=8a libgif
pcre libxcb gamin xfsprogs-attr libxext bzip2 $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP libjpeg>=8a libgif
pcre libxcb xfsprogs-attr libxext")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP
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[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP gamin xfsprogs-attr
bzip2 libxext $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP xfsprogs-attr
libxext")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
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[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP gamin xfsprogs-attr
bzip2 libxext $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP xfsprogs-attr
libxext")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -131,21 +179,21 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libkdewidgets")
subdescs=("${subdescs[@]}" "KDE custom widgets for Qt Designer.")
subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTNETWORKDEP $LIBQTDBUSDEP
$LIBQTSQLDEP
- libstdc++ zlib strigi>=0.7.2 xfsprogs-acl libxrender libice libxext
$POLKIT_QT_1DEP")
+ libstdc++ zlib strigi>=0.7.2 xfsprogs-acl libxrender libice libxext")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP $KDESUDEP $KDE3SUPPORTDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libkjsembed")
subdescs=("${subdescs[@]}" "ECMAScript bindings libraries.")
-subdepends=("${subdepends[@]}" "$LIBQTUITOOLSDEP $LIBQTDBUSDEP bzip2 libx11
$POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTUITOOLSDEP $LIBQTDBUSDEP libx11")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
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[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP libxscrnsaver gamin
xfsprogs-attr bzip2 $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP libxscrnsaver
xfsprogs-attr")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -159,14 +207,14 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libkimgio")
subdescs=("${subdescs[@]}" "Gimgio class extension libraries.")
-subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP jasper libxext
bzip2 $POLKIT_QT_1DEP openexr>=1.6.1")
+subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP jasper libxext
openexr>=1.6.1")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libkunitconversion")
subdescs=("${subdescs[@]}" "KDE Unit conversation library.")
-subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP bzip2 libxext
$POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP libxext")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -189,7 +237,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libnepomuk")
subdescs=("${subdescs[@]}" "Semantic information retrieval and tagging.")
-subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP
soprano-backend-redland>=2.7.0 bzip2 $POLKIT_QT_1DEP libxext
shared-desktop-ontologies")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP
soprano-backend-redland>=2.7.0 libxext shared-desktop-ontologies")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -202,7 +250,7 @@ _F_kde_subpkgs=("${subpkgs[@]}")
subpkgs=("${subpkgs[@]}" "ksgmltools2")
subdescs=("${subdescs[@]}" "KDE doc tools.")
-subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP docbook-xsl libxslt
bzip2 gamin xfsprogs-attr libxext $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTGUIDEP $LIBQTDBUSDEP docbook-xsl libxslt
xfsprogs-attr libxext")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -210,7 +258,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
## maybe split more ? interfces/<foo> ? worth doing that ?
subpkgs=("${subpkgs[@]}" "$pkgname-interfaces")
subdescs=("${subdescs[@]}" "Kparts interface for text editors, mediaplayer and
scripting.")
-subdepends=("${subdepends[@]}" "gamin xfsprogs-attr bzip2 libxext
$POLKIT_QT_1DEP $PHONONDEP")
+subdepends=("${subdepends[@]}" "xfsprogs-attr libxext $PHONONDEP")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -218,7 +266,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
## this need kpty
subpkgs=("${subpkgs[@]}" "libkdesu")
subdescs=("${subdescs[@]}" "Library for password entering and handling.")
-subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP bzip2 $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -237,10 +285,10 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "kdelibs-core")
subdescs=("${subdescs[@]}" "KDE4 Core Library.")
-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
attica>=0.1.2")
-subrodepends=("${subrodepends[@]}" "kdelibs-data")
+subdepends=("${subdepends[@]}" "pcre \
+ libgcc strigi>=0.7.2-2 xfsprogs-acl libxrender libice \
+ libxfixes libuuid libkrb5 shared-mime-info udev udisks upower")
+subrodepends=("${subrodepends[@]}" "$KDEUIDEP $KIODEP $KJSDEP $KPARTSDEP
$SOLIDDEP kdelibs-data")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -268,21 +316,21 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "sonnet-plugin-hspell")
subdescs=("${subdescs[@]}" "Natural language processing for hspell")
-subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP bzip2 $POLKIT_QT_1DEP hspell")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP hspell")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "sonnet-plugin-aspell")
subdescs=("${subdescs[@]}" "Natural language processing for aspell")
-subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP aspell bzip2 $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP aspell")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "sonnet-plugin-enchant")
subdescs=("${subdescs[@]}" "Natural language processing for enchant")
-subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP enchant bzip2 $POLKIT_QT_1DEP")
+subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP enchant")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -303,38 +351,19 @@ build()
KDE_project_split sonnet-plugin-enchant sonnet/plugins/enchant
## libkdesu
- KDE_project_install kdesu
KDE_project_install kpty
- Fsplit libkdesu /\*
+ KDE_project_split libkdesu
## -interfaces
- KDE_project_install interfaces/khexedit
- KDE_project_install interfaces/kimproxy
- KDE_project_install interfaces/kmediaplayer
- KDE_project_install interfaces/kregexpeditor
- KDE_project_install interfaces/kspeech
- KDE_project_install interfaces/ktexteditor
- KDE_project_install interfaces/terminal
- Fsplit $pkgname-interfaces /\*
+ KDE_project_split $pkgname-interfaces
##### kdelibs-core / kdelibs-data start #######
- KDE_project_install kdecore
KDE_project_install kinit
KDE_project_install kded
KDE_project_install kconf_update
- KDE_project_install kio
KDE_project_install kioslave
- KDE_project_install interfaces/kio
KDE_project_install licenses
KDE_project_install mimetypes
- KDE_project_install kjs
- KDE_project_install kdeui
- KDE_project_install kparts
- KDE_project_install solid
-
- ## KDEUI has 2 icon folders ? hmm ? what for ?
- ## And why do we need desktop files for the libs ? .protocol files ?
colors ???
- ## These are kdebase-runtime files ? no ?:) I'm lost :-D
## OK -data subpackage -> man pages
KDE_project_install doc
@@ -343,12 +372,9 @@ build()
KDE_cleanup
- Fsplit kdelibs-data usr/share/apps/kdeui/about
- Fsplit kdelibs-data usr/share/apps/kdeui/pics
Fsplit kdelibs-data usr/share/kde4/services
Fsplit kdelibs-data usr/share/kde4/servicetypes
Fsplit kdelibs-data usr/share/apps/LICENSES
- Fsplit kdelibs-data etc/kde/config/colors
Fsplit kdelibs-data etc/xdg/menus
Fsplit kdelibs-data usr/share/man
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
