[arch-commits] Commit in kdepim/trunk (PKGBUILD fix-kalarm-issue-with-alarms.patch)

[Andrea Scarpino]

    Date: Friday, March 30, 2012 @ 12:15:24
  Author: andrea
Revision: 154727

KDE 4.8.2

Modified:
  kdepim/trunk/PKGBUILD
Deleted:
  kdepim/trunk/fix-kalarm-issue-with-alarms.patch

------------------------------------+
 PKGBUILD                           |   14 ++--------
 fix-kalarm-issue-with-alarms.patch |   48 -----------------------------------
 2 files changed, 4 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-30 16:15:21 UTC (rev 154726)
+++ PKGBUILD	2012-03-30 16:15:24 UTC (rev 154727)
@@ -19,24 +19,18 @@
          'kdepim-kresources'
          'kdepim-ktimetracker'
          'kdepim-libkdepim')
-pkgver=4.8.1
-pkgrel=3
+pkgver=4.8.2
+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/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'fix-kalarm-issue-with-alarms.patch')
-sha1sums=('93222d56f9adde015cb202a1ad3b194ac52e6bda'
-          'e9761e98fc5486a1a33cfa1eb122b54ca3446ded')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('1c3a459ef4d76e1247ac47816bf2b7ea6e37908a')
 
 build() {
-    # (FS#28891)
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-kalarm-issue-with-alarms.patch
-
     cd "${srcdir}"
 	mkdir build
 	cd build

Deleted: fix-kalarm-issue-with-alarms.patch
===================================================================
--- fix-kalarm-issue-with-alarms.patch	2012-03-30 16:15:21 UTC (rev 154726)
+++ fix-kalarm-issue-with-alarms.patch	2012-03-30 16:15:24 UTC (rev 154727)
@@ -1,48 +0,0 @@
-From: David Jarvie <djarvie at 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&a=commitdiff&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
-