Thu Nov 22 02:27:52 PST 2012

4 files changed, 82 insertions, 54 deletions

diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD
index 9fe9c9e66..b3d8d37c8 100644
--- a/kde-unstable/kdepim/PKGBUILD
+++ b/kde-unstable/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163528 2012-07-14 14:11:27Z andrea $
+# $Id: PKGBUILD 171840 2012-11-21 19:56:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -18,20 +18,26 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-korganizer'
          'kdepim-kresources'
          'kdepim-ktimetracker'
+         'kdepim-ktnef'
          'kdepim-libkdepim')
-pkgver=4.8.97
-pkgrel=2
+pkgver=4.9.80
+pkgrel=1
 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/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('9bd4594ec3151f3cfb6a45d6163405bde4d8b178')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+        'fix-build.patch')
+sha1sums=('c139bfb4fc4a39c270de4fea75790fe12cefc89c'
+          '974056ad2c3a00b33a8ac9403b369ab636000832')
 
 build() {
-    cd "${srcdir}"
+    cd ${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-build.patch
+    cd ..
+
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
@@ -44,7 +50,7 @@ build() {
 
 package_kdepim-akonadiconsole() {
 	pkgdesc='Akonadi Management and Debugging Console'
-	depends=('kdepim-libkdepim')
+	depends=('kdepim-libkdepim' 'nepomuk-widgets')
 	url='http://pim.kde.org'
 	install='kdepim.install'
 	cd "${srcdir}"/build/akonadiconsole
@@ -55,7 +61,7 @@ package_kdepim-akregator() {
 	pkgdesc='A Feed Reader for KDE'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/akregator/"
-	install='kdepim.install'
+	install='kdepim-akregator.install'
 	cd "${srcdir}"/build/akregator
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/akregator
@@ -84,6 +90,10 @@ package_kdepim-console() {
 	install='kdepim.install'
 	cd "${srcdir}"/build/console
 	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kabcclient
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/konsolekalendar
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kaddressbook() {
@@ -132,6 +142,8 @@ package_kdepim-kleopatra() {
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/kleopatra
 	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kwatchgnupg
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kmail() {
@@ -143,8 +155,9 @@ 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 \
-		mailfilteragent mailimporter ontologies kontact/plugins/kmail; do
+	for i in kmail doc/kmail kmailcvt archivemailagent \
+	importwizard ksendemail libksieve messagelist mailfilteragent \
+	ontologies kontact/plugins/kmail; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -159,6 +172,8 @@ package_kdepim-knode() {
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/knode
 	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kioslave/news
+	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/kontact/plugins/knode
 	make DESTDIR="${pkgdir}" install
 }
@@ -183,8 +198,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 doc/kontact-admin; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -195,12 +210,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() {
@@ -224,6 +238,17 @@ package_kdepim-ktimetracker() {
 	make DESTDIR="${pkgdir}" install
 }
 
+package_kdepim-ktnef() {
+	pkgdesc='A viewer/extractor for TNEF files'
+	depends=('kdebase-runtime' 'kdepimlibs')
+	url="https://projects.kde.org/projects/kde/kdepim/ktnef"
+    install=kdepim-ktnef.install
+	cd "${srcdir}"/build/ktnef
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/ktnef
+	make DESTDIR="${pkgdir}" install	
+}
+
 package_kdepim-libkdepim() {
 	pkgdesc='Library for KDE PIM'
 	groups=()
@@ -233,11 +258,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 \
-		kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-		messagecomposer messagecore messagelist messageviewer icons \
-		strigi-analyzer templateparser plugins/messageviewer \
-        plugins/ktexteditor mailcommon; do
+	for i in akonadi_next calendarsupport incidenceeditor-ng \
+	kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
+	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/kde-unstable/kdepim/fix-build.patch b/kde-unstable/kdepim/fix-build.patch
index b42046677..7060e814f 100644
--- a/kde-unstable/kdepim/fix-build.patch
+++ b/kde-unstable/kdepim/fix-build.patch
@@ -1,32 +1,11 @@
-From: Allen Winter <winter@kde.org>
-Date: Thu, 31 May 2012 16:58:07 +0000
-Subject: Revert last: Remove X11 requirement
-X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&amp;a=commitdiff&amp;h=26f9d62b9a9b4bfa736b342903d16dc0d8739d98
----
-Revert last: Remove X11 requirement
-
-CCMAIL: djarvie@kde.org
-David, without explicit linking to X11 libs, I get an unresolved
-symbol for XSetWMHints
----
-
-
---- a/kalarm/CMakeLists.txt
-+++ b/kalarm/CMakeLists.txt
-@@ -202,6 +202,7 @@ if(KALARM_USE_AKONADI)
-         kdepim
-         ${KDE4_KCMUTILS_LIBS}
-         ${KDE4_PHONON_LIBS}
-+        ${X11_X11_LIB}
-     )
- else(KALARM_USE_AKONADI)
-     target_link_libraries(kalarm_bin
-@@ -220,6 +221,7 @@ else(KALARM_USE_AKONADI)
-         kdepim
-         ${KDE4_KCMUTILS_LIBS}
-         ${KDE4_PHONON_LIBS}
-+        ${X11_X11_LIB}
-     )
- endif(KALARM_USE_AKONADI)
+--- 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/kde-unstable/kdepim/kdepim-akregator.install b/kde-unstable/kdepim/kdepim-akregator.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/kde-unstable/kdepim/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
+}
diff --git a/kde-unstable/kdepim/kdepim-ktnef.install b/kde-unstable/kdepim/kdepim-ktnef.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/kde-unstable/kdepim/kdepim-ktnef.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
+}