Date: Saturday, July 15, 2017 @ 13:23:55 Author: idevolder Revision: 245207
upgpkg: kodi 17.3-4 Added: kodi/trunk/fix-ftpparse.patch Modified: kodi/trunk/PKGBUILD --------------------+ PKGBUILD | 8 +++-- fix-ftpparse.patch | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-07-15 11:58:25 UTC (rev 245206) +++ PKGBUILD 2017-07-15 13:23:55 UTC (rev 245207) @@ -22,7 +22,7 @@ pkgname=('kodi' 'kodi-eventclients' 'kodi-tools-texturepacker' 'kodi-dev') pkgver=17.3 _codename=Krypton -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://kodi.tv" license=('GPL2') @@ -35,14 +35,15 @@ 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip' 'mesa' 'libcrossguid' - 'hardening-wrapper' ) source=( "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" 'fix-python-lib-path.patch' + 'fix-ftpparse.patch' ) sha512sums=('832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987' - '0f41604e38648969572a66d1124d6e090c3bfca4f9d8ccabcd1806254c38b178ee08df35e1bbbd1228f820729df52353321b3257122af601c3233dbc6405c6d2') + '0f41604e38648969572a66d1124d6e090c3bfca4f9d8ccabcd1806254c38b178ee08df35e1bbbd1228f820729df52353321b3257122af601c3233dbc6405c6d2' + '20ed1d87eec133d079c0e58858d24b4c79480e31e35296f82c7c33f5aa48d6ce163ce40784aa50d4ffe2021758c949c84319eb17fadc0040e2aa2be8f2130d2c') prepare() { [[ -d kodi-build ]] && rm -rf kodi-build @@ -50,6 +51,7 @@ cd "xbmc-$pkgver-$_codename" patch -p1 -i "$srcdir/fix-python-lib-path.patch" + patch -p1 -i "$srcdir/fix-ftpparse.patch" } build() { Added: fix-ftpparse.patch =================================================================== --- fix-ftpparse.patch (rev 0) +++ fix-ftpparse.patch 2017-07-15 13:23:55 UTC (rev 245207) @@ -0,0 +1,71 @@ +--- a/xbmc/filesystem/FTPParse.cpp 2017-05-24 22:49:32.000000000 +0200 ++++ b/xbmc/filesystem/FTPParse.cpp 2017-07-15 14:15:54.908823456 +0200 +@@ -34,7 +34,7 @@ + m_time = 0; + } + +-string CFTPParse::getName() ++std::string CFTPParse::getName() + { + return m_name; + } +@@ -59,16 +59,16 @@ + return m_time; + } + +-void CFTPParse::setTime(string str) ++void CFTPParse::setTime(std::string str) + { + /* Variables used to capture patterns via the regexes */ +- string month; +- string day; +- string year; +- string hour; +- string minute; +- string second; +- string am_or_pm; ++ std::string month; ++ std::string day; ++ std::string year; ++ std::string hour; ++ std::string minute; ++ std::string second; ++ std::string am_or_pm; + + /* time struct used to set the time_t variable */ + struct tm time_struct = {}; +@@ -338,21 +338,21 @@ + return day_of_week; + } + +-int CFTPParse::FTPParse(string str) ++int CFTPParse::FTPParse(std::string str) + { + /* Various variable to capture patterns via the regexes */ +- string permissions; +- string link_count; +- string owner; +- string group; +- string size; +- string date; +- string name; +- string type; +- string stuff; +- string facts; +- string version; +- string file_id; ++ std::string permissions; ++ std::string link_count; ++ std::string owner; ++ std::string group; ++ std::string size; ++ std::string date; ++ std::string name; ++ std::string type; ++ std::string stuff; ++ std::string facts; ++ std::string version; ++ std::string file_id; + + /* Regex for standard Unix listing formats */ + pcrecpp::RE unix_re("^([-bcdlps])" // type