Date: Thursday, July 26, 2012 @ 12:58:44 Author: andrea Revision: 164153
KDE 4.9.0 Added: kdeplasma-addons/trunk/ Modified: kdeplasma-addons/trunk/PKGBUILD Deleted: kdeplasma-addons/trunk/ kdeplasma-addons/trunk/fix-twitter-auth.patch ------------------------+ PKGBUILD | 14 ++++---------- fix-twitter-auth.patch | 40 ---------------------------------------- 2 files changed, 4 insertions(+), 50 deletions(-) Modified: trunk/PKGBUILD =================================================================== --- kde-unstable/PKGBUILD 2012-07-26 15:59:49 UTC (rev 164070) +++ trunk/PKGBUILD 2012-07-26 16:58:44 UTC (rev 164153) @@ -77,24 +77,18 @@ 'kdeplasma-addons-wallpapers-potd' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.8.97 -pkgrel=2 +pkgver=4.9.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'fix-twitter-auth.patch') -sha1sums=('b56299d2197c3b6007454644361671cd7157ba30' - 'dfe2260861047aba9c53c619bbfc2447490ebcc1') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('bf3f548c1a86b9aedee0ee2962b0b10aa27c9c05') build() { - cd ${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/fix-twitter-auth.patch - cd .. - mkdir build cd build cmake ../${pkgbase}-${pkgver} \ Deleted: trunk/fix-twitter-auth.patch =================================================================== --- kde-unstable/fix-twitter-auth.patch 2012-07-26 15:59:49 UTC (rev 164070) +++ trunk/fix-twitter-auth.patch 2012-07-26 16:58:44 UTC (rev 164153) @@ -1,40 +0,0 @@ -commit edc7699f4f4b6d9fc0568b031143cb653ae4294e -Author: Sebastian Kügler <se...@kde.org> -Date: Tue Jul 10 00:56:58 2012 +0200 - - fix authorization from twitter applet - - user in authorize() can be empty when it's already set in d->user, - respect that and successfully authorize. - - Thanks to phoenix_fbrd for finding this issue and the patch. - - REVIEW:105498 - BUG:302267 - - Please reopen the bug report if you still encounter crashes. - - Cherry-picked from 28f6d7cee7e81fda9ba396cc6477370a8ed3ada7 - -diff --git a/dataengines/microblog/koauth.cpp b/dataengines/microblog/koauth.cpp -index 565d79f..7566b95 100644 ---- a/dataengines/microblog/koauth.cpp -+++ b/dataengines/microblog/koauth.cpp -@@ -168,13 +168,15 @@ void KOAuth::run() - - void KOAuth::authorize(const QString &serviceBaseUrl, const QString &user, const QString &password) - { -- d->user = user; -+ if (!user.isEmpty()) { -+ d->user = user; -+ } - d->password = password; - d->serviceBaseUrl = serviceBaseUrl; - d->accessToken = QByteArray(); - d->accessTokenSecret = QByteArray(); - -- d->w->setUser(user); -+ d->w->setUser(d->user); - d->w->setServiceBaseUrl(serviceBaseUrl); - d->w->setPassword(password); -