commit: 28aa98a74131809706a3b57d26d0842ef5933cb6
Author: Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Sun Jul 9 01:54:34 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 21:54:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28aa98a7
media-tv/kodi: Fix ‘string’ was not declared in this scope #624280
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../kodi/files/kodi-17.3-ftpparse_string.patch | 82 ++++++++++++++++++++++
media-tv/kodi/kodi-17.3.ebuild | 3 +
2 files changed, 85 insertions(+)
diff --git a/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch
b/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch
new file mode 100644
index 00000000000..da8d57a3d6b
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch
@@ -0,0 +1,82 @@
+From 634153c85115b44015cdb1ddd6263f5a87e4e41b Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <ste...@saraev.ca>
+Date: Sun, 7 May 2017 17:30:47 +0300
+Subject: [PATCH] FTPParse.cpp: use std::string
+
+---
+ xbmc/filesystem/FTPParse.cpp | 44 ++++++++++++++++++++++----------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp
+index 8dd9633ae19e..d78349adb580 100644
+--- a/xbmc/filesystem/FTPParse.cpp
++++ b/xbmc/filesystem/FTPParse.cpp
+@@ -30,7 +30,7 @@ CFTPParse::CFTPParse()
+ m_time = 0;
+ }
+
+-string CFTPParse::getName()
++std::string CFTPParse::getName()
+ {
+ return m_name;
+ }
+@@ -55,16 +55,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 = {};
+@@ -334,21 +334,21 @@ int CFTPParse::getDayOfWeek(int month, int date, int
year)
+ 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
diff --git a/media-tv/kodi/kodi-17.3.ebuild b/media-tv/kodi/kodi-17.3.ebuild
index aa7fc74b28b..2f1e876a97c 100644
--- a/media-tv/kodi/kodi-17.3.ebuild
+++ b/media-tv/kodi/kodi-17.3.ebuild
@@ -14,6 +14,9 @@ LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
FFMPEG_VERSION="3.1.6"
CODENAME="Krypton"
+PATCHES=(
+ "${FILESDIR}/${P}-ftpparse_string.patch"
+)
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz
-> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz
-> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz ->
libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
