diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
| commit | f5e137fdf748b757bacfc50577e5d48a693d31c4 (patch) | |
| tree | c75bdfef17b69eff3b8bb20b285c880d7f9183c0 /community/sword | |
| parent | 300b3ee60aef9cfa0a32f5c69aa5e25ad637285f (diff) | |
| parent | dd5222c4ae447eb7a6bda08ec5a3c2339852dc16 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chntpw/PKGBUILD
community/hardinfo/PKGBUILD
community/obconf/obconf.install
community/xplc/PKGBUILD
community/zziplib/PKGBUILD
core/rp-pppoe/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/icon-naming-utils/PKGBUILD
extra/lxmenu-data/PKGBUILD
extra/openbox/PKGBUILD
extra/phonon-xine/PKGBUILD
extra/qt/PKGBUILD
extra/zope-interface/PKGBUILD
libre/pacman/PKGBUILD
libre/pacman/pacman.conf.mips64el
libre/pacman/rePKGBUILD
testing/coreutils/PKGBUILD
testing/net-tools/PKGBUILD
Diffstat (limited to 'community/sword')
| -rw-r--r-- | community/sword/curl_7.20.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/community/sword/curl_7.20.patch b/community/sword/curl_7.20.patch deleted file mode 100644 index 88763188d..000000000 --- a/community/sword/curl_7.20.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/mgr/curlftpt.cpp (revision 2505) -+++ src/mgr/curlftpt.cpp (revision 2506) -@@ -177,6 +177,9 @@ - res = curl_easy_perform(session); - SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n"); - -+ // it seems CURL tries to use this option data later for some reason, so we unset here -+ curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL); -+ - if(CURLE_OK != res) { - retVal = -1; - } |