[leechcraft/f17] 0.5.65
Minh Ngo
ignotusp at fedoraproject.org
Thu Apr 26 20:52:47 UTC 2012
commit c225fdebc480d04f47c690283c72b9803f266f8a
Author: Minh Ngo <nlminhtl at gmail.com>
Date: Thu Apr 26 23:52:34 2012 +0300
0.5.65
.gitignore | 1 +
find_qxmpp.patch | 14 ---
leechcraft-for-gcc-4.7.0.patch | 176 +++++-----------------------------------
leechcraft.spec | 52 ++++++++++--
sources | 2 +-
5 files changed, 68 insertions(+), 177 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 74e82b7..c5bd930 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/leechcraft-0.5.60.tar.xz
+/leechcraft-0.5.65.tar.xz
diff --git a/leechcraft-for-gcc-4.7.0.patch b/leechcraft-for-gcc-4.7.0.patch
index 4dd4426..a784a4d 100644
--- a/leechcraft-for-gcc-4.7.0.patch
+++ b/leechcraft-for-gcc-4.7.0.patch
@@ -1,6 +1,6 @@
-diff -ru ../leechcraft-0.5.60/src/plugins/azoth/plugins/astrality/protowrapper.cpp ./src/plugins/azoth/plugins/astrality/protowrapper.cpp
---- ../leechcraft-0.5.60/src/plugins/azoth/plugins/astrality/protowrapper.cpp 2012-03-15 11:36:54.000000000 +0200
-+++ ./src/plugins/azoth/plugins/astrality/protowrapper.cpp 2012-03-18 01:34:32.377695230 +0200
+diff -ru ../leechcraft-0.5.65/src/plugins/azoth/plugins/astrality/protowrapper.cpp ./src/plugins/azoth/plugins/astrality/protowrapper.cpp
+--- ../leechcraft-0.5.65/src/plugins/azoth/plugins/astrality/protowrapper.cpp 2012-04-21 17:25:43.000000000 +0300
++++ ./src/plugins/azoth/plugins/astrality/protowrapper.cpp 2012-04-26 11:40:35.926342749 +0300
@@ -74,7 +74,7 @@
{
QVariantMap params;
@@ -10,134 +10,10 @@ diff -ru ../leechcraft-0.5.60/src/plugins/azoth/plugins/astrality/protowrapper.c
{
if (ProtoInfo_.hasParameter (param))
params [param] = value;
-diff -ru ../leechcraft-0.5.60/src/plugins/aggregator/core.cpp ./src/plugins/aggregator/core.cpp
---- ../leechcraft-0.5.60/src/plugins/aggregator/core.cpp 2012-03-15 11:36:54.000000000 +0200
-+++ ./src/plugins/aggregator/core.cpp 2012-03-17 18:03:16.728925270 +0200
-@@ -422,7 +422,7 @@
- channels_shorts_t channels;
- StorageBackend_->GetChannels (channels, feedId);
- std::for_each (channels.begin (), channels.end (),
-- [ChannelsModel_] (ChannelShort chan)
-+ [this] (ChannelShort chan)
- { ChannelsModel_->AddChannel (chan); });
- }
-
-diff -ru ../leechcraft-0.5.60/src/plugins/azoth/core.cpp ./src/plugins/azoth/core.cpp
---- ../leechcraft-0.5.60/src/plugins/azoth/core.cpp 2012-03-15 11:36:54.000000000 +0200
-+++ ./src/plugins/azoth/core.cpp 2012-03-17 18:15:55.419206463 +0200
-@@ -2373,7 +2373,7 @@
- Util::NotificationActionHandler *nh =
- new Util::NotificationActionHandler (e, this);
- nh->AddFunction (tr ("Open chat"),
-- [parentCL, ChatTabsManager_] () { ChatTabsManager_->OpenChat (parentCL); });
-+ [parentCL, this] () { ChatTabsManager_->OpenChat (parentCL); });
- nh->AddDependentObject (parentCL->GetObject ());
-
- emit gotEntity (e);
-@@ -2453,7 +2453,7 @@
- Util::NotificationActionHandler *nh =
- new Util::NotificationActionHandler (e, this);
- nh->AddFunction (tr ("Open chat"),
-- [entry, ChatTabsManager_] () { ChatTabsManager_->OpenChat (entry); });
-+ [entry, this] () { ChatTabsManager_->OpenChat (entry); });
- nh->AddDependentObject (entry->GetObject ());
-
- emit gotEntity (e);
-diff -ru ../leechcraft-0.5.60/src/plugins/azoth/msgformatterwidget.cpp ./src/plugins/azoth/msgformatterwidget.cpp
---- ../leechcraft-0.5.60/src/plugins/azoth/msgformatterwidget.cpp 2012-03-15 11:36:54.000000000 +0200
-+++ ./src/plugins/azoth/msgformatterwidget.cpp 2012-03-17 18:26:54.147910604 +0200
-@@ -235,25 +235,25 @@
-
- void MsgFormatterWidget::handleBold ()
- {
-- CharFormatActor ([FormatBold_] (QTextCharFormat *fmt)
-+ CharFormatActor ([this] (QTextCharFormat *fmt)
- { fmt->setFontWeight (FormatBold_->isChecked () ? QFont::Bold : QFont::Normal); });
- }
-
- void MsgFormatterWidget::handleItalic ()
- {
-- CharFormatActor ([FormatItalic_] (QTextCharFormat *fmt)
-+ CharFormatActor ([this] (QTextCharFormat *fmt)
- { fmt->setFontItalic (FormatItalic_->isChecked ()); });
- }
-
- void MsgFormatterWidget::handleUnderline ()
- {
-- CharFormatActor ([FormatUnderline_] (QTextCharFormat *fmt)
-+ CharFormatActor ([this] (QTextCharFormat *fmt)
- { fmt->setFontUnderline (FormatUnderline_->isChecked ()); });
- }
-
- void MsgFormatterWidget::handleStrikeThrough ()
- {
-- CharFormatActor ([FormatStrikeThrough_] (QTextCharFormat *fmt)
-+ CharFormatActor ([this] (QTextCharFormat *fmt)
- { fmt->setFontStrikeOut (FormatStrikeThrough_->isChecked ()); });
- }
-
-diff -ru ../leechcraft-0.5.60/src/plugins/azoth/plugins/vader/mrimbuddy.cpp ./src/plugins/azoth/plugins/vader/mrimbuddy.cpp
---- ../leechcraft-0.5.60/src/plugins/azoth/plugins/vader/mrimbuddy.cpp 2012-03-15 11:36:54.000000000 +0200
-+++ ./src/plugins/azoth/plugins/vader/mrimbuddy.cpp 2012-03-17 18:32:33.892514368 +0200
-@@ -327,7 +327,7 @@
-
- void MRIMBuddy::UpdateClientVersion ()
- {
-- auto defClient = [&ClientInfo_, this] ()
-+ auto defClient = [this] ()
- {
- ClientInfo_ ["client_type"] = "mailruagent";
- ClientInfo_ ["client_name"] = tr ("Mail.Ru Agent");
-
-diff -ru ../leechcraft-0.5.60/src/plugins/azoth/plugins/xoox/msgarchivingmanager.cpp ./src/plugins/azoth/plugins/xoox/msgarchivingmanager.cpp
---- ../leechcraft-0.5.60/src/plugins/azoth/plugins/xoox/msgarchivingmanager.cpp 2012-03-15 11:36:54.000000000 +0200
-+++ ./src/plugins/azoth/plugins/xoox/msgarchivingmanager.cpp 2012-03-17 19:30:33.102464125 +0200
-@@ -291,7 +291,7 @@
-
- Prefs_.AutoSave_ = autoSave.attribute ("save") == "true";
-
-- auto handleMeth = [&Prefs_] (const QDomElement& meth)
-+ auto handleMeth = [this] (const QDomElement& meth)
- {
- Prefs_.MethodPolicies_ [MethodConverter (meth.attribute ("type"))] =
- MethodPolicyConverter (meth.attribute ("use"));
-diff -ru ../leechcraft-0.5.60/src/plugins/azoth/plugins/xoox/roomhandler.cpp ./src/plugins/azoth/plugins/xoox/roomhandler.cpp
---- ../leechcraft-0.5.60/src/plugins/azoth/plugins/xoox/roomhandler.cpp 2012-03-15 11:36:54.000000000 +0200
-+++ ./src/plugins/azoth/plugins/xoox/roomhandler.cpp 2012-03-17 19:22:16.888949769 +0200
-@@ -52,7 +52,7 @@
- {
- const QString& server = jid.split ('@', QString::SkipEmptyParts).value (1);
- auto sdManager = Account_->GetClientConnection ()->GetSDManager ();
-- sdManager->RequestInfo ([&ServerDisco_] (const QXmppDiscoveryIq& iq)
-+ sdManager->RequestInfo ([this] (const QXmppDiscoveryIq& iq)
- { ServerDisco_ = iq; },
- server);
-
-diff -ru ../leechcraft-0.5.60/src/plugins/azoth/plugins/xoox/sdmanager.cpp ./src/plugins/azoth/plugins/xoox/sdmanager.cpp
---- ../leechcraft-0.5.60/src/plugins/azoth/plugins/xoox/sdmanager.cpp 2012-03-15 11:36:54.000000000 +0200
-+++ ./src/plugins/azoth/plugins/xoox/sdmanager.cpp 2012-03-17 19:25:31.005492464 +0200
-@@ -33,7 +33,7 @@
- void SDManager::RequestInfo (ClientConnection::DiscoCallback_t callback,
- const QString& jid, const QString& node)
- {
-- auto f = [Conn_] (const QString& jid, ClientConnection::DiscoCallback_t cb, const QString& node)
-+ auto f = [this] (const QString& jid, ClientConnection::DiscoCallback_t cb, const QString& node)
- { Conn_->RequestInfo (jid, cb, node); };
- CommonDo (Infos_, f, callback, jid, node);
- }
-@@ -41,7 +41,7 @@
- void SDManager::RequestItems (ClientConnection::DiscoCallback_t callback,
- const QString& jid, const QString& node)
- {
-- auto f = [Conn_] (const QString& jid, ClientConnection::DiscoCallback_t cb, const QString& node)
-+ auto f = [this] (const QString& jid, ClientConnection::DiscoCallback_t cb, const QString& node)
- { Conn_->RequestItems (jid, cb, node); };
- CommonDo (Items_, f, callback, jid, node);
- }
-diff -ru ../leechcraft-0.5.60/src/plugins/newlife/importers/psiplus/psiplusimportpage.cpp ./src/plugins/newlife/importers/psiplus/psiplusimportpage.cpp
---- ../leechcraft-0.5.60/src/plugins/newlife/importers/psiplus/psiplusimportpage.cpp 2012-03-15 11:36:54.000000000 +0200
-+++ ./src/plugins/newlife/importers/psiplus/psiplusimportpage.cpp 2012-03-17 19:54:32.184623933 +0200
-@@ -32,22 +32,27 @@
+diff -ru ../leechcraft-0.5.65/src/plugins/newlife/importers/psiplus/psiplusimportpage.cpp ./src/plugins/newlife/importers/psiplus/psiplusimportpage.cpp
+--- ../leechcraft-0.5.65/src/plugins/newlife/importers/psiplus/psiplusimportpage.cpp 2012-04-21 17:25:43.000000000 +0300
++++ ./src/plugins/newlife/importers/psiplus/psiplusimportpage.cpp 2012-04-26 11:47:36.218468755 +0300
+@@ -32,6 +32,14 @@
{
namespace Importers
{
@@ -152,12 +28,7 @@ diff -ru ../leechcraft-0.5.60/src/plugins/newlife/importers/psiplus/psiplusimpor
PsiPlusImportPage::PsiPlusImportPage (QWidget *parent)
: Common::IMImportPage (parent)
{
-- auto tfd = [] (const QDomElement& account, const QString& field)
-- { return account.firstChildElement (field).text (); };
--
- auto adapter = Common::XMLIMAccount::ConfigAdapter
- {
- AccountsModel_,
+@@ -44,10 +52,10 @@
QStringList (".config") << "Psi+" << "profiles",
"accounts.xml",
[] (const QDomElement&) { return "xmpp"; },
@@ -165,17 +36,17 @@ diff -ru ../leechcraft-0.5.60/src/plugins/newlife/importers/psiplus/psiplusimpor
- [tfd] (const QDomElement& acc) { return tfd (acc, "enabled") == "true"; },
- [tfd] (const QDomElement& acc) { return tfd (acc, "jid"); },
- [tfd] (const QDomElement& acc, QVariantMap& accountData)
-+ [] (const QDomElement& acc) { return tfd (acc, "name"); },
-+ [] (const QDomElement& acc) { return tfd (acc, "enabled") == "true"; },
-+ [] (const QDomElement& acc) { return tfd (acc, "jid"); },
-+ [] (const QDomElement& acc, QVariantMap& accountData)
++ [=] (const QDomElement& acc) { return tfd (acc, "name"); },
++ [=] (const QDomElement& acc) { return tfd (acc, "enabled") == "true"; },
++ [=] (const QDomElement& acc) { return tfd (acc, "jid"); },
++ [=] (const QDomElement& acc, QVariantMap& accountData)
{
accountData ["Port"] = tfd (acc, "port").toInt ();
accountData ["Host"] = tfd (acc, "use-host") == "true" ?
-diff -ru ../leechcraft-0.5.60/src/plugins/newlife/importers/vacuum/vacuumimportpage.cpp ./src/plugins/newlife/importers/vacuum/vacuumimportpage.cpp
---- ../leechcraft-0.5.60/src/plugins/newlife/importers/vacuum/vacuumimportpage.cpp 2012-03-15 11:36:54.000000000 +0200
-+++ ./src/plugins/newlife/importers/vacuum/vacuumimportpage.cpp 2012-03-17 19:55:40.825213517 +0200
-@@ -29,27 +29,32 @@
+diff -ru ../leechcraft-0.5.65/src/plugins/newlife/importers/vacuum/vacuumimportpage.cpp ./src/plugins/newlife/importers/vacuum/vacuumimportpage.cpp
+--- ../leechcraft-0.5.65/src/plugins/newlife/importers/vacuum/vacuumimportpage.cpp 2012-04-21 17:25:43.000000000 +0300
++++ ./src/plugins/newlife/importers/vacuum/vacuumimportpage.cpp 2012-04-26 11:48:18.613447435 +0300
+@@ -29,6 +29,14 @@
{
namespace Importers
{
@@ -190,28 +61,23 @@ diff -ru ../leechcraft-0.5.60/src/plugins/newlife/importers/vacuum/vacuumimportp
VacuumImportPage::VacuumImportPage (QWidget *parent)
: Common::IMImportPage (parent)
{
-- auto tfd = [] (const QDomElement& account, const QString& field)
-- { return account.firstChildElement (field).text (); };
--
- auto adapter = Common::XMLIMAccount::ConfigAdapter
- {
- AccountsModel_,
+@@ -41,15 +49,15 @@
QStringList (".vacuum") << "profiles",
"options.xml",
[] (const QDomElement&) { return "xmpp"; },
- [tfd] (const QDomElement& acc) { return tfd (acc, "name"); },
- [tfd] (const QDomElement& acc) { return tfd (acc, "active") == "true"; },
- [tfd] (const QDomElement& acc)
-+ [] (const QDomElement& acc) { return tfd (acc, "name"); },
-+ [] (const QDomElement& acc) { return tfd (acc, "active") == "true"; },
-+ [] (const QDomElement& acc)
++ [=] (const QDomElement& acc) { return tfd (acc, "name"); },
++ [=] (const QDomElement& acc) { return tfd (acc, "active") == "true"; },
++ [=] (const QDomElement& acc)
{
const auto& sjid = tfd (acc, "streamJid");
const int pos = sjid.indexOf ('/');
return pos < 0 ? sjid : sjid.left (pos);
},
- [tfd] (const QDomElement& acc, QVariantMap& accountData)
-+ [] (const QDomElement& acc, QVariantMap& accountData)
++ [=] (const QDomElement& acc, QVariantMap& accountData)
{
const QDomElement& conn = acc.firstChildElement ("connection");
diff --git a/leechcraft.spec b/leechcraft.spec
index a962dbc..f919b15 100644
--- a/leechcraft.spec
+++ b/leechcraft.spec
@@ -6,15 +6,14 @@
Name: leechcraft
Summary: A Cross-Platform Modular Internet-Client
-Version: 0.5.60
-Release: 5%{?dist}
+Version: 0.5.65
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Internet
Url: http://leechcraft.org
-Source0: http://freefr.dl.sourceforge.net/project/leechcraft/LeechCraft/0.5.60/leechcraft-0.5.60.tar.xz
+Source0: http://freefr.dl.sourceforge.net/project/leechcraft/LeechCraft/0.5.65/leechcraft-0.5.65.tar.xz
Source1: %{name}.desktop
-Patch1: find_qxmpp.patch
Patch2: defaultstyle.patch
Patch3: leechcraft-for-gcc-4.7.0.patch
@@ -49,7 +48,7 @@ BuildRequires: rb_libtorrent-devel >= 0.15.6
BuildRequires: aspell-devel
BuildRequires: aspell
BuildRequires: speex-devel
-BuildRequires: qxmpp-dev-devel >= 0.3.47
+BuildRequires: qxmpp-dev-devel >= 0.3.61
BuildRequires: GeoIP-devel
BuildRequires: qca2-devel
@@ -565,10 +564,30 @@ Requires: %{name}%{?_isa} = %{full_version}
%description tabsessmanager
This package contains Tab Session Manager for Leechcraft.
+%package dolozhee
+Summary: LeechCraft Bug Reporter Module
+Requires: %{name}%{?_isa} = %{full_version}
+
+%description dolozhee
+The feature request and bug reporter for LeechCraft IC.
+
+
+%package otlozhu
+Summary: GTD-inspired TODO Manager Module
+Requires: %{name}%{?_isa} = %{full_version}
+
+%description otlozhu
+GTD-inspired TODO manager module for Leechcraft IC.
+
+%package xproxy
+Summary: Proxy Manager Module
+Requires: %{name}%{?_isa} = %{full_version}
+
+%description xproxy
+The advanced proxy manager for Leechcraft IC.
%prep
%setup -qn %{name}-%{version}
-%patch1
%patch2
%patch3
@@ -608,6 +627,9 @@ pushd %{_target_platform}
-DENABLE_AZOTH_ZHEET=True \
-DENABLE_AZOTH_ASTRALITY=True \
-DENABLE_GACTS=False \
+ -DENABLE_OTLOZHU=True \
+ -DENABLE_DOLOZHEE=True \
+ -DENABLE_XPROXY=True \
../src
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -656,6 +678,7 @@ cat leechcraft_azoth*.lang > leechcraft_azoths.lang
%find_lang leechcraft_networkmonitor --with-qt --without-mo
%find_lang leechcraft_newlife --with-qt --without-mo
%find_lang leechcraft_popishu --with-qt --without-mo
+%find_lang leechcraft_xproxy --with-qt --without-mo
%find_lang leechcraft_poshuku_cleanweb --with-qt --without-mo
%find_lang leechcraft_poshuku_filescheme --with-qt --without-mo
@@ -672,7 +695,6 @@ cat leechcraft_poshuku*.lang > leechcraft_poshukus.lang
cat leechcraft_poshuku_onlinebookmarks*.lang > leechcraft_poshuku_onlinebookmarkss.lang
-
%find_lang leechcraft_seekthru --with-qt --without-mo
%find_lang leechcraft_shellopen --with-qt --without-mo
%find_lang leechcraft_summary --with-qt --without-mo
@@ -686,6 +708,8 @@ cat leechcraft_poshuku_onlinebookmarks*.lang > leechcraft_poshuku_onlinebookmark
%find_lang leechcraft_pintab --with-qt --without-mo
%find_lang leechcraft_lhtr --with-qt --without-mo
%find_lang leechcraft_tabsessmanager --with-qt --without-mo
+%find_lang leechcraft_otlozhu --with-qt --without-mo
+%find_lang leechcraft_dolozhee --with-qt --without-mo
%find_lang leechcraft_netstoremanager --with-qt --without-mo
%find_lang leechcraft_netstoremanager_yandexdisk --with-qt --without-mo
@@ -725,6 +749,16 @@ cat leechcraft_netstoremanager*.lang > leechcraft_netstoremanagers.lang
%{_libdir}/*lcutil.so
%{_libdir}/*xmlsettingsdialog.so
+%files otlozhu -f leechcraft_otlozhu.lang
+%{plugin_dir}/libleechcraft_otlozhu.so
+
+%files dolozhee -f leechcraft_dolozhee.lang
+%{plugin_dir}/libleechcraft_dolozhee.so
+
+%files xproxy -f leechcraft_xproxy.lang
+%{plugin_dir}/libleechcraft_xproxy.so
+%{settings_dir}/xproxysettings.xml
+
%files advancednotifications -f leechcraft_advancednotifications.lang
%{plugin_dir}/libleechcraft_advancednotifications.so
%{settings_dir}/advancednotificationssettings.xml
@@ -918,6 +952,10 @@ cat leechcraft_netstoremanager*.lang > leechcraft_netstoremanagers.lang
%{plugin_dir}/libleechcraft_tabsessmanager.so
%changelog
+* Wed Apr 25 2012 Minh Ngo <nlminhtl at gmail.com> 0.5.65-1
+- Adding bug reporter and GTD-inspired TODO manager plugins.
+- Other fixes http://leechcraft.org/leechcraft-0.5.65-is-released
+
* Sat Mar 24 2012 Minh Ngo <nlminhtl at gmail.com> 0.5.60-5
- Cleaning the spec file
diff --git a/sources b/sources
index 8794245..a7617a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c46093c465365bbcaff55a637ffda04 leechcraft-0.5.60.tar.xz
+cdd13070f1025e895a45960144029902 leechcraft-0.5.65.tar.xz
More information about the scm-commits
mailing list