diff options
| author | root <root@rshg054.dnsready.net> | 2012-07-25 00:01:50 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-07-25 00:01:50 +0000 |
| commit | 3083719ddb24bbb452e7ddba34bec067ea249056 (patch) | |
| tree | a58a0e0514c39ae78d2647423b3d54a9ab411bbb /kde-unstable/kdeplasma-addons | |
| parent | 7edfd82786e7d1efd8d39d2e5bbcaddeb2d665e1 (diff) | |
Wed Jul 25 00:01:50 UTC 2012
Diffstat (limited to 'kde-unstable/kdeplasma-addons')
| -rw-r--r-- | kde-unstable/kdeplasma-addons/PKGBUILD | 16 | ||||
| -rw-r--r-- | kde-unstable/kdeplasma-addons/fix-twitter-auth.patch | 40 |
2 files changed, 51 insertions, 5 deletions
diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD index 2dff87e44..c04acefae 100644 --- a/kde-unstable/kdeplasma-addons/PKGBUILD +++ b/kde-unstable/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163433 2012-07-11 22:52:14Z andrea $ +# $Id: PKGBUILD 164003 2012-07-23 18:40:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -78,22 +78,28 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.8.97 -pkgrel=1 +pkgrel=2 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") -sha1sums=('b56299d2197c3b6007454644361671cd7157ba30') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" + 'fix-twitter-auth.patch') +sha1sums=('b56299d2197c3b6007454644361671cd7157ba30' + 'dfe2260861047aba9c53c619bbfc2447490ebcc1') build() { - cd "${srcdir}" + cd ${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-twitter-auth.patch + cd .. + mkdir build cd build cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch b/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch new file mode 100644 index 000000000..0a55ce6ce --- /dev/null +++ b/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch @@ -0,0 +1,40 @@ +commit edc7699f4f4b6d9fc0568b031143cb653ae4294e +Author: Sebastian Kügler <sebas@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); + |