Wed Aug 8 00:02:17 UTC 2012

3 files changed, 47 insertions, 20 deletions

diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index d130b2ccd..335a5de32 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161223 2012-06-08 06:38:20Z andrea $
+# $Id: PKGBUILD 164921 2012-08-06 23:20:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -19,19 +19,24 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-kresources'
          'kdepim-ktimetracker'
          'kdepim-libkdepim')
-pkgver=4.8.4
-pkgrel=1
+pkgver=4.9.0
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
              'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('aae8f027ab1ef75283d6e4b2bdf76c91d04087ea')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+        'fix-build.patch')
+sha1sums=('5c2f2ef3a3be118ad673ebe8b307bf7fe15bffbf'
+          '974056ad2c3a00b33a8ac9403b369ab636000832')
 
 build() {
-    cd "${srcdir}"
+    cd ${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-build.patch
+    cd ..
+
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
@@ -143,8 +148,8 @@ package_kdepim-kmail() {
 	           'kdepim-mimelib' 'kdepim-plugins')
 	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	          'kdepim-mimelib' 'kdepim-plugins')
-	for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
-		mailfilteragent ontologies kontact/plugins/kmail; do
+	for i in kmail doc/kmail kmailcvt importwizard ksendemail libksieve \
+        messagelist mailfilteragent mailimporter ontologies kontact/plugins/kmail; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -154,7 +159,7 @@ package_kdepim-knode() {
 	pkgdesc='News Reader'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/knode/"
-	install='kdepim.install'
+	install='kdepim-knode.install'
 	cd "${srcdir}"/build/knode
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/knode
@@ -183,8 +188,8 @@ package_kdepim-kontact() {
 	install='kdepim.install'
 	conflcits=('kdepim-kontactinterfaces')
 	replaces=('kdepim-kontactinterfaces')
-	for i in kontact/src doc/kontact \
-		kontact/plugins/summary kontact/plugins/specialdates; do
+	for i in kontact/src doc/kontact kontact/plugins/summary \
+		kontact/plugins/specialdates; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -195,12 +200,11 @@ package_kdepim-korganizer() {
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/korganizer"
 	install='kdepim-korganizer.install'
-	cd "${srcdir}"/build/korganizer
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/korganizer
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/korganizer
-	make DESTDIR="${pkgdir}" install
+	for i in korganizer doc/korganizer kontact/plugins/korganizer \
+		calendarviews; do
+		cd "${srcdir}"/build/${i} 
+		make DESTDIR="${pkgdir}" install
+	done
 }
 
 package_kdepim-kresources() {
@@ -233,11 +237,11 @@ package_kdepim-libkdepim() {
 	            'kdepim-strigi-analyzer' 'kdepim-akonadi')
 	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
 	          'kdepim-strigi-analyzer' 'kdepim-akonadi')
-	for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \
+	for i in akonadi_next calendarsupport incidenceeditor-ng \
 		kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-		messagecomposer messagecore messagelist messageviewer icons \
+		mailcommon messagecomposer messagecore messageviewer icons \
 		strigi-analyzer templateparser plugins/messageviewer \
-        plugins/ktexteditor; do
+		plugins/ktexteditor; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
diff --git a/extra/kdepim/fix-build.patch b/extra/kdepim/fix-build.patch
new file mode 100644
index 000000000..7060e814f
--- /dev/null
+++ b/extra/kdepim/fix-build.patch
@@ -0,0 +1,11 @@
+--- kdepim-4.9.0/kleopatra/CMakeLists.txt~	2012-07-30 08:06:15.031181647 +0000
++++ kdepim-4.9.0/kleopatra/CMakeLists.txt	2012-07-30 08:07:13.594082584 +0000
+@@ -365,7 +365,7 @@
+ endif(KDEPIM_MOBILE_UI)
+ 
+ add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
+-
++add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
+ 
+ kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png")
+ kde4_add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS} )
diff --git a/extra/kdepim/kdepim-knode.install b/extra/kdepim/kdepim-knode.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/extra/kdepim/kdepim-knode.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
+}