jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-03 16:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

kodi: update patches after PR16113

Browse Source
This commit is contained in:
MilhouseVH 2019-05-25 20:12:28 +01:00
parent cad8144424
commit 1cc73ad198
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/mediacenter/kodi/patches/kodi-100.04-use-udevil-to-umount.patch
View File

@ -1,19 +1,19 @@
From 642638622009224d2da9a7633316f422071139a2 Mon Sep 17 00:00:00 2001
From 385ee507b4188f14c8e2c9bc903d547331a7b710 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Thu, 5 Apr 2018 11:42:13 +0100
Subject: [PATCH] use udevil to mount
---
xbmc/platform/linux/PosixMountProvider.cpp | 2 +-
xbmc/platform/linux/storage/UDevProvider.cpp | 2 +-
xbmc/platform/posix/PosixMountProvider.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xbmc/platform/linux/PosixMountProvider.cpp b/xbmc/platform/linux/PosixMountProvider.cpp
index 6dd1132..a262a7c 100644
--- a/xbmc/platform/linux/PosixMountProvider.cpp
+++ b/xbmc/platform/linux/PosixMountProvider.cpp
@@ -135,7 +135,7 @@ bool CPosixMountProvider::Eject(const std::string& mountpath)
#if !defined(TARGET_DARWIN_IOS)
diff --git a/xbmc/platform/linux/storage/UDevProvider.cpp b/xbmc/platform/linux/storage/UDevProvider.cpp
index d71e2d9..0387e55 100644
--- a/xbmc/platform/linux/storage/UDevProvider.cpp
+++ b/xbmc/platform/linux/storage/UDevProvider.cpp
@@ -192,7 +192,7 @@ bool CUDevProvider::Eject(const std::string& mountpath)
{
// just go ahead and try to umount the disk
// if it does umount, life is good, if not, no loss.
- std::string cmd = "umount \"" + mountpath + "\"";
@ -21,12 +21,12 @@ index 6dd1132..a262a7c 100644
int status = system(cmd.c_str());
if (status == 0)
diff --git a/xbmc/platform/linux/storage/UDevProvider.cpp b/xbmc/platform/linux/storage/UDevProvider.cpp
index 4bcebf4..daf0d58 100644
--- a/xbmc/platform/linux/storage/UDevProvider.cpp
+++ b/xbmc/platform/linux/storage/UDevProvider.cpp
@@ -205,7 +205,7 @@ bool CUDevProvider::Eject(const std::string& mountpath)
{
diff --git a/xbmc/platform/posix/PosixMountProvider.cpp b/xbmc/platform/posix/PosixMountProvider.cpp
index c22d7f8..69d8e10 100644
--- a/xbmc/platform/posix/PosixMountProvider.cpp
+++ b/xbmc/platform/posix/PosixMountProvider.cpp
@@ -123,7 +123,7 @@ bool CPosixMountProvider::Eject(const std::string& mountpath)
#if !defined(TARGET_DARWIN_IOS)
// just go ahead and try to umount the disk
// if it does umount, life is good, if not, no loss.
- std::string cmd = "umount \"" + mountpath + "\"";

18
packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch
View File

@ -1,4 +1,4 @@
From ac5906ee4bc7b59f48457b01a318139ab15f6c8d Mon Sep 17 00:00:00 2001
From 7afdfe63354967ea5123cb2b1746c3ae552d0977 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 18 Aug 2014 17:46:54 +0300
Subject: [PATCH] setup timezone
@ -7,23 +7,23 @@ on TZ country setting change, store the value in format
TIMEZONE=Xx/Yyy to /storage/.cache/timezone to be used with
tz-data.service
---
xbmc/platform/linux/LinuxTimezone.cpp | 12 ++++++++++++
xbmc/platform/posix/PosixTimezone.cpp | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/xbmc/platform/linux/LinuxTimezone.cpp b/xbmc/platform/linux/LinuxTimezone.cpp
index fae9276..2c24542 100644
--- a/xbmc/platform/linux/LinuxTimezone.cpp
+++ b/xbmc/platform/linux/LinuxTimezone.cpp
@@ -36,6 +36,8 @@
diff --git a/xbmc/platform/posix/PosixTimezone.cpp b/xbmc/platform/posix/PosixTimezone.cpp
index 24840fc..c064951 100644
--- a/xbmc/platform/posix/PosixTimezone.cpp
+++ b/xbmc/platform/posix/PosixTimezone.cpp
@@ -26,6 +26,8 @@
#include <algorithm>
+#include <fstream>
+
CLinuxTimezone::CLinuxTimezone()
CPosixTimezone::CPosixTimezone()
{
char* line = NULL;
@@ -153,6 +155,16 @@ void CLinuxTimezone::OnSettingChanged(std::shared_ptr<const CSetting> setting)
@@ -143,6 +145,16 @@ void CPosixTimezone::OnSettingChanged(std::shared_ptr<const CSetting> setting)
const std::string &settingId = setting->GetId();
if (settingId == CSettings::SETTING_LOCALE_TIMEZONE)
{