Tagged v2.2.5 release

Dropped dependency on Qt gif library

Changelog

@@ -1,3 +1,25 @@
+* Wed Apr 07 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.5
+    - BUGFIX: Fix crash when adding a new torrent label
+    - BUGFIX: Fix HTTPS protocol support in torrent/rss downloader
+    - BUGFIX: Fix default width of file name column in torrent content
+    - BUGFIX: Fix torrent addition dialog buttons height
+    - BUGFIX: Fix deprecation warnings with libtorrent v0.15
+    - BUGFIX: Fix "Download from URL" title size in Web UI
+    - BUGFIX: Fix transparency of speed limits icons
+    - BUGFIX: Dropped dependency on Qt gif library
+    - BUGFIX: Improved libboost detection by configure file
+    - BUGFIX: Bring back compatibility with boost v1.34
+    - COSMETIC: Added icons to menu actions in Web UI
+
+* Tue Apr 06 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.4
+    - BUGFIX: Fix possible crash when adding a torrent
+    - BUGFIX: Fix failure to remember some torrents on startup
+    - BUGFIX: Fix torrent addition window layout (torrent content not expanding)
+    - BUGFIX: Fix about dialog in Web UI
+    - BUGFIX: Correctly clear trackers error messages once they work
+    - BUGFIX: Display correct share ratio for paused torrents
+    - COSMETIC: Improved alternative speed limits icons
+
 * Sun Apr 04 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.3
     - BUGFIX: Fix possible crash when deleting a torrent just after pausing it
     - BUGFIX: Enable Apply button when alternative rate limits are changed

INSTALL

@@ -14,11 +14,13 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, >= v0.15.0 ADVISED)
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, compatible with v0.15.x)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 
-    - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
+    - libboost 1.34.x (libboost-filesystem, libboost-thread, libboost-date-time) + libasio
+      or
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time)
 
     - python >= 2.3 (needed by search engine)
         * Run time only dependency

configure

@@ -364,10 +364,11 @@ public:
 			conf->addIncludePath(incs[n]);
 		//if(!libs.isEmpty())
 		//	conf->addLib(libs);
-		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-                        printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
-		else
+		if(conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other)) {
+                        //printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		//else
 			conf->addDefine("LIBTORRENT_0_15");
+		}
 		// Get linking parameters
 		//QStringList params;
 		//QByteArray staticlibs;
@@ -387,12 +388,26 @@ arg: with-libboost-inc=[path], Path to libboost include files
 arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
+#include <boost/version.hpp>
 class qc_libboost : public ConfObj
 {
 public:
 	qc_libboost(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libboost"; }
 	QString shortname() const { return "libboost"; }
+  QString findBoostLib(QString path, QString lib) const {
+    QString name;
+    QDir libDir(path);
+    QStringList filters;
+    filters << "libboost_"+lib+"*-mt*.so";
+    QStringList result = libDir.entryList(filters, QDir::Files);
+    if(!result.empty()) {
+      name = result.first().mid(3);
+      // Remove .so
+      name.chop(3);
+    }
+    return name;
+  }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBBOOST_INC");
@@ -436,28 +451,39 @@ public:
 		conf->addIncludePath(s);
 		// Find library
 		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
-                if(!s.isEmpty()) {
-                        if(!conf->checkLibrary(s, "boost_system-mt")) {
-                                return false;
-                        }
-                }else{
-                        QStringList sl;
-                        sl << "/usr/lib/";
-                        sl << "/usr/lib64/";
-                        sl << "/usr/local/lib/";
-                        sl << "/usr/local/lib64/";
-                        bool found = false;
-                        foreach(s, sl){
-                                if(conf->checkLibrary(s, "boost_system-mt")) {
-                                        found = true;
-                                        break;
-                                }
-                        }
-                        if(!found)
-                                return false;
-                }
-                conf->addLib(QString("-L") + s);
-		conf->addLib("-lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt");
+    QStringList required_libs;
+    required_libs 
+#if BOOST_VERSION >= 103500
+      << "system" 
+#endif
+      << "filesystem" << "thread";
+    QStringList libDirs;
+    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+    foreach(const QString& lib, required_libs) {
+      if(!s.isEmpty()) {
+        QString detected_name = findBoostLib(s, lib);
+        if(detected_name.isEmpty()) {
+          printf("Could not find boost %s library!\n", qPrintable(lib));
+          return false;
+        } else {
+          conf->addLib("-l"+detected_name);
+        }
+      } else {
+        bool found = false;
+        foreach(const QString& libDir, libDirs) {
+          QString detected_name = findBoostLib(libDir, lib);
+          if(!detected_name.isEmpty()) {
+            conf->addLib("-l"+detected_name);
+            found = true;
+            break;
+          }
+        }
+        if(!found) {
+          printf("Could not find boost %s library!\n", qPrintable(lib));
+          return false;
+        }
+      }
+    }
 		return true;
 	}
 };

qcm/libboost.qcm

@@ -5,12 +5,26 @@ arg: with-libboost-inc=[path], Path to libboost include files
 arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
