[arch-commits] Commit in kdeplasma-addons/kde-unstable (2 files)

[Andrea Scarpino]

    Date: Monday, July 23, 2012 @ 14:06:08
  Author: andrea
Revision: 164000

Fix non-working Twitter authentication (KDEBUG#302267); remove RPATH

Added:
  kdeplasma-addons/kde-unstable/fix-twitter-auth.patch
Modified:
  kdeplasma-addons/kde-unstable/PKGBUILD

------------------------+
 PKGBUILD               |   14 ++++++++++----
 fix-twitter-auth.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-23 16:44:40 UTC (rev 163999)
+++ PKGBUILD	2012-07-23 18:06:08 UTC (rev 164000)
@@ -78,22 +78,28 @@
          '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
 }

Added: fix-twitter-auth.patch
===================================================================
--- fix-twitter-auth.patch	                        (rev 0)
+++ fix-twitter-auth.patch	2012-07-23 18:06:08 UTC (rev 164000)
@@ -0,0 +1,40 @@
+commit edc7699f4f4b6d9fc0568b031143cb653ae4294e
+Author: Sebastian Kügler <sebas at 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);
+