Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 38 insertions, 34 deletions

diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index af28566e8..75d81567f 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -22,21 +22,27 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.9.5
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim-libre')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('a0d824dbb132cad8178767cfd881da2979ab399d')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
+             'kde-agent' 'nepomuk-widgets')
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz"
+        "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592")
+sha1sums=('61b74cb3bf541040e09252d4dcfaea8a876a2859'
+          '61a7e31e7daee3358c442d3ac5f74171b45ae2c9')
 
 build() {
+    patch -Np1 -d ${_pkgbase}-${pkgver} < ${srcdir}/kleopatra-build-fix.patch
+
 	mkdir build
 	cd build
 	cmake ../${_pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE4_BUILD_TESTS=OFF \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DKDEPIM_BUILD_MOBILE=OFF
@@ -44,8 +50,8 @@ build() {
 }
 
 package_kdepim-akonadiconsole-libre() {
-	pkgdesc='Akonadi Management and Debugging Console (without nonfree pilot-link support)'
-	depends=('kdepim-libkdepim')
+	pkgdesc='Akonadi Management and Debugging Console, without nonfree pilot-link support'
+	depends=('kdepim-libkdepim' 'nepomuk-widgets')
 	url='http://pim.kde.org'
 	replaces=('kdepim-akonadiconsole')
 	conflicts=('kdepim-akonadiconsole')
@@ -56,13 +62,13 @@ package_kdepim-akonadiconsole-libre() {
 }
 
 package_kdepim-akregator-libre() {
-	pkgdesc='A Feed Reader for KDE (without nonfree pilot-link support)'
+	pkgdesc='A Feed Reader for KDE, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/akregator/"
 	replaces=('kdepim-akregator')
 	conflicts=('kdepim-akregator')
 	provides=("kdepim-akregator=${pkgver}")
-	install='kdepim.install'
+	install='kdepim-akregator.install'
 	cd "${srcdir}"/build/akregator
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/akregator
@@ -72,7 +78,7 @@ package_kdepim-akregator-libre() {
 }
 
 package_kdepim-blogilo-libre() {
-	pkgdesc='A KDE Blogging Client (without nonfree pilot-link support)'
+	pkgdesc='A KDE Blogging Client, without nonfree pilot-link support'
 	depends=('kdepim-runtime')
 	url="http://kde.org/applications/internet/blogilo/"
 	replaces=('kdepim-blogilo' 'blogilo')
@@ -86,7 +92,7 @@ package_kdepim-blogilo-libre() {
 }
 
 package_kdepim-console-libre() {
-	pkgdesc='Command line tool for accessing calendar files (without nonfree pilot-link support)'
+	pkgdesc='Command line tool for accessing calendar files, without nonfree pilot-link support'
 	depends=('kdepim-runtime')
 	url='http://pim.kde.org'
 	replaces=('kdepim-console')
@@ -102,7 +108,7 @@ package_kdepim-console-libre() {
 }
 
 package_kdepim-kaddressbook-libre() {
-	pkgdesc='Contact Manager (without nonfree pilot-link support)'
+	pkgdesc='Contact Manager, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/kaddressbook/"
 	replaces=('kdepim-kaddressbook')
@@ -118,7 +124,7 @@ package_kdepim-kaddressbook-libre() {
 }
 
 package_kdepim-kalarm-libre() {
-	pkgdesc='Personal Alarm Scheduler (without nonfree pilot-link support)'
+	pkgdesc='Personal Alarm Scheduler, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/utilities/kalarm/"
 	replaces=('kdepim-kalarm')
@@ -132,7 +138,7 @@ package_kdepim-kalarm-libre() {
 }
 
 package_kdepim-kjots-libre() {
-	pkgdesc='Note Taker (without nonfree pilot-link support)'
+	pkgdesc='Note Taker, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/utilities/kjots/"
 	replaces=('kdepim-kjots')
@@ -148,7 +154,7 @@ package_kdepim-kjots-libre() {
 }
 
 package_kdepim-kleopatra-libre() {
-	pkgdesc='Certificate Manager and Unified Crypto GUI (without nonfree pilot-link support)'
+	pkgdesc='Certificate Manager and Unified Crypto GUI, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	install='kdepim-kleopatra.install'
 	url="http://kde.org/applications/utilities/kleopatra/"
@@ -164,7 +170,7 @@ package_kdepim-kleopatra-libre() {
 }
 
 package_kdepim-kmail-libre() {
-	pkgdesc='Mail Client (without nonfree pilot-link support)'
+	pkgdesc='Mail Client, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/kmail/"
 	install='kdepim-kmail.install'
@@ -173,16 +179,16 @@ package_kdepim-kmail-libre() {
 	replaces=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	          'kdepim-mimelib' 'kdepim-plugins')
 	provides=("kdepim-kmail=${pkgver}")
-	for i in kmail doc/kmail kmailcvt archivemailagent backupmail \
+	for i in kmail doc/kmail kmailcvt archivemailagent \
 	importwizard ksendemail libksieve messagelist mailfilteragent \
-	mailimporter ontologies kontact/plugins/kmail; do
+	ontologies kontact/plugins/kmail; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
 }
 
 package_kdepim-knode-libre() {
-	pkgdesc='News Reader (without nonfree pilot-link support)'
+	pkgdesc='News Reader, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/knode/"
 	replaces=('kdepim-knode')
@@ -200,7 +206,7 @@ package_kdepim-knode-libre() {
 }
 
 package_kdepim-knotes-libre() {
-	pkgdesc='Popup Notes (without nonfree pilot-link support)'
+	pkgdesc='Popup Notes, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/utilities/knotes/"
 	replaces=('kdepim-knotes')
@@ -216,7 +222,7 @@ package_kdepim-knotes-libre() {
 }
 
 package_kdepim-kontact-libre() {
-	pkgdesc='Personal Information Manager (without nonfree pilot-link support)'
+	pkgdesc='Personal Information Manager, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/kontact/"
 	install='kdepim.install'
@@ -231,7 +237,7 @@ package_kdepim-kontact-libre() {
 }
 
 package_kdepim-korganizer-libre() {
-	pkgdesc='Calendar and Scheduling Program (without nonfree pilot-link support)'
+	pkgdesc='Calendar and Scheduling Program, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/korganizer"
 	replaces=('kdepim-korganizer')
@@ -246,7 +252,7 @@ package_kdepim-korganizer-libre() {
 }
 
 package_kdepim-kresources-libre() {
-	pkgdesc='KDE PIM resources (without nonfree pilot-link support)'
+	pkgdesc='KDE PIM resources, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url='http://pim.kde.org'
 	replaces=('kdepim-kresources')
@@ -257,7 +263,7 @@ package_kdepim-kresources-libre() {
 }
 
 package_kdepim-ktimetracker-libre() {
-	pkgdesc='Personal Time Tracker (without nonfree pilot-link support)'
+	pkgdesc='Personal Time Tracker, without nonfree pilot-link support'
 	depends=('kdepim-kresources')
 	url="http://kde.org/applications/utilities/ktimetracker/"
 	replaces=('kdepim-ktimetracker')
@@ -268,12 +274,10 @@ package_kdepim-ktimetracker-libre() {
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/ktimetracker
 	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/ktimetracker
-	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-ktnef-libre() {
-	pkgdesc='A viewer/extractor for TNEF files (without nonfree pilot-link support)'
+	pkgdesc='A viewer/extractor for TNEF files, without nonfree pilot-link support'
 	depends=('kdebase-runtime' 'kdepimlibs')
 	url="https://projects.kde.org/projects/kde/kdepim/ktnef"
 	replaces=('kdepim-ktnef')
@@ -287,20 +291,20 @@ package_kdepim-ktnef-libre() {
 }
 
 package_kdepim-libkdepim-libre() {
-	pkgdesc='Library for KDE PIM (without nonfree pilot-link support)'
+	pkgdesc='Library for KDE PIM, without nonfree pilot-link support'
 	groups=()
 	depends=('kde-agent' 'kdepim-runtime')
 	url='http://pim.kde.org'
-	conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo'
-	           'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi')
-	replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo'
-	          'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi')
+	conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+                   'kdepim-strigi-analyzer' 'kdepim-akonadi')
+	replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+                   'kdepim-strigi-analyzer' 'kdepim-akonadi')
 	provides=("kdepim-libkdepim=${pkgver}")
 	for i in akonadi_next calendarsupport incidenceeditor-ng \
 	kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-	mailcommon messagecomposer messagecore messageviewer icons \
-	strigi-analyzer templateparser plugins/messageviewer \
-	plugins/ktexteditor; do
+	mailcommon mailimporter messagecomposer messagecore messageviewer \
+	icons strigi-analyzer templateparser plugins/messageviewer \
+	plugins/ktexteditor pimcommon pimsettingexporter; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done