Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=73c30fe979dad20011ec2ca7a8dcc9fd0aecaec2
commit 73c30fe979dad20011ec2ca7a8dcc9fd0aecaec2 Merge: 412fd36 35a9129 Author: DeX77 <[email protected]> Date: Thu Feb 25 12:42:21 2016 +0100 Merge ../current Conflicts: source/include/kde-version.sh source/kde/baloo/FrugalBuild source/kde/kfilemetadata/FrugalBuild diff --cc source/include/kde-version.sh index 04e07a8,e1b6a89..7839fe9 --- a/source/include/kde-version.sh +++ b/source/include/kde-version.sh @@@ -20,8 -20,7 +20,8 @@@ _F_kdever_ver=4.14.3 _F_kdever_frameworks=5.8 _F_kdever_frameworks_revision=0 +_F_kdever_plasma=5.0.1 - _F_kdever_qt=4.8.6 + _F_kdever_qt=4.8.7-2 _F_kdever_qt5=5.3.1 # Must be done in 2 lines else bash barfs on the floor diff --cc source/kde/baloo/FrugalBuild index 2c61c5c,a7765a8..f307b50 --- a/source/kde/baloo/FrugalBuild +++ b/source/kde/baloo/FrugalBuild @@@ -8,9 -6,13 +6,14 @@@ pkgrel= pkgdesc="A framework for searching and managing metadata." groups=('kde') archs=('i686' 'x86_64') +_F_kde_project="plasma" Finclude kde - depends=("kfilemetadata>=$_F_kde_ver" "kidletime>=$_F_kde_ver" "kdelibs4support>=$_F_kde_ver" 'xapian-core') - makedepends=("${makedepends[@]}" 'qt5-plugin-odbc' 'qt5-plugin-tds' 'qt5-plugin-sqlite2' 'qt5-plugin-ibase' 'qt5-plugin-psql' 'qt5-plugin-sqlite3' 'qt5-plugin-mysql' 'kdoctools' 'kemoticons' 'kitemmodels' 'kinit' 'kcmutils') + depends=("${depends[@]}" 'xapian-core' "kfilemetadata>=$_F_kde_ver" "libkdewebkit>=$_F_kde_ver" \ + "libqtdeclarative>=$_F_kde_qtver" "libplasma>=$_F_kde_ver" "libakonadi>=$_F_kde_ver") + makedepends=("${makedepends[@]}" "kdelibs>=$_F_kde_ver" "kdepimlibs-compiletime>=$_F_kde_ver" "kdepimlibs>=$_F_kde_ver" 'boost>=1.58.0') + + replaces=('kdebase-runtime-nepomuk') + conflicts=("${replaces[@]}") + provides=("${replaces[@]}") # optimization OK diff --cc source/kde/kfilemetadata/FrugalBuild index 3056212,d89572a..5fa3ccd --- a/source/kde/kfilemetadata/FrugalBuild +++ b/source/kde/kfilemetadata/FrugalBuild @@@ -1,15 -1,13 +1,14 @@@ -# Compiling Time: 0.3 SBU +# Compiling Time: 0.44 SBU # Maintainer: Melko <[email protected]> - options+=('asneeded') - pkgname=kfilemetadata - pkgrel=3 + pkgrel=5 pkgdesc="A library for extracting file metadata." groups=('kde') archs=('i686' 'x86_64') +_F_kde_project="plasma" Finclude kde - depends=("karchive>=$_F_kde_ver" "kservice>=$_F_kde_ver" "taglib" "exiv2" "ffmpeg" "ebook-tools" "poppler-qt5") + depends=("${depends[@]}" "libkdecore>=${_F_kde_ver}" "poppler-qt4" "ebook-tools" "ffmpeg>=2.5.1" "taglib" "exiv2>=0.25") + makedepends=("${makedepends[@]}" "kdelibs-compiletime>=$_F_kde_ver" "kdelibs>=$_F_kde_ver") # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
