forked from qbittorrent/qBittorrent
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Use findPkg (pkg-config) to find libtorrent-rasterbar and detected …
…if version is sufficient - Cleaned up libMagick compilation flags detection - Minor fixes to About dialog - Updated language files - Fixed French translation
- Loading branch information
Christophe Dumez
committed
Aug 2, 2009
1 parent
66baa4d
commit 037a187
Showing
32 changed files
with
236 additions
and
343 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,29 @@ | ||
| /* | ||
| -----BEGIN QCMOD----- | ||
| name: libtorrent-rasterbar | ||
| arg: with-libtorrent-inc=[path], Path to libtorrent-rasterbar include files | ||
| arg: with-libtorrent-lib=[path], Path to libtorrent-rasterbar library files | ||
| arg: with-libtorrent-static-lib=[path], Path to libtorrent-rasterbar .a file | ||
| -----END QCMOD----- | ||
| */ | ||
| // see Conf::findPkgConfig | ||
| class qc_libtorrent_rasterbar : public ConfObj | ||
| { | ||
| public: | ||
| qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {} | ||
| QString name() const { return "libtorrent-rasterbar >= 0.14"; } | ||
| QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.14.4 advised)"; } | ||
| QString shortname() const { return "libtorrent-rasterbar"; } | ||
| bool exec(){ | ||
| QString s; | ||
| s = conf->getenv("QC_WITH_LIBTORRENT_INC"); | ||
| if(!s.isEmpty()) { | ||
| if(!conf->checkHeader(s, "libtorrent/magnet_uri.hpp")) { | ||
| return false; | ||
| } | ||
| }else{ | ||
| QStringList sl; | ||
| sl << "/usr/include"; | ||
| sl << "/usr/local/include"; | ||
| bool found = false; | ||
| foreach(s, sl){ | ||
| if(conf->checkHeader(s, "libtorrent/magnet_uri.hpp")){ | ||
| found = true; | ||
| break; | ||
| } | ||
| } | ||
| if(!found) { | ||
| return false; | ||
| } | ||
| } | ||
| conf->addIncludePath(s); | ||
| conf->addIncludePath(s+QDir::separator()+"libtorrent"); | ||
|
|
||
| s = conf->getenv("QC_WITH_LIBTORRENT_STATIC_LIB"); | ||
| if(!s.isEmpty() && QFile::exists(s) && s.endsWith(".a")){ | ||
| conf->addLib(s); | ||
| return true; | ||
| } | ||
|
|
||
| s = conf->getenv("QC_WITH_LIBTORRENT_LIB"); | ||
| if(!s.isEmpty()) { | ||
| if(!conf->checkLibrary(s, "torrent-rasterbar")) { | ||
| return false; | ||
| } | ||
| conf->addLib(QString("-L") + s); | ||
| }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, "torrent-rasterbar")){ | ||
| found = true; | ||
| break; | ||
| } | ||
| } | ||
| if(!found) return false; | ||
| conf->addLib(QString("-L") + s); | ||
| } | ||
| QStringList incs; | ||
| QString req_ver = "0.14.0"; | ||
| QString adv_ver = "0.14.4"; | ||
| QString version, libs, other; | ||
| VersionMode mode = VersionMin; | ||
| if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other)) | ||
| return false; | ||
| for(int n = 0; n < incs.count(); ++n) | ||
| 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; | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -124,16 +124,6 @@ Copyright © 2006 by Christophe Dumez<br> | |
| <source><h3><b>qBittorrent</b></h3></source> | ||
| <translation><h3><b>qBittorrent</b></h3></translation> | ||
| </message> | ||
| <message utf8="true"> | ||
| <location filename="../about.ui" line="120"/> | ||
| <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http:https://www.w3.org/TR/REC-html40/strict.dtd"> | ||
| <html><head><meta name="qrichtext" content="1" /><style type="text/css"> | ||
| p, li { white-space: pre-wrap; } | ||
| </style></head><body style=" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;"> | ||
| <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">A bittorrent client programmed in C++, based on Qt4 toolkit </p> | ||
| <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">and libtorrent-rasterbar. <br /><br />Copyright © 2006-2009 by Christophe Dumez<br /><br /><span style=" text-decoration: underline;">Home Page:</span> <a href="http:https://www.qbittorrent.org"><span style=" text-decoration: underline; color:#0057ae;">http:https://www.qbittorrent.org</span></a><br /></p></body></html></source> | ||
| <translation type="unfinished"></translation> | ||
| </message> | ||
| <message> | ||
| <location filename="../about.ui" line="341"/> | ||
| <source>[email protected]</source> | ||
|
|
@@ -149,6 +139,16 @@ p, li { white-space: pre-wrap; } | |
| <source>Birthday:</source> | ||
| <translation>Aniversari:</translation> | ||
| </message> | ||
| <message utf8="true"> | ||
| <location filename="../about.ui" line="120"/> | ||
| <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http:https://www.w3.org/TR/REC-html40/strict.dtd"> | ||
| <html><head><meta name="qrichtext" content="1" /><style type="text/css"> | ||
| p, li { white-space: pre-wrap; } | ||
| </style></head><body style=" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;"> | ||
| <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">A Bittorrent client programmed in C++, based on Qt4 toolkit </p> | ||
| <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">and libtorrent-rasterbar. <br /><br />Copyright ©2006-2009 Christophe Dumez<br /><br /><span style=" text-decoration: underline;">Home Page:</span> <a href="http:https://www.qbittorrent.org"><span style=" text-decoration: underline; color:#0057ae;">http:https://www.qbittorrent.org</span></a><br /></p></body></html></source> | ||
| <translation type="unfinished"></translation> | ||
| </message> | ||
| <message> | ||
| <location filename="../about.ui" line="247"/> | ||
| <source>Occupation:</source> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.