kdepim-libre-4.10.0-1: updating version

3 files changed, 48 insertions, 17 deletions

diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index af28566e8..f72efd2cd 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -22,21 +22,29 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.9.5
+pkgver=4.10.0
 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"
+        'boost152.patch')
+sha1sums=('6074fcea53b10c3660c5cc9a00b65e777840fdc4'
+          '652de82dcc1c45de3123898ba46e1962bb0ed6d4')
 
 build() {
+    cd ${_pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/boost152.patch
+    cd ../
+
 	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
@@ -45,7 +53,7 @@ build() {
 
 package_kdepim-akonadiconsole-libre() {
 	pkgdesc='Akonadi Management and Debugging Console (without nonfree pilot-link support)'
-	depends=('kdepim-libkdepim')
+	depends=('kdepim-libkdepim' 'nepomuk-widgets')
 	url='http://pim.kde.org'
 	replaces=('kdepim-akonadiconsole')
 	conflicts=('kdepim-akonadiconsole')
@@ -62,7 +70,7 @@ package_kdepim-akregator-libre() {
 	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
@@ -173,9 +181,9 @@ 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
@@ -268,8 +276,6 @@ 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() {
@@ -291,16 +297,16 @@ package_kdepim-libkdepim-libre() {
 	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
diff --git a/libre/kdepim-libre/boost152.patch b/libre/kdepim-libre/boost152.patch
new file mode 100644
index 000000000..c82b092f1
--- /dev/null
+++ b/libre/kdepim-libre/boost152.patch
@@ -0,0 +1,13 @@
+--- kdepim-4.10.0/kleopatra/models/keylistmodel.cpp~	2013-01-31 09:40:34.270651208 +0000
++++ kdepim-4.10.0/kleopatra/models/keylistmodel.cpp	2013-01-31 09:41:26.570259714 +0000
+@@ -60,9 +60,9 @@
+ #ifdef _WIN32_WCE
+ #define BOOST_ALL_NO_LIB
+ #endif
+-#include <boost/graph/adjacency_list.hpp>
+ 
+ #ifndef Q_MOC_RUN // QTBUG-22829
++#include <boost/graph/adjacency_list.hpp>
+ #include <boost/graph/topological_sort.hpp>
+ #endif
+ 
diff --git a/libre/kdepim-libre/kdepim-akregator.install b/libre/kdepim-libre/kdepim-akregator.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/libre/kdepim-libre/kdepim-akregator.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}