mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-05 17:07:49 +00:00
kodi: update patches after PR16113
This commit is contained in:
parent
cad8144424
commit
1cc73ad198
@ -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>
|
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||||
Date: Thu, 5 Apr 2018 11:42:13 +0100
|
Date: Thu, 5 Apr 2018 11:42:13 +0100
|
||||||
Subject: [PATCH] use udevil to mount
|
Subject: [PATCH] use udevil to mount
|
||||||
|
|
||||||
---
|
---
|
||||||
xbmc/platform/linux/PosixMountProvider.cpp | 2 +-
|
|
||||||
xbmc/platform/linux/storage/UDevProvider.cpp | 2 +-
|
xbmc/platform/linux/storage/UDevProvider.cpp | 2 +-
|
||||||
|
xbmc/platform/posix/PosixMountProvider.cpp | 2 +-
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/xbmc/platform/linux/PosixMountProvider.cpp b/xbmc/platform/linux/PosixMountProvider.cpp
|
diff --git a/xbmc/platform/linux/storage/UDevProvider.cpp b/xbmc/platform/linux/storage/UDevProvider.cpp
|
||||||
index 6dd1132..a262a7c 100644
|
index d71e2d9..0387e55 100644
|
||||||
--- a/xbmc/platform/linux/PosixMountProvider.cpp
|
--- a/xbmc/platform/linux/storage/UDevProvider.cpp
|
||||||
+++ b/xbmc/platform/linux/PosixMountProvider.cpp
|
+++ b/xbmc/platform/linux/storage/UDevProvider.cpp
|
||||||
@@ -135,7 +135,7 @@ bool CPosixMountProvider::Eject(const std::string& mountpath)
|
@@ -192,7 +192,7 @@ bool CUDevProvider::Eject(const std::string& mountpath)
|
||||||
#if !defined(TARGET_DARWIN_IOS)
|
{
|
||||||
// just go ahead and try to umount the disk
|
// just go ahead and try to umount the disk
|
||||||
// if it does umount, life is good, if not, no loss.
|
// if it does umount, life is good, if not, no loss.
|
||||||
- std::string cmd = "umount \"" + mountpath + "\"";
|
- std::string cmd = "umount \"" + mountpath + "\"";
|
||||||
@ -21,12 +21,12 @@ index 6dd1132..a262a7c 100644
|
|||||||
int status = system(cmd.c_str());
|
int status = system(cmd.c_str());
|
||||||
|
|
||||||
if (status == 0)
|
if (status == 0)
|
||||||
diff --git a/xbmc/platform/linux/storage/UDevProvider.cpp b/xbmc/platform/linux/storage/UDevProvider.cpp
|
diff --git a/xbmc/platform/posix/PosixMountProvider.cpp b/xbmc/platform/posix/PosixMountProvider.cpp
|
||||||
index 4bcebf4..daf0d58 100644
|
index c22d7f8..69d8e10 100644
|
||||||
--- a/xbmc/platform/linux/storage/UDevProvider.cpp
|
--- a/xbmc/platform/posix/PosixMountProvider.cpp
|
||||||
+++ b/xbmc/platform/linux/storage/UDevProvider.cpp
|
+++ b/xbmc/platform/posix/PosixMountProvider.cpp
|
||||||
@@ -205,7 +205,7 @@ bool CUDevProvider::Eject(const std::string& mountpath)
|
@@ -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
|
// just go ahead and try to umount the disk
|
||||||
// if it does umount, life is good, if not, no loss.
|
// if it does umount, life is good, if not, no loss.
|
||||||
- std::string cmd = "umount \"" + mountpath + "\"";
|
- std::string cmd = "umount \"" + mountpath + "\"";
|
||||||
|
@ -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>
|
From: Stefan Saraev <stefan@saraev.ca>
|
||||||
Date: Mon, 18 Aug 2014 17:46:54 +0300
|
Date: Mon, 18 Aug 2014 17:46:54 +0300
|
||||||
Subject: [PATCH] setup timezone
|
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
|
TIMEZONE=Xx/Yyy to /storage/.cache/timezone to be used with
|
||||||
tz-data.service
|
tz-data.service
|
||||||
---
|
---
|
||||||
xbmc/platform/linux/LinuxTimezone.cpp | 12 ++++++++++++
|
xbmc/platform/posix/PosixTimezone.cpp | 12 ++++++++++++
|
||||||
1 file changed, 12 insertions(+)
|
1 file changed, 12 insertions(+)
|
||||||
|
|
||||||
diff --git a/xbmc/platform/linux/LinuxTimezone.cpp b/xbmc/platform/linux/LinuxTimezone.cpp
|
diff --git a/xbmc/platform/posix/PosixTimezone.cpp b/xbmc/platform/posix/PosixTimezone.cpp
|
||||||
index fae9276..2c24542 100644
|
index 24840fc..c064951 100644
|
||||||
--- a/xbmc/platform/linux/LinuxTimezone.cpp
|
--- a/xbmc/platform/posix/PosixTimezone.cpp
|
||||||
+++ b/xbmc/platform/linux/LinuxTimezone.cpp
|
+++ b/xbmc/platform/posix/PosixTimezone.cpp
|
||||||
@@ -36,6 +36,8 @@
|
@@ -26,6 +26,8 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
+#include <fstream>
|
+#include <fstream>
|
||||||
+
|
+
|
||||||
CLinuxTimezone::CLinuxTimezone()
|
CPosixTimezone::CPosixTimezone()
|
||||||
{
|
{
|
||||||
char* line = NULL;
|
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();
|
const std::string &settingId = setting->GetId();
|
||||||
if (settingId == CSettings::SETTING_LOCALE_TIMEZONE)
|
if (settingId == CSettings::SETTING_LOCALE_TIMEZONE)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user