Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=d1332699ee1330573cd4a1731af6a7a9f94fbf2d
commit d1332699ee1330573cd4a1731af6a7a9f94fbf2d
Author: Michel Hermier <herm...@frugalware.org>
Date: Tue Aug 9 21:41:09 2011 +0200
kdelibs-4.7.0-6-i686
* Trying to reduce and solve some depends issues.
diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index 6b3ef39..431dcee 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -1,8 +1,10 @@
# Compiling Time: 25.85 SBU
# Maintainer: centuri0 <achevaux at gmail dot com>
+USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-"n"}
+
pkgname=kdelibs
-pkgrel=5
+pkgrel=6
pkgdesc="KDE4 Core Libraries."
groups=('kde')
replaces=('kat')
@@ -26,6 +28,7 @@ KDEUIDEP="libkdeui>=$_F_kde_ver"
KDESUDEP="libkdesu>=$_F_kde_ver"
KIODEP="libkio>=$_F_kde_ver"
KJSDEP="libkjs>=$_F_kde_ver"
+KJSEMBEDEDDEP="libkjsembeded>=$_F_kde_ver"
WEBKITDEP="libkdewebkit>=$_F_kde_ver"
KFILEDEP="libkfile>=$_F_kde_ver"
KHTMLDEP="libkhtml>=$_F_kdever"
@@ -70,9 +73,8 @@ LIBQTXMLPATTERNSDEP="libqtxmlpatterns>=$_F_kde_qtver"
subpkgs=("${subpkgs[@]}" "libkde3support")
subdescs=("${subdescs[@]}" "Libraries to support KDE3 code.")
-subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP $LIBQT3SUPPORTDEP $LIBQTSVGDEP
- xfsprogs-attr libsm libxcursor libpng fontconfig libxi")
-subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP $KDESUDEP")
+subdepends=("${subdepends[@]}" "$LIBQT3SUPPORTDEP")
+subrodepends=("${subrodepends[@]}" "$KDESUDEP $NEPOMUKDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -92,8 +94,8 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libkio")
subdescs=("${subdescs[@]}" "KDE core IO library.")
-subdepends=("${subdepends[@]}" "")
-subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
+subdepends=("${subdepends[@]}" "$LIBQTSCRIPTDEP")
+subrodepends=("${subrodepends[@]}" "$NEPOMUKDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -107,7 +109,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libkparts")
subdescs=("${subdescs[@]}" "KDE core loadable parts components library.")
subdepends=("${subdepends[@]}" "")
-subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
+subrodepends=("${subrodepends[@]}" "$NEPOMUKDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -122,7 +124,7 @@ subpkgs=("${subpkgs[@]}" "libplasma")
subdescs=("${subdescs[@]}" "Framework for the KDE desktop shell and its
widgets.")
subdepends=("${subdepends[@]}" "$LIBQTUITOOLSDEP $LIBQTWEBKITDEP $LIBQTOPENGLDEP
qca xfsprogs-attr libqtdbus libxcb libxdamage")
-subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP $KNEWDEP $THREADWDEP
$DNSSDDEP")
+subrodepends=("${subrodepends[@]}" "$KDECOREDEP $KNEWDEP $THREADWDEP
$DNSSDDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -135,16 +137,15 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libknotify")
subdescs=("${subdescs[@]}" "User Notification Libraries.")
-subdepends=("${subdepends[@]}" "$PHONONDEP xfsprogs-attr libxext")
-subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP phonon-backend-vlc")
+subdepends=("${subdepends[@]}" "$PHONONDEP")
+subrodepends=("${subrodepends[@]}" "$NEPOMUKDEP phonon-backend-vlc")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libkross")
subdescs=("${subdescs[@]}" "Scripting Libraries.")
-subdepends=("${subdepends[@]}" "$LIBQTSVGDEP $LIBQTDBUSDEP $LIBQTDESIGNERDEP
- xfsprogs-attr libpng fontconfig libxi libsm libxcursor")
-subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP $KFILEDEP
libkjsembed>=$_F_kde_ver")
+subdepends=("${subdepends[@]}" "$LIBQTDESIGNERDEP")
+subrodepends=("${subrodepends[@]}" "$KFILEDEP $KJSEMBEDEDDEP $NEPOMUKDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -179,14 +180,14 @@ 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")
+ 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 libx11")
+subdepends=("${subdepends[@]}" "$LIBQTUITOOLSDEP $LIBQTDBUSDEP")
subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -200,7 +201,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libthreadweaver")
subdescs=("${subdescs[@]}" "Job-based threading library.")
-subdepends=("${subdepends[@]}" "$LIBQTCOREDEP libgcc")
+subdepends=("${subdepends[@]}" "$LIBQTCOREDEP")
subrodepends=("${subrodepends[@]}" "")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -224,14 +225,14 @@ rodepends=("${rodepends[@]}" "${subpkgs[@]}")
subpkgs=("${subpkgs[@]}" "libkactivities")
subdescs=("${subdescs[@]}" "Libraries for the KDE activities management.")
subdepends=("${subdepends[@]}" "")
-subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
+subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "libkdeclarative")
subdescs=("${subdescs[@]}" "KDE declarative extensions")
-subdepends=("${subdepends[@]}" "$LIBQTDECLARATIVE")
-subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
+subdepends=("${subdepends[@]}" "$LIBQTDECLARATIVE $LIBQTSQLDEP
$LIBQTXMLPATTERNS")
+subrodepends=("${subrodepends[@]}" "$KDEUIDEP")
subgroups=("${subgroups[@]}" 'kde-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -258,16 +259,16 @@ 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[@]}" "xfsprogs-attr libxext $PHONONDEP")
-subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
+subdepends=("${subdepends[@]}" "$PHONONDEP")
+subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
## this need kpty
subpkgs=("${subpkgs[@]}" "libkdesu")
subdescs=("${subdescs[@]}" "Library for password entering and handling.")
-subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP")
-subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
+subdepends=("${subdepends[@]}" "")
+subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde kde-core')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -310,31 +311,36 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "$pkgname-compiletime")
subdescs=("${subdescs[@]}" "Kdelibs extra headers, cmake and pkgconfig files")
subdepends=("${subdepends[@]}" "")
-subrodepends=("${subrodepends[@]}" "")
+subrodepends=("${subrodepends[@]}" "cmake")
subgroups=("${subgroups[@]}" 'devel-extra kde-build')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "sonnet-plugin-hspell")
subdescs=("${subdescs[@]}" "Natural language processing for hspell")
-subdepends=("${subdepends[@]}" "$LIBQTDBUSDEP hspell")
-subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
+subdepends=("${subdepends[@]}" "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[@]}" "$LIBQTDBUSDEP aspell")
-subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
+subdepends=("${subdepends[@]}" "aspell")
+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[@]}" "$LIBQTDBUSDEP enchant")
-subrodepends=("${subrodepends[@]}" "$KDELIBS_COREDEP")
+subdepends=("${subdepends[@]}" "enchant")
+subrodepends=("${subrodepends[@]}" "$KDECOREDEP")
subgroups=("${subgroups[@]}" 'kde-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+# To detected dependecies with makepkg -a
+if Fuse DETECTDEPENDS; then
+ makedepends=("${makedepends[@]}" "$pkgname" "${subpkgs[@]}")
+fi
+
build()
{
Fcd
@@ -342,6 +348,8 @@ build()
sed -i -e 's|KDE_VERSION_STRING.*|KDE_VERSION_STRING "(KDE ${KDE_VERSION})
Frugalware Linux")|g' CMakeLists.txt || Fdie
KDE_make_split
+ Fsubsplit libkdecore libkjs /usr/lib/kde4/ktranscript.\*
+
## ksgmltools2
KDE_project_split ksgmltools2 kdoctools
@@ -385,4 +393,3 @@ build()
}
# optimization OK
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
