Hello community, here is the log from the commit of package choqok for openSUSE:Factory checked in at 2014-02-08 10:34:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/choqok (Old) and /work/SRC/openSUSE:Factory/.choqok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "choqok" Changes: -------- --- /work/SRC/openSUSE:Factory/choqok/choqok.changes 2013-09-07 07:31:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.choqok.new/choqok.changes 2014-02-08 10:34:04.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 6 12:44:53 UTC 2014 - [email protected] + +- Add choqok-1.4-twitter-favorities-fix.patch: fix bnc#862467. +- Add choqok-1.4-plugin-yourls-fix.patch: fix yourls shortener plugin, + kde#265219. + +------------------------------------------------------------------- New: ---- choqok-1.4-plugin-yourls-fix.patch choqok-1.4-twitter-favorities-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ choqok.spec ++++++ --- /var/tmp/diff_new_pack.Am8zdx/_old 2014-02-08 10:34:04.000000000 +0100 +++ /var/tmp/diff_new_pack.Am8zdx/_new 2014-02-08 10:34:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package choqok # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,11 @@ Group: Productivity/Networking/Other Url: http://choqok.gnufolks.org Source: http://downloads.sourceforge.net/project/choqok/Choqok/%{name}-%{version}.tar.xz +### TODO: Drop patch 0-1 with next choqok relese ( > 1.4) +# PATCH-FIX-UPSTREAM -- Fixed creating / destroying of twitter favorite tweets. +Patch0: choqok-1.4-twitter-favorities-fix.patch +# PATCH-FIX-UPSTREAM -- Fix for yourls shortener plugin +Patch1: choqok-1.4-plugin-yourls-fix.patch BuildRequires: fdupes BuildRequires: libkde4-devel BuildRequires: libqca2-devel @@ -49,6 +54,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %cmake_kde4 -d build ++++++ choqok-1.4-plugin-yourls-fix.patch ++++++ commit ea20cb680c0abce8da17db78859216deebc138f3 Author: Benjamin Marwell <[email protected]> Date: Mon Dec 30 09:48:18 2013 +0100 Fix Yourls plugin BUG:265219 REVIEW:114730 diff --git a/plugins/shorteners/yourls/yourls.cpp b/plugins/shorteners/yourls/yourls.cpp index 396550c..7bbeddf 100644 --- a/plugins/shorteners/yourls/yourls.cpp +++ b/plugins/shorteners/yourls/yourls.cpp @@ -57,6 +57,8 @@ QString Yourls::shorten( const QString &url ) reqUrl.addQueryItem( "action", "shorturl" ); /* set action to shorturl */ reqUrl.addQueryItem( "format", "xml" ); /* get result as xml */ reqUrl.addQueryItem( "url", KUrl( url ).url() ); /* url to be shorted */ + password = Choqok::PasswordManager::self()->readPassword( + QString("yourls_%1").arg(YourlsSettings::username())).toUtf8(); if( !YourlsSettings::username().isEmpty() ){ reqUrl.addQueryItem( "username", YourlsSettings::username() ); reqUrl.addQueryItem( "password", password ); ++++++ choqok-1.4-twitter-favorities-fix.patch ++++++ commit a93ae8bbd965d5e10c3088c8e94b1bc595037e48 Author: Daniel Kreuter <[email protected]> Date: Thu Jan 16 22:15:47 2014 +0100 Fixing twitter favorites. Fixed creating / destroying of twitter favorite tweets. CCBUG: 330037 diff --git a/helperlibs/twitterapihelper/twitterapimicroblog.cpp b/helperlibs/twitterapihelper/twitterapimicroblog.cpp index 0c1e9ac..8878eea 100644 --- a/helperlibs/twitterapihelper/twitterapimicroblog.cpp +++ b/helperlibs/twitterapihelper/twitterapimicroblog.cpp @@ -571,10 +571,13 @@ void TwitterApiMicroBlog::createFavorite ( Choqok::Account* theAccount, const QS KUrl url = account->apiUrl(); //url.addPath ( QString("/favorites/create.json?id=%1").arg(postId)); url.addPath ( "/favorites/create.json" ); - QByteArray data; - data = "id="; - data += postId.toLocal8Bit(); - KIO::StoredTransferJob *job = KIO::storedHttpPost ( data, url, KIO::HideProgressInfo ) ; + KUrl tmp(url); + url.addQueryItem("id", postId); + + QOAuth::ParamMap params; + params.insert("id", postId.toLatin1()); + + KIO::StoredTransferJob *job = KIO::storedHttpPost ( QByteArray(), url, KIO::HideProgressInfo ) ; if ( !job ) { kDebug() << "Cannot create an http POST request!"; // QString errMsg = i18n ( "The Favorite creation failed. Cannot create an http POST request. " @@ -582,7 +585,7 @@ void TwitterApiMicroBlog::createFavorite ( Choqok::Account* theAccount, const QS // emit error ( theAccount, OtherError, errMsg ); return; } - job->addMetaData("customHTTPHeader", "Authorization: " + authorizationHeader(account, url, QOAuth::POST)); + job->addMetaData("customHTTPHeader", "Authorization: " + authorizationHeader(account, tmp, QOAuth::POST, params)); mFavoriteMap[job] = postId; mJobsAccount[job] = theAccount; connect ( job, SIGNAL ( result ( KJob* ) ), this, SLOT ( slotCreateFavorite ( KJob* ) ) ); @@ -619,10 +622,14 @@ void TwitterApiMicroBlog::removeFavorite ( Choqok::Account* theAccount, const QS TwitterApiAccount* account = qobject_cast<TwitterApiAccount*>(theAccount); KUrl url = account->apiUrl(); url.addPath ( "/favorites/destroy.json" ); - QByteArray data; - data = "id="; - data += postId.toLocal8Bit(); - KIO::StoredTransferJob *job = KIO::storedHttpPost ( data, url, KIO::HideProgressInfo ) ; + + KUrl tmp(url); + url.addQueryItem("id", postId); + + QOAuth::ParamMap params; + params.insert("id", postId.toLatin1()); + + KIO::StoredTransferJob *job = KIO::storedHttpPost ( QByteArray(), url, KIO::HideProgressInfo ) ; if ( !job ) { kDebug() << "Cannot create an http POST request!"; // QString errMsg = i18n ( "Removing the favorite failed. Cannot create an http POST request. " @@ -630,7 +637,7 @@ void TwitterApiMicroBlog::removeFavorite ( Choqok::Account* theAccount, const QS // emit error ( theAccount, OtherError, errMsg ); return; } - job->addMetaData("customHTTPHeader", "Authorization: " + authorizationHeader(account, url, QOAuth::POST)); + job->addMetaData("customHTTPHeader", "Authorization: " + authorizationHeader(account, tmp, QOAuth::POST, params)); mFavoriteMap[job] = postId; mJobsAccount[job] = theAccount; connect ( job, SIGNAL ( result ( KJob* ) ), this, SLOT ( slotRemoveFavorite ( KJob* ) ) ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
