Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=17e75d7ae18d317e319a2fc4538b522904cd8653

commit 17e75d7ae18d317e319a2fc4538b522904cd8653
Author: Michel Hermier <herm...@frugalware.org>
Date:   Thu Apr 7 12:54:11 2011 +0200

kdebase-workspace-4.6.1-5-i686

* Disable gpsd and networkmanager optional dependecies.
gpsd don't compile for me (I wonder how it comiled before).
networkmanager should be upgraded with gnometesting and the new
version is not supported.

diff --git a/source/kde/kdebase-workspace/FrugalBuild 
b/source/kde/kdebase-workspace/FrugalBuild
index a255282..613f70f 100644
--- a/source/kde/kdebase-workspace/FrugalBuild
+++ b/source/kde/kdebase-workspace/FrugalBuild
@@ -1,8 +1,11 @@
# Compiling Time: 17.03 SBU
# Maintainer: crazy <cr...@frugalware.org>

+USE_GPSD=${USE_GPSD:-"n"}
+USE_NETWORKMANAGER=${USE_NETWORKMANAGER:-"n"}
+
pkgname=kdebase-workspace
-pkgrel=4
+pkgrel=5
pkgdesc="Programs specific for the KDE4 desktop."
groups=('kde')
archs=('i686' 'x86_64' 'ppc')
@@ -13,7 +16,7 @@ rodepends=("${rodepends[@]}" 'xorg-server>=1.6.1' 
'kde-frugalware>=4.3' \
depends=()
makedepends=("${makedepends[@]}" "ksgmltools2>=$_F_kde_ver" 
"kdelibs>=$_F_kde_ver" \
'python' 'boost' 'bluez>=4.87' "libkdewidgets>=$_F_kde_ver" 
"libqtdesigner>=$_F_kde_qtver"  \
-       "networkmanager>=0.8" "docbook-xsl" "libdbusmenu-qt>=0.8.0" "upower" 
"udisks" \
+       "docbook-xsl" "libdbusmenu-qt>=0.8.0" "upower" "udisks" \
"libqtdeclarative>=_F_kde_qtver")
## SURE! libkdewidgets is a DEVEL only thing I see :P
##FIXME and send upstream! ksysgurds lib want libqtdesigner but no check for it 
so compile error same libkdewidgets
@@ -37,6 +40,10 @@ sha1sums=('e37691d88ddbf92cc95ec39849a1331404c84fd5' \
Qt4="${_F_kde_qtver}"
Kde4="$_F_kde_ver"

+if Fuse GPSD; then
+       GPSDDEP="gpsd"
+fi
+
subpkgs=("${subpkgs[@]}" "libkephal")
subdescs=("${subdescs[@]}" "API for easier handling of multihead systems.")
subdepends=("${subdepends[@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 libxext 
libkdecore bzip2 polkit-qt-1")
@@ -607,7 +614,7 @@ rodepends=("${rodepends[@]}" "${subpkgs[@]}")

subpkgs=("${subpkgs[@]}" "plasma-dataengine-geolocation")
subdescs=("${subdescs[@]}" "Plasma DataEngine gor geolocation")
-subdepends=("${subdepends[@]}" "gpsd libplasma>=$Kde4")
+subdepends=("${subdepends[@]}" "$GPSDDEP libplasma>=$Kde4")
subrodepends=("${subrodepends[@]}" "")
subgroups=("${subgroups[@]}" 'kde-extra')
subreplaces=("${subreplaces[@]}" '')
@@ -637,13 +644,15 @@ subgroups=("${subgroups[@]}" "devel-extra kde-build")
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" "i686 x86_64 ppc")

-subpkgs=("${subpkgs[@]}" "$pkgname-solid-networkmanager")
-subdescs=("${subdescs[@]}" "Solid Module for NetworkManager.")
-subdepends=("${subdepends[@]}" "libxrandr libqtxml libsm")
-subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4")
-subgroups=("${subgroups[@]}" 'kde-extra') ## for now is -extra
-subreplaces=("${subreplaces[@]}" '')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+if Fuse NETWORKMANAGER; then
+       subpkgs=("${subpkgs[@]}" "$pkgname-solid-networkmanager")
+       subdescs=("${subdescs[@]}" "Solid Module for NetworkManager.")
+       subdepends=("${subdepends[@]}" "libxrandr libqtxml libsm 
networkmanager>=0.8")
+       subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4")
+       subgroups=("${subgroups[@]}" 'kde-extra') ## for now is -extra
+       subreplaces=("${subreplaces[@]}" '')
+       subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+fi

subpkgs=("${subpkgs[@]}" "$pkgname-wallpapers")
subdescs=("${subdescs[@]}" "Kdebase Workspace Wallpapers")
@@ -801,8 +810,10 @@ build()
#KDE_project_install solid/networking
#Fsplit $pkgname-solid-networking /\*

-       KDE_project_install solid/networkmanager-*
-       Fsplit $pkgname-solid-networkmanager /\*
+       if Fuse NETWORKMANAGER; then
+               KDE_project_install solid/networkmanager-*
+               Fsplit $pkgname-solid-networkmanager /\*
+       fi

## qgui-plugin
KDE_project_install qguiplatformplugin_kde
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to