Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=caa897b58ff8a7189dd1fe1e6e56575d84ad9c62
commit caa897b58ff8a7189dd1fe1e6e56575d84ad9c62 Author: Melko <me...@frugalware.org> Date: Fri Sep 9 13:31:21 2011 +0200 koffice-2.3.3-3-i686 * rebuild with pstoedit-3.50-4 * fix splitting diff --git a/source/kde-extra/koffice/FrugalBuild b/source/kde-extra/koffice/FrugalBuild index b9cecfc..e4d861a 100644 --- a/source/kde-extra/koffice/FrugalBuild +++ b/source/kde-extra/koffice/FrugalBuild @@ -4,17 +4,17 @@ pkgname=koffice pkgver=2.3.3 -pkgrel=2 +pkgrel=3 pkgdesc="An integrated Office suite for KDE" url="http://www.koffice.org"; _F_kde_dirname="stable/$pkgname-latest" _F_kde_subpkgs_custom_path=1 Finclude kde depends=( ) -makedepends=("${makedepends[@]}" 'eigen' 'gmm' 'boost>=1.46.1' 'libspnav' "kdelibs-compiletime>=${_F_kde_ver}" 'ksgmltools2' \ - "kdelibs>=${_F_kde_ver}" "kdepimlibs>=${_F_kde_ver}" "kdegraphics>=${_F_kde_ver}" 'docbook-xsl') +makedepends=("${makedepends[@]}" 'eigen' 'gmm' 'boost>=1.46.1' 'libspnav' "kdepimlibs-compiletime>=${_F_kde_ver}" 'ksgmltools2' \ + "kdelibs>=${_F_kde_ver}" "kdepimlibs>=${_F_kde_ver}" "kdegraphics>=${_F_kde_ver}" 'docbook-xsl') groups=('kde-extra') -replaces=('keximdb' 'knoda') +replaces=('keximdb' 'knoda' 'kchart') provides=("${replaces[@]}") conflicts=("${replaces[@]}") archs=('i686' 'x86_64' 'ppc') @@ -70,7 +70,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') subpkgs=("${subpkgs[@]}" "karbon") subdescs=("${subdescs[@]}" "KOffice Vector Graphics Drawing Application") -subdepends=("${subdepends[@]}" "libgl poppler-qt4>=0.14.3 libwpg pstoedit") +subdepends=("${subdepends[@]}" "libgl poppler-qt4>=0.14.3 libwpg pstoedit>=3.50-4") subrodepends=("${subrodepends[@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") subgroups=("${subgroups[@]}" 'kde-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -82,13 +82,6 @@ subrodepends=("${subrodepends[@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver" subgroups=("${subgroups[@]}" 'kde-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') -subpkgs=("${subpkgs[@]}" "kchart") -subdescs=("${subdescs[@]}" "KOffice Chart Generator") -subdepends=("${subdepends[@]}" "libqtxml>=$_F_kde_qtver libqtgui>=$_F_kde_qtver libxext libgl") -subrodepends=("${subrodepends[@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") -subgroups=("${subgroups[@]}" 'kde-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') - subpkgs=("${subpkgs[@]}" "$pkgname-tools") subdescs=("${subdescs[@]}" "KOffice tools") subdepends=("${subdepends[@]}" "libqtgui>=$_F_kde_qtver libqtxml>=$_F_kde_qtver libxext libgl") @@ -124,9 +117,11 @@ subrodepends=("${subrodepends[@]}" "") subgroups=("${subgroups[@]}" 'docs-extra kde-docs') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') - build() { + export CFLAGS="$CFLAGS -w" + export CXXFLAGS="$CXXFLAGS -w" + KDE_make_split ## -libs subpackage -- libs* are all over the place _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
