diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
| commit | 61b68fb9fca39dda7e4b48c5af9567dc60ea3dd2 (patch) | |
| tree | 6b8b6fb14ede5aae651e92f593252dba143cee74 /extra/kdepim | |
| parent | ca998b4c054452abed4e01be1d2b28fee0ca904f (diff) | |
| parent | 5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/coq/PKGBUILD
community/ldns/PKGBUILD
community/luxrays/PKGBUILD
community/luxrender/PKGBUILD
community/nut/PKGBUILD
community/root/PKGBUILD
community/swi-prolog/PKGBUILD
community/vtk/PKGBUILD
community/wings3d/wings3d.sh
core/sqlite3/PKGBUILD
core/tzdata/PKGBUILD
extra/cmus/PKGBUILD
extra/dcron/PKGBUILD
extra/farsight2/PKGBUILD
extra/foomatic/PKGBUILD
extra/fwbuilder/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/ivtv-utils/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/koffice/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/openmpi/PKGBUILD
extra/telepathy-butterfly/PKGBUILD
extra/telepathy-farsight/PKGBUILD
extra/telepathy-kde-presence-dataengine/PKGBUILD
extra/telepathy-qt4/PKGBUILD
extra/xfce-utils/PKGBUILD
extra/xulrunner/PKGBUILD
multilib/lib32-zlib/PKGBUILD
staging/gimp-devel/gimp-devel.install
testing/gtk3/PKGBUILD
testing/php/PKGBUILD
~xihh/couchdb-git/couchdb.install
~xihh/couchdb-git/rc-script.patch
~xihh/gmime24/PKGBUILD
Diffstat (limited to 'extra/kdepim')
| -rw-r--r-- | extra/kdepim/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/kdepim/fix-kalarm-issue-with-alarms.patch | 48 |
2 files changed, 3 insertions, 51 deletions
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 0aa684fea..e8600f9ce 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155649 2012-04-04 14:16:56Z andrea $ +# $Id: PKGBUILD 158487 2012-05-03 22:34:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -19,7 +19,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-kresources' 'kdepim-ktimetracker' 'kdepim-libkdepim') -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -28,7 +28,7 @@ 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=('1c3a459ef4d76e1247ac47816bf2b7ea6e37908a') +sha1sums=('1d40a820fc343bd6c492e937b9da2e7226cd3e78') build() { cd "${srcdir}" diff --git a/extra/kdepim/fix-kalarm-issue-with-alarms.patch b/extra/kdepim/fix-kalarm-issue-with-alarms.patch deleted file mode 100644 index a69778b06..000000000 --- a/extra/kdepim/fix-kalarm-issue-with-alarms.patch +++ /dev/null @@ -1,48 +0,0 @@ -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&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 - |