From c65bf303cfd40851d225941d738305093485ca4a Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Wed, 21 Oct 2009 20:00:27 +0000 Subject: [PATCH] - Force dependency on libtorrent-rasterbar v0.15 - Added Stephanos Antaris to contributors --- AUTHORS | 1 + INSTALL | 2 +- configure | 7 ++----- qcm/libtorrent-rasterbar.qcm | 7 ++----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/AUTHORS b/AUTHORS index cb876facd..6b33170ec 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,6 +5,7 @@ Contributors: * Arnaud Demaizière * Ishan Arora * Grigis Gaëtan +* Stefanos Antaris Code from other projects: * files src/ico.cpp src/ico.h diff --git a/INSTALL b/INSTALL index 02de8cff5..ae8cb5f3a 100644 --- a/INSTALL +++ b/INSTALL @@ -17,7 +17,7 @@ Dependencies: - Qt >= 4.3.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml) Qt >= 4.4.0 is advised -- libtorrent-rasterbar by Arvid Norberg (>= v0.14.0 REQUIRED) +- libtorrent-rasterbar by Arvid Norberg (>= v0.15.0 REQUIRED) -> http://www.qbittorrent.org/download.php (advised) -> http://www.libtorrent.net Be careful: another library (the one used by rTorrent) uses a similar name. diff --git a/configure b/configure index d54b18557..2c0a35784 100755 --- a/configure +++ b/configure @@ -330,12 +330,11 @@ class qc_libtorrent_rasterbar : public ConfObj { public: qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {} - QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.14.4 advised)"; } + QString name() const { return "libtorrent-rasterbar >= 0.15.0"; } QString shortname() const { return "libtorrent-rasterbar"; } bool exec(){ QStringList incs; - QString req_ver = "0.14.0"; - QString adv_ver = "0.14.4"; + QString req_ver = "0.15.0"; QString version, libs, other; VersionMode mode = VersionMin; if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other)) @@ -344,8 +343,6 @@ 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. Although it will compile and run, you will probably experience some bugs. Please consider updating to v%s!\n", version.toUtf8().data(), adv_ver.toUtf8().data()); return true; } }; diff --git a/qcm/libtorrent-rasterbar.qcm b/qcm/libtorrent-rasterbar.qcm index 8f9cb7511..5bfbba185 100644 --- a/qcm/libtorrent-rasterbar.qcm +++ b/qcm/libtorrent-rasterbar.qcm @@ -8,12 +8,11 @@ class qc_libtorrent_rasterbar : public ConfObj { public: qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {} - QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.14.4 advised)"; } + QString name() const { return "libtorrent-rasterbar >= 0.15.0"; } QString shortname() const { return "libtorrent-rasterbar"; } bool exec(){ QStringList incs; - QString req_ver = "0.14.0"; - QString adv_ver = "0.14.4"; + QString req_ver = "0.15.0"; QString version, libs, other; VersionMode mode = VersionMin; if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other)) @@ -22,8 +21,6 @@ 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. Although it will compile and run, you will probably experience some bugs. Please consider updating to v%s!\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data()); return true; } };