From 9a940818cc3edb82afac4d73a6474e6e3374f987 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 17 Mar 2012 00:01:22 +0000
Subject: Sat Mar 17 00:01:22 UTC 2012

---
 extra/kdepim/PKGBUILD                           | 14 +++++---
 extra/kdepim/fix-kalarm-issue-with-alarms.patch | 48 +++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 extra/kdepim/fix-kalarm-issue-with-alarms.patch

(limited to 'extra/kdepim')

diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index cb4720e8e..df3436db7 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153196 2012-03-12 09:37:49Z andrea $
+# $Id: PKGBUILD 153547 2012-03-15 21:42:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,17 +20,23 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-libkdepim')
 pkgver=4.8.1
-pkgrel=2
+pkgrel=3
 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=('93222d56f9adde015cb202a1ad3b194ac52e6bda')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+        'fix-kalarm-issue-with-alarms.patch')
+sha1sums=('93222d56f9adde015cb202a1ad3b194ac52e6bda'
+          'e9761e98fc5486a1a33cfa1eb122b54ca3446ded')
 
 build() {
+    # (FS#28891)
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-kalarm-issue-with-alarms.patch
+
     cd "${srcdir}"
 	mkdir build
 	cd build
diff --git a/extra/kdepim/fix-kalarm-issue-with-alarms.patch b/extra/kdepim/fix-kalarm-issue-with-alarms.patch
new file mode 100644
index 000000000..a69778b06
--- /dev/null
+++ b/extra/kdepim/fix-kalarm-issue-with-alarms.patch
@@ -0,0 +1,48 @@
+From: David Jarvie <djarvie@kde.org>
+Date: Wed, 07 Mar 2012 22:08:50 +0000
+Subject: Fix error saving changed alarms when closing Edit Alarm dialogue
+X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&amp;a=commitdiff&amp;h=ae66e32fb194e01e06521c78e9c72d772d291261
+---
+Fix error saving changed alarms when closing Edit Alarm dialogue
+---
+
+
+--- a/kalarm/Changelog
++++ b/kalarm/Changelog
+@@ -1,6 +1,10 @@
+ KAlarm Change Log
+ 
+-=== Version 2.8.1 --- 19 February 2012 ===
++=== Version 2.8.2 --- 7 March 2012 ===
++- [Akonadi] Fix error saving changed alarms when closing Edit Alarm dialogue.
++- [Akonadi] Show old-format calendars in read-only colour in calendar list.
++
++=== Version 2.8.1 (KDE 4.8.1) --- 19 February 2012 ===
+ - [Akonadi] Don't give option to save new alarms in old format calendars.
+ - [Akonadi] Prevent duplicate prompts to update format of new calendar resource.
+ - [Akonadi] Automatically disable duplicated calendar resources.
+
+--- a/kalarm/akonadimodel.cpp
++++ b/kalarm/akonadimodel.cpp
+@@ -1284,7 +1284,7 @@ KAEvent AkonadiModel::event(const Item&
+     if (e.isValid())
+     {
+ 
+-        Collection c = data(index, ParentCollectionRole).value<Collection>();
++        Collection c = data(ix, ParentCollectionRole).value<Collection>();
+         // Set collection ID using a const method, to avoid unnecessary copying of KAEvent
+         e.setCollectionId_const(c.id());
+         if (collection)
+
+--- a/kalarm/kalarm.h
++++ b/kalarm/kalarm.h
+@@ -28,7 +28,7 @@
+ #else
+ #define VERSION_SUFFIX "-res"
+ #endif
+-#define KALARM_VERSION "2.8.1" VERSION_SUFFIX
++#define KALARM_VERSION "2.8.2" VERSION_SUFFIX
+ 
+ #define KALARM_NAME "KAlarm"
+ #define KALARM_DBUS_SERVICE  "org.kde.kalarm"  // D-Bus service name of KAlarm application
+
-- 
cgit v1.2.3-54-g00ecf