Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2012-04-02 19:49:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomahawk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes 2012-03-08 19:46:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2012-04-02 19:52:43.000000000 +0200 @@ -2 +2,8 @@ -Wed Mar 7 16:39:58 UTC 2012 - [email protected] +Sun Mar 18 19:18:03 UTC 2012 - [email protected] + +- fix build with QTweetLib 0.5 +- restart a failed build with a single make job so the error + is easier to spot + +------------------------------------------------------------------- +Wed Mar 7 16:39:58 UTC 2012 - [email protected] New: ---- tomahawk-0.4.0-use-qtweetlib-0.5-api.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomahawk.spec ++++++ --- /var/tmp/diff_new_pack.cJZm44/_old 2012-04-02 19:52:47.000000000 +0200 +++ /var/tmp/diff_new_pack.cJZm44/_new 2012-04-02 19:52:47.000000000 +0200 @@ -30,6 +30,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://gettomahawk.com +# PATCH-FIX-UPSTREAM patch is taken from upstream and will be part of the 0.4.1 release +Patch0: tomahawk-0.4.0-use-qtweetlib-0.5-api.diff + BuildRequires: cmake BuildRequires: gcc-c++ @@ -77,6 +80,7 @@ %prep %setup -q -n tomahawk-%{version} +%patch0 -p1 %build cmake . \ @@ -88,7 +92,7 @@ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DBUILD_RELEASE=ON -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %make_install ++++++ tomahawk-0.4.0-use-qtweetlib-0.5-api.diff ++++++ diff --git a/README b/README index 65df9b0..a00401e 100644 --- a/README +++ b/README @@ -40,7 +40,7 @@ Dependencies Attica 0.2.0 - ftp://ftp.kde.org/pub/kde/stable/attica/ Jreen 1.0.1 - https://github.com/euroelessar/jreen - QTweetLib 0.3.0 - https://github.com/minimoog/QTweetLib + QTweetLib 0.5.0 - https://github.com/minimoog/QTweetLib Third party libraries that we ship with our source: diff --git a/src/sip/twitter/tomahawkoauthtwitter.cpp b/src/sip/twitter/tomahawkoauthtwitter.cpp index 35cd98a..c70f669 100644 --- a/src/sip/twitter/tomahawkoauthtwitter.cpp +++ b/src/sip/twitter/tomahawkoauthtwitter.cpp @@ -12,15 +12,15 @@ TomahawkOAuthTwitter::TomahawkOAuthTwitter( QNetworkAccessManager *nam, QObject* } -int +const QString TomahawkOAuthTwitter::authorizationWidget() { bool ok; - int i = QInputDialog::getInt(0, tr( "Twitter PIN" ), tr( "After authenticating on Twitter's web site,\nenter the displayed PIN number here:" ), 0, 0, 2147483647, 1, &ok); - if (ok) - return i; + const QString str = QInputDialog::getText(0, tr( "Twitter PIN" ), tr( "After authenticating on Twitter's web site,\nenter the displayed PIN number here:" ), QLineEdit::Normal, QString(), &ok); + if ( ok && !str.isEmpty() ) + return str; - return 0; + return QString(); } void diff --git a/src/sip/twitter/tomahawkoauthtwitter.h b/src/sip/twitter/tomahawkoauthtwitter.h index 6b1a754..a1cd533 100644 --- a/src/sip/twitter/tomahawkoauthtwitter.h +++ b/src/sip/twitter/tomahawkoauthtwitter.h @@ -16,7 +16,7 @@ public: ~TomahawkOAuthTwitter() {} protected: - virtual int authorizationWidget(); + virtual const QString authorizationWidget(); private slots: void error(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
