Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=2de4c9a463c5572636ac891dd7a7539baf519228

commit 2de4c9a463c5572636ac891dd7a7539baf519228
Author: Melko <[email protected]>
Date:   Fri Aug 3 12:58:18 2012 +0200

kdebase-workspace-4.9.0-1-x86_64

* version bump

diff --git a/source/kde/kdebase-workspace/FrugalBuild 
b/source/kde/kdebase-workspace/FrugalBuild
index cd7c232..e9a0917 100644
--- a/source/kde/kdebase-workspace/FrugalBuild
+++ b/source/kde/kdebase-workspace/FrugalBuild
@@ -158,7 +158,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64')
subpkgs=("${subpkgs[@]}" "ksplash")
subdescs=("${subdescs[@]}" "Manager for Splash Screen Themes.")
subdepends=("${subdepends[@]}" "libknewstuff>=$Kde4 libqtxml>=$Qt4 
libqtsvg>=$Qt4 libsm libxcursor libxi dbus libxinerama")
-subrodepends=("${subrodepends[@]}" "")
+subrodepends=("${subrodepends[@]}" "kde-base-artwork")
subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64')
@@ -355,7 +355,6 @@ subarchs=("${subarchs[@]}" 'i686 x86_64')
#### Applets ####
## activitybar
## analog-clock
-## battery
## calendar
## devicenotifier
## digital-clock
@@ -375,7 +374,7 @@ subdepends=("${subdepends[@]}" "libqtuitools>=$Qt4 
libqtwebkit>=$Qt4 libdnssd>=$
libkholidays>=$Kde4 libqtscript>=$Qt4 attica>=0.4.0 libmailtransport>=$Kde4 
libkpimidentities>=$Kde4 libkdeclarative>=$Kde4")
subrodepends=("${subrodepends[@]}" "libkworkspace>=$Kde4 libkdesolid>=$Kde4 
libtaskmanager>=$Kde4 ksysguard>=$Kde4") ## ksysguard? fix that
subgroups=("${subgroups[@]}" 'kde kde-core')
-subreplaces=("${subreplaces[@]}" 'plasma-tools')
+subreplaces=("${subreplaces[@]}" 'plasma-tools plasma-applet-battery')
subarchs=("${subarchs[@]}" 'i686 x86_64')

subpkgs=("${subpkgs[@]}" "plasma-applet-activitybar")
@@ -395,15 +394,6 @@ subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64')

-subpkgs=("${subpkgs[@]}" "plasma-applet-battery")
-subdescs=("${subdescs[@]}" "Plasma Applet Battery.")
-subdepends=("${subdepends[@]}" "libplasma>=$Kde4 phonon>=4.4.0 libgl 
libqtxml>=$Qt4 libqtsvg>=$Qt4 libxrandr libsm libxtst libxcursor
-       libgcc xz>=5.0.3 polkit-qt-1 strigi>=0.7.2-2 xfsprogs-acl sqlite3 
libqtxmlpatterns>=$Qt4 libuuid")
-subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4")
-subgroups=("${subgroups[@]}" 'kde kde-core')
-subreplaces=("${subreplaces[@]}" '')
-subarchs=("${subarchs[@]}" 'i686 x86_64')
-
subpkgs=("${subpkgs[@]}" "plasma-applet-calendar")
subdescs=("${subdescs[@]}" "Plasma Applet Calendar.")
subdepends=("${subdepends[@]}" "libqtnetwork>=$Qt4 libice libxfixes libxrender 
libxi dbus libkcal>=$Kde4")
@@ -729,9 +719,6 @@ build()
KDE_project_install plasma/generic/applets/analog-clock
Fsplit plasma-applet-analog-clock /\*

-       KDE_project_install plasma/generic/applets/battery
-       Fsplit plasma-applet-battery /\*
-
KDE_project_install plasma/generic/applets/calendar
Fsplit plasma-applet-calendar /\*

@@ -771,7 +758,7 @@ build()
Fcleandestdir plasma-scriptengine-python
Fcleandestdir plasma-scriptengine-webkit
Fcleandestdir plasma-applet-lock-logout
-       for clean in activitybar analog-clock battery calendar devicenotifier 
digital-clock icon  panelspacer quicklaunch system-monitor systemtray webbrowser
+       for clean in activitybar analog-clock calendar devicenotifier 
digital-clock icon  panelspacer quicklaunch system-monitor systemtray webbrowser
do
Fcleandestdir plasma-applet-${clean}
done
@@ -830,10 +817,6 @@ build()

## kdmrc -> kde-fw
Fsubmv kdm /etc/kde/config/kdm/kdmrc /etc/kde/config/kdm/kdmrc-kde4-$pkgver.orig
-       ## we want fw default theme
-       Fsubmv ksplash /usr/share/apps/ksplash/Themes/Default 
/usr/share/apps/ksplash/Themes/Kde4-Default
-       ## avoiding conflict with kde-frugalware
-       Frm usr/share/apps/ksplash/Themes/Default
}

# optimization OK
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to