Skip to content

Commit

Permalink
- Force dependency on libtorrent-rasterbar v0.15
Browse files Browse the repository at this point in the history
- Added Stephanos Antaris to contributors
  • Loading branch information
Christophe Dumez committed Oct 21, 2009
1 parent 24470a7 commit c65bf30
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Contributors:
* Arnaud Demaizière <[email protected]>
* Ishan Arora <[email protected]>
* Grigis Gaëtan <[email protected]>
* Stefanos Antaris <[email protected]>

Code from other projects:
* files src/ico.cpp src/ico.h
Expand Down
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -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:https://www.qbittorrent.org/download.php (advised)
-> http:https://www.libtorrent.net
Be careful: another library (the one used by rTorrent) uses a similar name.
Expand Down
7 changes: 2 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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;
}
};
Expand Down
7 changes: 2 additions & 5 deletions qcm/libtorrent-rasterbar.qcm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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;
}
};

0 comments on commit c65bf30

Please sign in to comment.