Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8f76c7f1fdadff5192480c87434f06e528d87055
commit 8f76c7f1fdadff5192480c87434f06e528d87055
Author: crazy <cr...@frugalware.org>
Date: Tue Jan 26 17:52:42 2010 +0100
kdebase-4.3.4-3-x86_64
* relbump
* fixed depends()
* split off libkonq
* moved all *kde*<something> files to -workplace
diff --git a/source/kde/kdebase-workspace/FrugalBuild
b/source/kde/kdebase-workspace/FrugalBuild
index 5fcea33..1b81ec2 100644
--- a/source/kde/kdebase-workspace/FrugalBuild
+++ b/source/kde/kdebase-workspace/FrugalBuild
@@ -75,9 +75,19 @@ build()
{
KDE_build
+ ## xinitrc for KDE.
+ Fexe /etc/X11/xinit/xinitrc.kde
+
+ ## Session file.
+ Ffile /etc/X11/sessions/kde.desktop
+
+ ## split the docs
+ Fsplit $pkgname-docs usr/share/doc/HTML
+
## No go 48MB extra wallpapers ..
## Kill from here and move to subpackage...
## Keep Air but that is..
+
find "$Fdestdir/usr/share/wallpapers" -maxdepth 1 -type d|grep -v Air | grep
[A-Z]| sed 's/.*pkg\///1' >wall_list || Fdie
Fmessage "Moving the following Wallpapers to $pkgname-wallpapers"
cat wall_list || Fdie
@@ -91,6 +101,7 @@ build()
## cursors location is broken so is the icon location broke
## in oxygen-icons package ;)
+
Fmkdir usr/share/icons
Fmv /usr/share/kde/icons/Oxygen_* /usr/share/icons/
Fsplit $pkgname-extra-cursors usr/share/icons/Oxygen_*_Big
diff --git a/source/kde/kdebase/kde.desktop
b/source/kde/kdebase-workspace/kde.desktop
similarity index 100%
rename from source/kde/kdebase/kde.desktop
rename to source/kde/kdebase-workspace/kde.desktop
diff --git a/source/kde/kdebase/kdebase.install
b/source/kde/kdebase-workspace/kdebase-workspace.install
similarity index 100%
rename from source/kde/kdebase/kdebase.install
rename to source/kde/kdebase-workspace/kdebase-workspace.install
diff --git a/source/kde/kdebase/xinitrc.kde
b/source/kde/kdebase-workspace/xinitrc.kde
similarity index 100%
rename from source/kde/kdebase/xinitrc.kde
rename to source/kde/kdebase-workspace/xinitrc.kde
diff --git a/source/kde/kdebase/FrugalBuild b/source/kde/kdebase/FrugalBuild
index 8d35b2f..6898799 100644
--- a/source/kde/kdebase/FrugalBuild
+++ b/source/kde/kdebase/FrugalBuild
@@ -6,36 +6,38 @@ pkgrel=3
pkgdesc="Basic programs for KDE4"
groups=('kde')
archs=('i686' 'x86_64')
-_F_cmakekde_final=OFF
+_F_kde_split_docs=1
+_F_kde_subpkgs_custom_path=1
Finclude kde
-depends=("${depen...@]}" 'libraw1394' "kdebase-workspace>=$_F_kde_ver"
'pciutils')
-#makedepends=('pkgconfig' 'webkit')
+depends=("libqtsvg>=$_F_kde_qtver" "libqtcore>=$_F_kde_qtver" 'libgcc'
'strigi' 'libice' 'libxft' 'libxpm' 'xfsprogs-acl' 'phonon' \
+ 'libjpeg' 'libgif' 'libpng' 'pcre' 'libxcursor' 'util-linux-ng' 'libxi'
"libqt3support>=$_F_kde_qtver" 'soprano' \
+ 'libglu' "kdebase-workspace>=$_F_kde_ver" "libqtwebkit>=$_F_kde_qtver"
'libraw1394' 'pciutils')
replaces=('bscommander' 'kasablanca')
-source=("${sour...@]}" 'kde.desktop' 'xinitrc.kde')
-subpkgs=("$pkgname-docs")
-subdescs=("Kdebase Documentation")
-subdepends=('')
-subgroups=('docs-extra kde-docs')
-subarchs=('i686 x86_64')
+subpkgs=("${subpk...@]}" "libkonq")
+subdescs=("${subdes...@]}" "The embeddable part of konqueror")
+subdepends=("${subdepen...@]}" "kdelibs>=$_F_kde_ver libqtxml>=$_F_kde_qtver
libqtgui>=$_F_kde_qtver libgcc libice libxext libxrender util-linux-ng")
+subgroups=("${subgrou...@]}" 'kde')
+subarchs=("${subarc...@]}" 'i686 x86_64')
+subpkgs=("${subpk...@]}" "$pkgname-docs")
+subdescs=("${subdes...@]}" "Kdebase Documentation")
+subdepends=("${subdepen...@]}" '')
+subgroups=("${subgrou...@]}" 'docs-extra kde-docs')
+subarchs=("${subarc...@]}" 'i686 x86_64')
-build()
-{
- CMake_build
- # xinitrc for KDE.
- Fexe /etc/X11/xinit/xinitrc.kde
+_F_kde_subpkgs=("${subpk...@]}")
- # Session file.
- Ffile /etc/X11/sessions/kde.desktop
+rodepends=("${rodepen...@]}" "libkonq=$_F_kde_ver")
+sha1sums=('7f8637367177c93916dfc2e6a2f6323a5e91c6ce')
- ## split the docs
- Fsplit $pkgname-docs usr/share/doc/HTML
+build()
+{
+ KDE_make
+ KDE_split
+ KDE_project_split libkonq "apps/lib/konq"
+ KDE_install
}
-sha1sums=('7f8637367177c93916dfc2e6a2f6323a5e91c6ce' \
- 'e1f706c984fc81633663c662e674b6f2c64d2f83' \
- '81092d3c9cfc08de1ac63c8318f0f1391501fb8d')
-
# optimization OK
diff --git a/source/kde/kdemultimedia/FrugalBuild
b/source/kde/kdemultimedia/FrugalBuild
index c90bddc..1be5ac9 100644
--- a/source/kde/kdemultimedia/FrugalBuild
+++ b/source/kde/kdemultimedia/FrugalBuild
@@ -21,14 +21,13 @@ subdepends=("${subdepen...@]}"
"kdelibs-experimental>=$_F_kde_ver libqtxml alsa-
subgroups=("${subgrou...@]}" 'kde')
subarchs=("${subarc...@]}" 'i686 x86_64')
-_F_kde_subpkgs=("${subpk...@]}")
-
subpkgs=("${subpk...@]}" "$pkgname-docs")
subdescs=("${subdes...@]}" "Kdebase Multimedia Documentation")
subdepends=("${subdepen...@]}" '')
subgroups=("${subgrou...@]}" 'docs-extra kde-docs')
subarchs=("${subarc...@]}" 'i686 x86_64')
+_F_kde_subpkgs=("${subpk...@]}")
rodepends=("${rodepen...@]}" "kmix=$_F_kde_ver")
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