+#include <boost/version.hpp>
 class qc_libboost : public ConfObj
 {
 public:
 	qc_libboost(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libboost"; }
 	QString shortname() const { return "libboost"; }
+  QString findBoostLib(QString path, QString lib) const {
+    QString name;
+    QDir libDir(path);
+    QStringList filters;
+    filters << "libboost_"+lib+"*-mt*.so";
+    QStringList result = libDir.entryList(filters, QDir::Files);
+    if(!result.empty()) {
+      name = result.first().mid(3);
+      // Remove .so
+      name.chop(3);
+    }
+    return name;
+  }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBBOOST_INC");
@@ -54,28 +68,39 @@ public:
 		conf->addIncludePath(s);
 		// Find library
 		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
-                if(!s.isEmpty()) {
-                        if(!conf->checkLibrary(s, "boost_system-mt")) {
-                                return false;
-                        }
-                }else{
-                        QStringList sl;
-                        sl << "/usr/lib/";
-                        sl << "/usr/lib64/";
-                        sl << "/usr/local/lib/";
-                        sl << "/usr/local/lib64/";
-                        bool found = false;
-                        foreach(s, sl){
-                                if(conf->checkLibrary(s, "boost_system-mt")) {
-                                        found = true;
-                                        break;
-                                }
-                        }
-                        if(!found)
-                                return false;
-                }
-                conf->addLib(QString("-L") + s);
-		conf->addLib("-lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt");
+    QStringList required_libs;
+    required_libs 
+#if BOOST_VERSION >= 103500
+      << "system" 
+#endif
+      << "filesystem" << "thread";
+    QStringList libDirs;
+    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+    foreach(const QString& lib, required_libs) {
+      if(!s.isEmpty()) {
+        QString detected_name = findBoostLib(s, lib);
+        if(detected_name.isEmpty()) {
+          printf("Could not find boost %s library!\n", qPrintable(lib));
+          return false;
+        } else {
+          conf->addLib("-l"+detected_name);
+        }
+      } else {
+        bool found = false;
+        foreach(const QString& libDir, libDirs) {
+          QString detected_name = findBoostLib(libDir, lib);
+          if(!detected_name.isEmpty()) {
+            conf->addLib("-l"+detected_name);
+            found = true;
+            break;
+          }
+        }
+        if(!found) {
+          printf("Could not find boost %s library!\n", qPrintable(lib));
+          return false;
+        }
+      }
+    }
 		return true;
 	}
 };

qcm/libtorrent-rasterbar.qcm

@@ -22,10 +22,11 @@ public:
 			conf->addIncludePath(incs[n]);
 		//if(!libs.isEmpty())
 		//	conf->addLib(libs);
-		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-                        printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
-		else
+		if(conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other)) {
+                        //printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		//else
 			conf->addDefine("LIBTORRENT_0_15");
+		}
 		// Get linking parameters
 		//QStringList params;
 		//QByteArray staticlibs;

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.2.3
+Comment=V2.2.5
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент

src/bittorrent.h

@@ -135,7 +135,9 @@ public slots:
   void resumeTorrent(QString hash);
   void resumeAllTorrents();
   /* End Web UI */
+#ifndef LIBTORRENT_0_15
   void saveDHTEntry();
+#endif
   void preAllocateAllFiles(bool b);
   void saveFastResumeData();
   void enableIPFilter(QString filter);

src/downloadthread.cpp

@@ -42,6 +42,7 @@ enum ProxyType {HTTP=1, SOCKS5=2, HTTP_PW=3, SOCKS5_PW=4, SOCKS4=5};
 downloadThread::downloadThread(QObject* parent) : QObject(parent) {
   networkManager = new QNetworkAccessManager(this);
   connect(networkManager, SIGNAL(finished (QNetworkReply*)), this, SLOT(processDlFinished(QNetworkReply*)));
+  connect(networkManager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)), this, SLOT(ignoreSslErrors(QNetworkReply*,QList<QSslError>)));
 }
 
 downloadThread::~downloadThread(){
@@ -213,3 +214,9 @@ QString downloadThread::errorCodeToString(QNetworkReply::NetworkError status) {
     return tr("Unknown error");
   }
 }
+
+void downloadThread::ignoreSslErrors(QNetworkReply* reply,QList<QSslError> errors) {
+  Q_UNUSED(errors)
+  // Ignore all SSL errors
+  reply->ignoreSslErrors();
+}

src/downloadthread.h

@@ -34,6 +34,7 @@
 #include <QNetworkReply>
 #include <QObject>
 #include <QHash>
+#include <QSslError>
 
 class QNetworkAccessManager;
 
@@ -62,6 +63,7 @@ protected:
 protected slots:
   void processDlFinished(QNetworkReply* reply);
   void checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal);
+  void ignoreSslErrors(QNetworkReply*,QList<QSslError>);
 
 };
 

src/icons.qrc

@@ -1,6 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>Icons/slow48.png</file>
   <file>Icons/rss32.png</file>
   <file>Icons/sphere2.png</file>
   <file>Icons/downarrow.png</file>