github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 12:59:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix build system under Ubuntu 13.10. Closes #1061 #1130 #1124.

Browse source
This commit is contained in:
sledgehammer999 2013-11-26 23:49:30 +02:00
commit 046420e7bd
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -511,7 +511,7 @@ public:
QStringList libDirs; QStringList libDirs;
if (!s.isEmpty()) if (!s.isEmpty())
libDirs << s; libDirs << s;
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
foreach(const QString& lib, required_libs) { foreach(const QString& lib, required_libs) {
bool found = false; bool found = false;

2
qcm/libboost.qcm
View file

@ -75,7 +75,7 @@ public:
QStringList libDirs; QStringList libDirs;
if (!s.isEmpty()) if (!s.isEmpty())
libDirs << s; libDirs << s;
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
foreach(const QString& lib, required_libs) { foreach(const QString& lib, required_libs) {
bool found = false; bool found = false;

4
qcm/libtorrent-rasterbar.qcm
View file

@ -8,11 +8,11 @@ class qc_libtorrent_rasterbar : public ConfObj
{ {
public: public:
qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {} qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
QString name() const { return "libtorrent-rasterbar >= 0.15.0"; } QString name() const { return "libtorrent-rasterbar >= 0.16.0"; }
QString shortname() const { return "libtorrent-rasterbar"; } QString shortname() const { return "libtorrent-rasterbar"; }
bool exec(){ bool exec(){
QStringList incs; QStringList incs;
QString req_ver = "0.15.0"; QString req_ver = "0.16.0";
QString version, libs, other; QString version, libs, other;
VersionMode mode = VersionMin; VersionMode mode = VersionMin;
if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other)) if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))