diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
commit | c02976460621a16b172e3e33432d5790f3ed6117 (patch) | |
tree | c438b11c18e36170fd5ee7c767adda3f948e45bb /community/qbittorrent | |
parent | 79f56eaaa1e752a2f67072051b612acf5c648f69 (diff) | |
parent | ae08410274473c5ab78d300ea2365c4b1070cc61 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/bdf-unifont/PKGBUILD
extra/convmv/PKGBUILD
extra/cowsay/PKGBUILD
extra/curl/PKGBUILD
extra/dbus-qt3/PKGBUILD
extra/emovix/PKGBUILD
extra/foobillard/PKGBUILD
extra/gnome-spell/PKGBUILD
extra/libssh2/PKGBUILD
extra/mkbootcd/PKGBUILD
extra/mozilla-common/PKGBUILD
extra/ndesk-dbus-glib/PKGBUILD
extra/xfwm4-themes/PKGBUILD
Diffstat (limited to 'community/qbittorrent')
-rw-r--r-- | community/qbittorrent/python2.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/community/qbittorrent/python2.patch b/community/qbittorrent/python2.patch deleted file mode 100644 index 24ab742db..000000000 --- a/community/qbittorrent/python2.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nur qbittorrent-2.4.8.orig/src/searchengine/searchengine.cpp qbittorrent-2.4.8/src/searchengine.cpp ---- qbittorrent-2.4.8.orig/src/searchengine/searchengine.cpp 2010-10-01 13:52:53.000000000 -0700 -+++ qbittorrent-2.4.8/src/searchengine/searchengine.cpp 2010-10-25 01:20:20.046700620 -0700 -@@ -354,7 +354,7 @@ - //on change le texte du label courrant - currentSearchTab->getCurrentLabel()->setText(tr("Results")+" <i>(0)</i>:"); - // Launch search -- searchProcess->start("python", params, QIODevice::ReadOnly); -+ searchProcess->start("python2", params, QIODevice::ReadOnly); - searchTimeout->start(180000); // 3min - } - -@@ -421,7 +421,7 @@ - params << engine_url; - params << torrent_url; - // Launch search -- downloadProcess->start("python", params, QIODevice::ReadOnly); -+ downloadProcess->start("python2", params, QIODevice::ReadOnly); - } - } - -diff -Nur qbittorrent-2.4.8.orig/src/searchengine/supportedengines.h qbittorrent-2.4.8/src/supportedengines.h ---- qbittorrent-2.4.8.orig/src/searchengine/supportedengines.h 2010-10-24 01:32:39.000000000 -0700 -+++ qbittorrent-2.4.8/src/searchengine/supportedengines.h 2010-10-25 01:18:42.230032834 -0700 -@@ -144,7 +144,7 @@ - QStringList params; - params << misc::searchEngineLocation()+QDir::separator()+"nova2.py"; - params << "--capabilities"; -- nova.start("python", params, QIODevice::ReadOnly); -+ nova.start("python2", params, QIODevice::ReadOnly); - nova.waitForStarted(); - nova.waitForFinished(); - QString capabilities = QString(nova.readAll()); |