gentoo resync : 25.11.2020

2 files changed, 0 insertions, 93 deletions

diff --git a/media-tv/kodi/files/kodi-18-remove-useless-test.patch b/media-tv/kodi/files/kodi-18-remove-useless-test.patch
deleted file mode 100644
index 144626718b60..000000000000
--- a/media-tv/kodi/files/kodi-18-remove-useless-test.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6cf1d4aaf9807a209f19e0aea97b44a7ae617f27 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Tue, 23 Jun 2020 14:30:29 -0400
-Subject: [PATCH] [test] TestCPUInfo: remove useless test as we cannot
- guarantee that they exist
-
----
- xbmc/utils/test/TestCPUInfo.cpp | 30 ------------------------------
- 1 file changed, 30 deletions(-)
-
-diff --git a/xbmc/utils/test/TestCPUInfo.cpp b/xbmc/utils/test/TestCPUInfo.cpp
-index fab473891356..df74ca3ee995 100644
---- a/xbmc/utils/test/TestCPUInfo.cpp
-+++ b/xbmc/utils/test/TestCPUInfo.cpp
-@@ -73,36 +73,6 @@ TEST(TestCPUInfo, getTemperature)
- }
- #endif
- 
--TEST(TestCPUInfo, getCPUModel)
--{
--  std::string s = g_cpuInfo.getCPUModel();
--  EXPECT_STRNE("", s.c_str());
--}
--
--TEST(TestCPUInfo, getCPUBogoMips)
--{
--  std::string s = g_cpuInfo.getCPUBogoMips();
--  EXPECT_STRNE("", s.c_str());
--}
--
--TEST(TestCPUInfo, getCPUHardware)
--{
--  std::string s = g_cpuInfo.getCPUHardware();
--  EXPECT_STRNE("", s.c_str());
--}
--
--TEST(TestCPUInfo, getCPURevision)
--{
--  std::string s = g_cpuInfo.getCPURevision();
--  EXPECT_STRNE("", s.c_str());
--}
--
--TEST(TestCPUInfo, getCPUSerial)
--{
--  std::string s = g_cpuInfo.getCPUSerial();
--  EXPECT_STRNE("", s.c_str());
--}
--
- TEST(TestCPUInfo, CoreInfo)
- {
-   ASSERT_TRUE(g_cpuInfo.HasCoreId(0));
diff --git a/media-tv/kodi/files/kodi-18.5-cassert.patch b/media-tv/kodi/files/kodi-18.5-cassert.patch
deleted file mode 100644
index 9558baa9e18c..000000000000
--- a/media-tv/kodi/files/kodi-18.5-cassert.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/xbmc/xbmc/pull/17000
-
-From bbfc36f06c191d3bdea19cacc498afb86bd25404 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Thu, 5 Dec 2019 14:49:50 -0500
-Subject: [PATCH] Add missing cassert includes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Without these includes, ‘assert’ was not declared in this scope errors
-occur.
----
- xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp | 1 +
- xbmc/windowing/GraphicContext.cpp                  | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
-index 1303d894478c..aa85d95b3234 100644
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
-@@ -31,6 +31,7 @@
- #include "utils/Variant.h"
- #include "utils/log.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #define SETTING_PROFILE_NAME          "profile.name"
-diff --git a/xbmc/windowing/GraphicContext.cpp b/xbmc/windowing/GraphicContext.cpp
-index b47bafba57dc..75b333ea6daa 100644
---- a/xbmc/windowing/GraphicContext.cpp
-+++ b/xbmc/windowing/GraphicContext.cpp
-@@ -25,6 +25,8 @@
- #include "settings/lib/Setting.h"
- #include "utils/log.h"
- 
-+#include <cassert>
-+
- using namespace KODI::MESSAGING;
- 
- CGraphicContext::CGraphicContext(void) = default;