Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=3400b71a248ba7fff5fd394804f7f6fca4104cab
commit 3400b71a248ba7fff5fd394804f7f6fca4104cab
Author: Michel Hermier <herm...@frugalware.org>
Date: Wed Mar 9 11:48:40 2011 +0100
kdebase-workspace-4.6.1-2-i686
* Fix some packageing issues.
diff --git a/source/kde/kdebase-workspace/FrugalBuild
b/source/kde/kdebase-workspace/FrugalBuild
index 2771630..fdc1db9 100644
--- a/source/kde/kdebase-workspace/FrugalBuild
+++ b/source/kde/kdebase-workspace/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <cr...@frugalware.org>
pkgname=kdebase-workspace
-pkgrel=1
+pkgrel=2
pkgdesc="Programs specific for the KDE4 desktop."
groups=('kde')
archs=('i686' 'x86_64' 'ppc')
@@ -37,6 +37,57 @@ sha1sums=('e37691d88ddbf92cc95ec39849a1331404c84fd5' \
Qt4="${_F_kde_qtver}"
Kde4="$_F_kde_ver"
+subpkgs=("${subpkgs[@]}" "libkephal")
+subdescs=("${subdescs[@]}" "API for easier handling of multihead systems.")
+subdepends=("${subdepends[@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 libxext
libkdecore bzip2 polkit-qt-1")
+subrodepends=("${subrodepends[@]}" "")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subreplaces=("${subreplaces[@]}" '')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "liboxygen")
+subdescs=("${subdescs[@]}" "Libraries for KDE Oxygen Styles.")
+subdepends=("${subdepends[@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 libxext
libkdecore bzip2 polkit-qt-1")
+subrodepends=("${subrodepends[@]}" "")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subreplaces=("${subreplaces[@]}" '')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "libplasmaclock")
+subdescs=("${subdescs[@]}" "Libraries for KDE Plasma clocks.")
+subdepends=("${subdepends[@]}" "libplasma>=$Kde4 phonon>=4.4.0 libgl
libqtxml>=$Qt4 libqtsvg>=$Qt4 libsm libxtst libxcursor strigi>=0.7.2-2
xfsprogs-acl
+ xz polkit-qt-1 libgcc sqlite3 libqtxmlpatterns>=$Qt4 libuuid")
+subrodepends=("${subrodepends[@]}" "")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subreplaces=("${subreplaces[@]}" '')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "libplasmagenericshell")
+subdescs=("${subdescs[@]}" "Libraries for KDE Plasma shell.")
+subdepends=("${subdepends[@]}" "libkfile>=$Kde4 libknewstuff>=$Kde4
libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libdnssd>=$Kde4 libthreadweaver>=$Kde4
+ libqtopengl>=$Qt4 libqtnetwork>=$Qt4 qca libxcb libxdamage libxi dbus")
+subrodepends=("${subrodepends[@]}" "libkworkspace")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subreplaces=("${subreplaces[@]}" '')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "libtaskmanager")
+subdescs=("${subdescs[@]}" "A library that provides basic taskmanager
functionality.")
+subdepends=("${subdepends[@]}" "libqtsvg>=$Qt4 libsm libqtxml>=$Qt4 libxcursor
gamin xfsprogs-attr libxi dbus")
+subrodepends=("${subrodepends[@]}" "libkephal")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subreplaces=("${subreplaces[@]}" '')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "libkworkspace")
+subdescs=("${subdescs[@]}" "A library for KDE desktop applications.")
+subdepends=("${subdepends[@]}" "libsm libplasma>=$Kde4 libqtsvg>=$Qt4
libqtxml>=$Qt4 libxtst libxcursor libuuid phonon>=4.4.0 libgl xz polkit-qt-1
+ libgcc strigi>=0.7.2-2 xfsprogs-acl sqlite3 libqtxmlpatterns>=$Qt4")
+subrodepends=("${subrodepends[@]}" "")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subreplaces=("${subreplaces[@]}" '')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
subpkgs=("${subpkgs[@]}" "powerdevil")
subdescs=("${subdescs[@]}" "A Laptop Power Management Daemon.")
subdepends=("${subdepends[@]}" "libkutils>=$Kde4 libqtxml>=$Qt4 libqtsvg>=$Qt4
libsm libxcursor libxrandr dbus libxi libknotify>=$Kde4")
@@ -45,13 +96,13 @@ subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-subpkgs=("${subpkgs[@]}" "kwin")
-subdescs=("${subdescs[@]}" "KDE Window Manager.")
-subdepends=("${subdepends[@]}" "libxcb libxi dbus libxrandr libxcomposite
libxdamage libknewstuff>=$Kde4
- libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libdnssd>=$Kde4
libthreadweaver>=$Kde4 qca libqtopengl>=$Qt4 libkutils>=$Kde4")
-subrodepends=("${subrodepends[@]}" "libkephal>=$Kde4 libkworkspace>=$Kde4")
-subgroups=("${subgroups[@]}" 'kde kde-core')
-subreplaces=("${subreplaces[@]}" 'aurorae')
+subpkgs=("${subpkgs[@]}" "kinfocenter")
+subdescs=("${subdescs[@]}" "The KDE Info Center.")
+subdepends=("${subdepends[@]}" "libkhtml>=$Kde4 libkutils>=$Kde4
libqtnetwork>=$Qt4 libqtxml>=$Qt4 libxtst libice libxfixes libxrender xz libxau
+ libxdmcp strigi>=0.7.2-2 xfsprogs-acl libuuid libglu
libkde3support>=$Kde4 libqtsql>=$Qt4 libraw1394 pciutils")
+subrodepends=("${subrodepends[@]}" '')
+subgroups=("${subgroups[@]}" 'kde')
+subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "klipper")
@@ -71,15 +122,6 @@ subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-subpkgs=("${subpkgs[@]}" "systemsettings")
-subdescs=("${subdescs[@]}" "Central configuration center for KDE.")
-subdepends=("${subdepends[@]}" "libkutils>=$Kde4 libqtnetwork>=$Qt4 xz
polkit-qt-1 libxtst libqtsvg>=$Qt4 libice libqtxml>=$Qt4 libxcursor libgcc
- libxau libxdmcp strigi>=0.7.2-2 xfsprogs-acl libuuid libkhtml>=$Kde4")
-subrodepends=("${subrodepends[@]}" "")
-subgroups=("${subgroups[@]}" 'kde kde-core')
-subreplaces=("${subreplaces[@]}" '')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-
subpkgs=("${subpkgs[@]}" "kmenuedit")
subdescs=("${subdescs[@]}" "KDE menu editor.")
subdepends=("${subdepends[@]}" "libkde3support>=$Kde4 libqtxml>=$Qt4 libstdc++
zlib strigi>=0.7.2-2 libqtnetwork>=$Qt4
@@ -106,12 +148,20 @@ subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-subpkgs=("${subpkgs[@]}" "$pkgname-kcontrol")
-subdescs=("${subdescs[@]}" "KDE Control Center.")
-subdepends=("${subdepends[@]}" "libxft zlib libxcb libqtnetwork>=$Qt4 dbus
libxklavier>=5.0-1 libkutils>=$Kde4 libxrandr libusb libknotify>=$Kde4
- libknewstuff>=$Kde4 libqtuitools>=$Qt4 libqtwebkit>=$Qt4
libdnssd>=$Kde4 libthreadweaver>=$Kde4 qca libqtopengl>=$Qt4 libxdamage
- libkde3support>=$Kde4 libqtsql>=$Qt4 qimageblitz")
-subrodepends=("${subrodepends[@]}" "libkworkspace")
+subpkgs=("${subpkgs[@]}" "kwin")
+subdescs=("${subdescs[@]}" "KDE Window Manager.")
+subdepends=("${subdepends[@]}" "libxcb libxi dbus libxrandr libxcomposite
libxdamage libknewstuff>=$Kde4
+ libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libdnssd>=$Kde4
libthreadweaver>=$Kde4 qca libqtopengl>=$Qt4 libkutils>=$Kde4")
+subrodepends=("${subrodepends[@]}" "libkephal>=$Kde4 libkworkspace>=$Kde4")
+subgroups=("${subgroups[@]}" 'kde kde-core')
+subreplaces=("${subreplaces[@]}" 'aurorae')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "systemsettings")
+subdescs=("${subdescs[@]}" "Central configuration center for KDE.")
+subdepends=("${subdepends[@]}" "libkutils>=$Kde4 libqtnetwork>=$Qt4 xz
polkit-qt-1 libxtst libqtsvg>=$Qt4 libice libqtxml>=$Qt4 libxcursor libgcc
+ libxau libxdmcp strigi>=0.7.2-2 xfsprogs-acl libuuid libkhtml>=$Kde4")
+subrodepends=("${subrodepends[@]}" "")
subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
@@ -182,50 +232,23 @@ subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-## libs/<..> - auto-split
-
-subpkgs=("${subpkgs[@]}" "libkephal")
-subdescs=("${subdescs[@]}" "API for easier handling of multihead systems.")
-subdepends=("${subdepends[@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 libxext
libkdecore bzip2 polkit-qt-1")
-subrodepends=("${subrodepends[@]}" "")
-subgroups=("${subgroups[@]}" 'kde kde-core')
-subreplaces=("${subreplaces[@]}" '')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-
-subpkgs=("${subpkgs[@]}" "libkworkspace")
-subdescs=("${subdescs[@]}" "A library for KDE desktop applications.")
-subdepends=("${subdepends[@]}" "libsm libplasma>=$Kde4 libqtsvg>=$Qt4
libqtxml>=$Qt4 libxtst libxcursor libuuid phonon>=4.4.0 libgl xz polkit-qt-1
- libgcc strigi>=0.7.2-2 xfsprogs-acl sqlite3 libqtxmlpatterns>=$Qt4")
-subrodepends=("${subrodepends[@]}" "")
-subgroups=("${subgroups[@]}" 'kde kde-core')
-subreplaces=("${subreplaces[@]}" '')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-
-subpkgs=("${subpkgs[@]}" "libplasmaclock")
-subdescs=("${subdescs[@]}" "Libraries for KDE Plasma clocks.")
-subdepends=("${subdepends[@]}" "libplasma>=$Kde4 phonon>=4.4.0 libgl
libqtxml>=$Qt4 libqtsvg>=$Qt4 libsm libxtst libxcursor strigi>=0.7.2-2
xfsprogs-acl
- xz polkit-qt-1 libgcc sqlite3 libqtxmlpatterns>=$Qt4 libuuid")
-subrodepends=("${subrodepends[@]}" "")
-subgroups=("${subgroups[@]}" 'kde kde-core')
-subreplaces=("${subreplaces[@]}" '')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-
-subpkgs=("${subpkgs[@]}" "libplasmagenericshell")
-subdescs=("${subdescs[@]}" "Libraries for KDE Plasma shell.")
-subdepends=("${subdepends[@]}" "libkfile>=$Kde4 libknewstuff>=$Kde4
libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libdnssd>=$Kde4 libthreadweaver>=$Kde4
- libqtopengl>=$Qt4 libqtnetwork>=$Qt4 qca libxcb libxdamage libxi dbus")
+subpkgs=("${subpkgs[@]}" "$pkgname-kcontrol")
+subdescs=("${subdescs[@]}" "KDE Control Center.")
+subdepends=("${subdepends[@]}" "libxft zlib libxcb libqtnetwork>=$Qt4 dbus
libxklavier>=5.0-1 libkutils>=$Kde4 libxrandr libusb libknotify>=$Kde4
+ libknewstuff>=$Kde4 libqtuitools>=$Qt4 libqtwebkit>=$Qt4
libdnssd>=$Kde4 libthreadweaver>=$Kde4 qca libqtopengl>=$Qt4 libxdamage
+ libkde3support>=$Kde4 libqtsql>=$Qt4 qimageblitz")
subrodepends=("${subrodepends[@]}" "libkworkspace")
subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-subpkgs=("${subpkgs[@]}" "libtaskmanager")
-subdescs=("${subdescs[@]}" "A library that provides basic taskmanager
functionality.")
-subdepends=("${subdepends[@]}" "libqtsvg>=$Qt4 libsm libqtxml>=$Qt4 libxcursor
gamin xfsprogs-attr libxi dbus")
-subrodepends=("${subrodepends[@]}" "libkephal")
-subgroups=("${subgroups[@]}" 'kde kde-core')
-subreplaces=("${subreplaces[@]}" '')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+subpkgs=("${subpkgs[@]}" "$pkgname-kstyles")
+subdescs=("${subdescs[@]}" "Runtime Files for Kstyles.")
+subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtgui>=$Qt4
libqtdbus>=$Qt4 bzip2 libxext polkit-qt-1 gamin xfsprogs-attr")
+subrodepends=("${subrodepends[@]}" "liboxygen")
+subgroups=("${subgroups[@]}" "kde kde-core kde-runtime")
+subreplaces=("${subreplaces[@]}" "kdebase-runtime-kstyles")
+subarchs=("${subarchs[@]}" "i686 x86_64 ppc")
_F_kde_subpkgs=("${subpkgs[@]}")
@@ -515,6 +538,14 @@ subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+#subpkgs=("${subpkgs[@]}" "$pkgname-solid-bluez")
+#subdescs=("${subdescs[@]}" "Solid Module for Bluez.")
+#subdepends=("${subdepends[@]}" "libqtxml>=$Qt4 dbus")
+#subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4")
+#subgroups=("${subgroups[@]}" 'kde kde-core')
+#subreplaces=("${subreplaces[@]}" '')
+#subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
#subpkgs=("${subpkgs[@]}" "$pkgname-solid-hal")
#subdescs=("${subdescs[@]}" "Solid Module for Hal.")
#subdepends=("${subdepends[@]}" "libqtxml>=$Qt4 dbus libsm libx11")
@@ -531,9 +562,9 @@ subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-#subpkgs=("${subpkgs[@]}" "$pkgname-solid-bluez")
-#subdescs=("${subdescs[@]}" "Solid Module for Bluez.")
-#subdepends=("${subdepends[@]}" "libqtxml>=$Qt4 dbus")
+#subpkgs=("${subpkgs[@]}" "$pkgname-solid-networking")
+#subdescs=("${subdescs[@]}" "Solid Network Status Daemon.")
+#subdepends=("${subdepends[@]}" "libxrandr libqtxml>=$Qt4 libsm dbus")
#subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4")
#subgroups=("${subgroups[@]}" 'kde kde-core')
#subreplaces=("${subreplaces[@]}" '')
@@ -547,14 +578,6 @@ subgroups=("${subgroups[@]}" 'kde kde-core')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-#subpkgs=("${subpkgs[@]}" "$pkgname-solid-networking")
-#subdescs=("${subdescs[@]}" "Solid Network Status Daemon.")
-#subdepends=("${subdepends[@]}" "libxrandr libqtxml>=$Qt4 libsm dbus")
-#subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4")
-#subgroups=("${subgroups[@]}" 'kde kde-core')
-#subreplaces=("${subreplaces[@]}" '')
-#subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-
subpkgs=("${subpkgs[@]}" "$pkgname-solid-kcm")
subdescs=("${subdescs[@]}" "Solid KCM Modules.")
subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtgui>=$Qt4
libqtdbus>=$Qt4 bzip2 libxext polkit-qt-1 gamin xfsprogs-attr")
@@ -582,14 +605,6 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
rodepends=("${rodepends[@]}" "${subpkgs[@]}")
-subpkgs=("${subpkgs[@]}" "$pkgname-wallpapers")
-subdescs=("${subdescs[@]}" "Kdebase Workspace Wallpapers")
-subdepends=("${subdepends[@]}" '')
-subrodepends=("${subrodepends[@]}" "")
-subgroups=("${subgroups[@]}" 'kde-extra')
-subreplaces=("${subreplaces[@]}" '')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-
subpkgs=("${subpkgs[@]}" "$pkgname-cursors")
subdescs=("${subdescs[@]}" "Kdebase Workspace Cursors")
subdepends=("${subdepends[@]}" '')
@@ -606,14 +621,6 @@ subgroups=("${subgroups[@]}" 'kde-extra')
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-subpkgs=("${subpkgs[@]}" "$pkgname-docs")
-subdescs=("${subdescs[@]}" "Kdebase Workspace Documentation")
-subdepends=("${subdepends[@]}" '')
-subrodepends=("${subrodepends[@]}" "")
-subgroups=("${subgroups[@]}" 'docs-extra kde-docs')
-subreplaces=("${subreplaces[@]}" '')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
-
subpkgs=("${subpkgs[@]}" "$pkgname-compiletime")
subdescs=("${subdescs[@]}" "$pkgname extra header, cmake and pkgconfig files")
subdepends=("${subdepends[@]}" "kdepimlibs-compiletime>=$Kde4")
@@ -622,14 +629,6 @@ subgroups=("${subgroups[@]}" "devel-extra kde-build")
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" "i686 x86_64 ppc")
-subpkgs=("${subpkgs[@]}" "$pkgname-kstyles")
-subdescs=("${subdescs[@]}" "Runtime Files for Kstyles.")
-subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtgui>=$Qt4
libqtdbus>=$Qt4 bzip2 libxext polkit-qt-1 gamin xfsprogs-attr")
-subrodepends=("${subrodepends[@]}" "")
-subgroups=("${subgroups[@]}" "kde kde-core kde-runtime")
-subreplaces=("${subreplaces[@]}" "kdebase-runtime-kstyles")
-subarchs=("${subarchs[@]}" "i686 x86_64 ppc")
-
subpkgs=("${subpkgs[@]}" "$pkgname-solid-networkmanager")
subdescs=("${subdescs[@]}" "Solid Module for NetworkManager.")
subdepends=("${subdepends[@]}" "libxrandr libqtxml libsm")
@@ -638,6 +637,22 @@ subgroups=("${subgroups[@]}" 'kde-extra') ## for now is
-extra
subreplaces=("${subreplaces[@]}" '')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+subpkgs=("${subpkgs[@]}" "$pkgname-wallpapers")
+subdescs=("${subdescs[@]}" "Kdebase Workspace Wallpapers")
+subdepends=("${subdepends[@]}" '')
+subrodepends=("${subrodepends[@]}" "")
+subgroups=("${subgroups[@]}" 'kde-extra')
+subreplaces=("${subreplaces[@]}" '')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
+subpkgs=("${subpkgs[@]}" "$pkgname-docs")
+subdescs=("${subdescs[@]}" "Kdebase Workspace Documentation")
+subdepends=("${subdepends[@]}" '')
+subrodepends=("${subrodepends[@]}" "")
+subgroups=("${subgroups[@]}" 'docs-extra kde-docs')
+subreplaces=("${subreplaces[@]}" '')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
## FIXME! move all the files gone here to kde-fw
## FIX kde-fw also ;)
build()
@@ -800,5 +815,5 @@ build()
## avoiding conflict with kde-frugalware
Frm usr/share/apps/ksplash/Themes/Default
}
-# optimization OK
+# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
