Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=529ba859017d98e53a86377690a32cdce97c4e83
commit 529ba859017d98e53a86377690a32cdce97c4e83
Author: Michel Hermier
Date: Mon Aug 8 15:26:55 2011 +0200
kate-4.7.0-2-i686
* Lets hope this split way suck less (there was a dependency loop
before)
diff --git a/source/include/kde.sh b/source/include/kde.sh
index 07c052f..7a095f5 100644
--- a/source/include/kde.sh
+++ b/source/include/kde.sh
@@ -211,7 +211,7 @@ KDE_path_install()
# * KDE_project_install: Install a specific package. Parameters: 1) Name of the
# project. 2) path of the project (optional).
###
-KDE_project_install()
+__KDE_project_install()
{
local fail=1 path="${2:-$1}"
local -a paths
@@ -221,6 +221,7 @@ KDE_project_install()
"apps/lib/$path"
"experimental/$path"# for kdebase-runtime
"filters/$path" # for koffice
+ "interfaces/$path" # for kdelibs
"lib/$path"
"libs/$path"
)
@@ -258,6 +259,33 @@ KDE_project_install()
return $fail
}
+KDE_project_install()
+{
+ ## we use for weird or not logical names
+ ## $pkgname-
+ local path="${2:-$1}"
+ local clean="$(eval "echo -n \"\${path/#$pkgname-/}"\")" # Remove front
"$pkgname-"
+ if [ "$path" != "$clean" ] && \
+ KDE_project_install "$1" "$clean"; then
+ return 0
+ fi
+
+ if __KDE_project_install "$1" "${path}"; then
+ return 0
+ fi
+ if __KDE_project_install "$1" "${path//-//}"; then # Transform "-" into
"/"
+ return 0
+ fi
+
+ clean="${path/#lib/}" # Remove front "lib"
+ if [ "$path" != "$clean" ] && \
+ KDE_project_install "$1" "$clean"; then
+ return 0
+ fi
+
+ return 1
+}
+
###
# * KDE_project_split(): Moves a KDE project to a subpackage. Parameters:
# 1) name of the subpackage 2) Name of the project (see KDE_project_install).
@@ -294,33 +322,6 @@ __kde_find_split_files()
# subdirectory project. Example: "kdelibs-kioslave-ftp" would search for
# kioslave/ftp project subdir.
###
-__KDE_split()
-{
- ## we use for weird or not logical names
- ## $pkgname-
- local path="${2:-$1}"
- local clean="$(eval "echo -n \"\${path/#$pkgname-/}"\")" # Remove front
"$pkgname-"
- if [ "$path" != "$clean" ] && \
- __KDE_split "$1" "$clean"; then
- return 0
- fi
-
- if KDE_project_install "$1" "${path}"; then
- return 0
- fi
- if KDE_project_install "$1" "${path//-//}"; then # Transform "-" into
"/"
- return 0
- fi
-
- clean="${path/#lib/}" # Remove front "lib"
- if [ "$path" != "$clean" ] && \
- __KDE_split "$1" "$clean"; then
- return 0
- fi
-
- return 1
-}
-
KDE_split()
{
local i
@@ -337,7 +338,7 @@ KDE_split()
esac
Fmessage "Splitting $i"
- if __KDE_split "$i"; then
+ if KDE_project_install "$i"; then
KDE_cleanup
Fsplit "$i" /\*
else
diff --git a/source/kde-extra/kate/FrugalBuild
b/source/kde-extra/kate/FrugalBuild
index 318b506..7723761 100644
--- a/source/kde-extra/kate/FrugalBuild
+++ b/source/kde-extra/kate/FrugalBuild
@@ -2,39 +2,56 @@
# Maintainer: centuri0
pkgname=kate
-pkgrel=1
+pkgrel=2
pkgdesc="Advanced Text Editor."
groups=('kde-extra')
archs=('i686' 'x86_64' 'ppc')
Finclude kde
-depends=("kdelibs>=$_F_kde_ver" "libqtdeclarative>=$_F_kde_qtver")
+depends=("libqtdeclarative>=$_F_kde_qtver")
+rodepends=("kdelibs-core>=$_F_kde_ver libkdekate>=$_F_kde_ver")
makedepends=("${makedepends[@]}" "kdelibs-compiletime>=$_F_kde_ver" \
- "ksgmltools2>=$_F_kde_ver" "kdelibs-interfaces>=$_F_kde_ver"
"libqttest>=$_F_kde_qtver")
+ "ksgmltools2>=$_F_kde_ver" "libqttest>=$_F_kde_qtver")
+
+subpkgs=("${subpkgs[@]}" "kate-plasma")
+subdescs=("${subdescs[@]}" "Kate plasmoid.")
+subdepends=("${subdepends[@]}" "libplasma>=$_F_kde_ver")
+subrodepends=("${subrodepends[@]}" "libkdekate>=$_F_kde_ver")
+subgroups=("${subgroups[@]}" 'kde-extra')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
subpkgs=("${subpkgs[@]}" "kwrite")
subdescs=("${subdescs[@]}" "Text Editor.")
-subdepends=("${subdepends[@]}" "libnepomuk>=$_F_kde_ver
kdelibs-interfaces>=$_F_kde_ver libqtgui>=$_F_kde_qtver
libqtdbus>=$_F_kde_qtver libqtnetwork>=$_F_kde_qtver")
-subrodepends=("${subrodepends[@]}" '')
+subdepends=("${subdepends[@]}" "")
+subrodepends=("${subrodepends[@]}" "kdelibs-core>=$_F_kde_ver
libkdekate>=$_F_kde_ver")
subgroups=("${subgroups[@]}" 'kde')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
_F_kde_subpkgs=("${subpkgs[@]}")
+subpkgs=("${subpkgs[@]}" "kate-interfaces")
+subdescs=("${subdescs[@]}" "Kparts interfaces for kate.")
+subdepends=("${subdepends[@]}" "")
+subrodepends=("${subrodepends[@]}" "kdelibs-interfaces>=$_F_kde_ver")
+subgroups=("${subgroups[@]}" 'kde')
+subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
+
subpkgs=("${subpkgs[@]}" "libkdekate")
subdescs=("${s
