Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=a41de4c8f8c142cbe52584b0b50e8371d0b0689e
commit a41de4c8f8c142cbe52584b0b50e8371d0b0689e
Author: Michel Hermier <herm...@frugalware.org>
Date: Tue Aug 9 16:34:06 2011 +0200
kdebase-workspace-4.7.0-3-i686
* Merge ksysguard and libksysguard.
diff --git a/source/kde/kdebase-workspace/FrugalBuild
b/source/kde/kdebase-workspace/FrugalBuild
index 08c2d3b..47cdcbd 100644
--- a/source/kde/kdebase-workspace/FrugalBuild
+++ b/source/kde/kdebase-workspace/FrugalBuild
@@ -1,11 +1,13 @@
# Compiling Time: 17.03 SBU
# Maintainer: centuri0 <achevaux at gmail dot com>
+USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-"n"}
+
USE_GPSD=${USE_GPSD:-"n"}
USE_NETWORKMANAGER=${USE_NETWORKMANAGER:-"n"}
pkgname=kdebase-workspace
-pkgrel=2
+pkgrel=3
pkgdesc="Programs specific for the KDE4 desktop."
groups=('kde')
archs=('i686' 'x86_64' 'ppc')
@@ -126,7 +128,7 @@ subpkgs=("${subpkgs[@]}" "ksysguard")
subdescs=("${subdescs[@]}" "KDE System Monitor")
subdepends=("${subdepends[@]}" "libqtxml>=$Qt4 dbus libknewstuff>=$Kde4
libqtsvg>=$Qt4 libsm libxcursor
sqlite3 phonon>=4.4.0 libqtxmlpatterns>=$Qt4 libxi lmsensors>=3.2.0")
-subrodepends=("${subrodepends[@]}" "libksysguard")
+subrodepends=("${subrodepends[@]}" "kdelibs-core>=$Kde4")
subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -144,7 +146,7 @@ subpkgs=("${subpkgs[@]}" "krunner")
subdescs=("${subdescs[@]}" "KDE run command interface.")
subdepends=("${subdepends[@]}" "libkutils>=$Kde4 libknewstuff>=$Kde4
libdnssd>=$Kde4 libthreadweaver>=$Kde4 libice qca
libqtopengl>=$Qt4 libqtnetwork>=$Qt4 libxdamage libxi dbus libxxf86misc")
-subrodepends=("${subrodepends[@]}" "libkworkspace>=$Kde4 libksysguard>=$Kde4
libkephal>=$Kde4")
+subrodepends=("${subrodepends[@]}" "libkworkspace>=$Kde4 libkephal>=$Kde4
ksysguard>=$Kde4")
subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -280,17 +282,6 @@ subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-## fix me what exactly does this ?
-## generic pcrocess-script-engine-lib ?
-subpkgs=("${subpkgs[@]}" "libksysguard")
-subdescs=("${subdescs[@]}" "Libraries for KDE.")
-subdepends=("${subdepends[@]}" "kdelibs-core>=$Kde4 libqtdbus>=$Qt4 bzip2
polkit-qt-1 libxcb libqtscript>=$Qt4 libqtwebkit>=$Qt4 libqtuitools>=$Qt4")
-subrodepends=("${subrodepends[@]}" "")
-subgroups=("${subgroups[@]}" 'kde kde-core')
-subreplaces=("${subreplaces[@]}" '')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-
-
### plasma split is the biggest work..
### NEVER: BUMP without to check what changed ..
@@ -664,6 +655,11 @@ subgroups=("${subgroups[@]}" 'docs-extra kde-docs')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+# To detected dependecies with makepkg -a
+if Fuse DETECTDEPENDS; then
+ makedepends=("${makedepends[@]}" "$pkgname" "${subpkgs[@]}")
+fi
+
## FIXME! move all the files gone here to kde-fw
## FIX kde-fw also ;)
build()
@@ -681,9 +677,6 @@ build()
KDE_project_install libs/solid
Fsplit libkdesolid /\*
- KDE_project_install libs/ksysguard
- Fsplit libksysguard /\*
-
## -cursors
KDE_project_install cursors
Fsplit $pkgname-extra-cursors /usr/share/kde/icons/Oxygen_*_Big
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
