summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-07-23 12:48:57 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-07-23 12:49:24 +0200
commit6c15b5c7ad855cf22bd6f4758e9c2217f4ef1fcd (patch)
treee1452d3109629fa299fddd7be9f3f8c6d300cd98 /package
parent099fdc8c002f3f868cabe82cfeef4a08514c73ca (diff)
kodi: fix gcc7.x compile error, from buildroot
Diffstat (limited to 'package')
-rw-r--r--package/kodi/Makefile2
-rw-r--r--package/kodi/patches/patch-xbmc_filesystem_FTPParse_cpp71
2 files changed, 72 insertions, 1 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 6583d510b..c3f3513b6 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -28,7 +28,7 @@ PKG_BUILDDEP+= libgpg-error libvorbis
PKG_BUILDDEP+= swig-host liblzo-host libpng-host libjpeg-turbo-host
PKG_BUILDDEP+= zip-host unzip-host giflib-host libsquish libdcadec
PKG_BUILDDEP+= libcrossguid libressl xz bzip2 liblzo
-PKG_NEEDS:= threads c++
+PKG_NEEDS:= threads c++ iconv
PKG_URL:= http://kodi.tv/
PKG_SITES:= https://github.com/xbmc/xbmc/archive/
diff --git a/package/kodi/patches/patch-xbmc_filesystem_FTPParse_cpp b/package/kodi/patches/patch-xbmc_filesystem_FTPParse_cpp
new file mode 100644
index 000000000..fff30955b
--- /dev/null
+++ b/package/kodi/patches/patch-xbmc_filesystem_FTPParse_cpp
@@ -0,0 +1,71 @@
+--- xbmc-17.3-Krypton.orig/xbmc/filesystem/FTPParse.cpp 2017-05-24 22:49:32.000000000 +0200
++++ xbmc-17.3-Krypton/xbmc/filesystem/FTPParse.cpp 2017-07-22 21:01:29.538581226 +0200
+@@ -34,7 +34,7 @@ CFTPParse::CFTPParse()
+ m_time = 0;
+ }
+
+-string CFTPParse::getName()
++std::string CFTPParse::getName()
+ {
+ return m_name;
+ }
+@@ -59,16 +59,16 @@ time_t CFTPParse::getTime()
+ 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 @@ int CFTPParse::getDayOfWeek(int month, i
+ 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