Changes of Revision 40

kodi-noX-raspberry-pi.spec Changed
x
 
1
@@ -60,6 +60,7 @@
2
 Source21:       libdvdnav-master.tar.gz
3
 Source22:       libdvdcss-master.tar.gz
4
 Source23:       libdvdread-master.tar.gz
5
+Patch0:         kodi.FTPParse.patch
6
 Patch1:         no-xbmc-symbolic-link.patch
7
 Patch2:         kodi-texturepacker.patch
8
 Patch3:         crossguid_build64.patch
9
@@ -250,6 +251,7 @@
10
 
11
 %prep
12
 %setup -q -n xbmc-%{version}-%{kodi_version}
13
+%patch0 -p1
14
 %patch1
15
 %patch2
16
 %patch3
17
kodi-noX-raspberry-pi2.spec Changed
17
 
1
@@ -60,6 +60,7 @@
2
 Source21:       libdvdnav-master.tar.gz
3
 Source22:       libdvdcss-master.tar.gz
4
 Source23:       libdvdread-master.tar.gz
5
+Patch0:         kodi.FTPParse.patch
6
 Patch1:         no-xbmc-symbolic-link.patch
7
 Patch2:         kodi-texturepacker.patch
8
 Patch3:         crossguid_build64.patch
9
@@ -250,6 +251,7 @@
10
 
11
 %prep
12
 %setup -q -n xbmc-%{version}-%{kodi_version}
13
+%patch0 -p1
14
 %patch1
15
 %patch2
16
 %patch3
17
kodi-noX.spec Changed
17
 
1
@@ -60,6 +60,7 @@
2
 Source21:       libdvdnav-master.tar.gz
3
 Source22:       libdvdcss-master.tar.gz
4
 Source23:       libdvdread-master.tar.gz
5
+Patch0:         kodi.FTPParse.patch
6
 Patch1:         no-xbmc-symbolic-link.patch
7
 Patch2:         kodi-texturepacker.patch
8
 Patch3:         crossguid_build64.patch
9
@@ -250,6 +251,7 @@
10
 
11
 %prep
12
 %setup -q -n xbmc-%{version}-%{kodi_version}
13
+%patch0 -p1
14
 %patch1
15
 %patch2
16
 %patch3
17
kodi.spec Changed
17
 
1
@@ -60,6 +60,7 @@
2
 Source21:       libdvdnav-master.tar.gz
3
 Source22:       libdvdcss-master.tar.gz
4
 Source23:       libdvdread-master.tar.gz
5
+Patch0:         kodi.FTPParse.patch
6
 Patch1:         no-xbmc-symbolic-link.patch
7
 Patch2:         kodi-texturepacker.patch
8
 Patch3:         crossguid_build64.patch
9
@@ -250,6 +251,7 @@
10
 
11
 %prep
12
 %setup -q -n xbmc-%{version}-%{kodi_version}
13
+%patch0 -p1
14
 %patch1
15
 %patch2
16
 %patch3
17
kodi.FTPParse.patch Added
73
 
1
@@ -0,0 +1,71 @@
2
+--- a/xbmc/filesystem/FTPParse.cpp
3
++++ b/xbmc/filesystem/FTPParse.cpp
4
+@@ -34,7 +34,7 @@ CFTPParse::CFTPParse()
5
+   m_time = 0;
6
+ }
7
+ 
8
+-string CFTPParse::getName()
9
++std::string CFTPParse::getName()
10
+ {
11
+   return m_name;
12
+ }
13
+@@ -59,16 +59,16 @@ time_t CFTPParse::getTime()
14
+   return m_time;
15
+ }
16
+ 
17
+-void CFTPParse::setTime(string str)
18
++void CFTPParse::setTime(std::string str)
19
+ {
20
+   /* Variables used to capture patterns via the regexes */
21
+-  string month;
22
+-  string day;
23
+-  string year;
24
+-  string hour;
25
+-  string minute;
26
+-  string second;
27
+-  string am_or_pm;
28
++  std::string month;
29
++  std::string day;
30
++  std::string year;
31
++  std::string hour;
32
++  std::string minute;
33
++  std::string second;
34
++  std::string am_or_pm;
35
+ 
36
+   /* time struct used to set the time_t variable */
37
+   struct tm time_struct = {};
38
+@@ -338,21 +338,21 @@ int CFTPParse::getDayOfWeek(int month, i
39
+   return day_of_week;
40
+ }
41
+ 
42
+-int CFTPParse::FTPParse(string str)
43
++int CFTPParse::FTPParse(std::string str)
44
+ {
45
+   /* Various variable to capture patterns via the regexes */
46
+-  string permissions;
47
+-  string link_count;
48
+-  string owner;
49
+-  string group;
50
+-  string size;
51
+-  string date;
52
+-  string name;
53
+-  string type;
54
+-  string stuff;
55
+-  string facts;
56
+-  string version;
57
+-  string file_id;
58
++  std::string permissions;
59
++  std::string link_count;
60
++  std::string owner;
61
++  std::string group;
62
++  std::string size;
63
++  std::string date;
64
++  std::string name;
65
++  std::string type;
66
++  std::string stuff;
67
++  std::string facts;
68
++  std::string version;
69
++  std::string file_id;
70
+ 
71
+   /* Regex for standard Unix listing formats */
72
+   pcrecpp::RE unix_re("^([-bcdlps])" // type
73