summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilson Michaels <thebitpit@earthlink.net>2020-11-28 16:47:53 -0600
committerAndreas Sturmlechner <asturm@gentoo.org>2020-12-12 01:01:22 +0100
commitb63da8a7200e661b89994f3728c738ea43c23dd8 (patch)
tree628a51d4d3775d3f39f7c217cf3865fdf6141108 /media-tv/mythtv/files
parentsys-kernel/gentoo-sources: Clean-up of 5.9.X series (diff)
downloadgentoo-b63da8a7200e661b89994f3728c738ea43c23dd8.tar.gz
gentoo-b63da8a7200e661b89994f3728c738ea43c23dd8.tar.bz2
gentoo-b63da8a7200e661b89994f3728c738ea43c23dd8.zip
media-tv/mythtv: cleanup Python 2.7, drop dev-qt/qtwebkit:5
Closes: https://bugs.gentoo.org/735986 Closes: https://bugs.gentoo.org/750887 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Wilson Michaels <thebitpit@austincustomerrands.com> Closes: https://github.com/gentoo/gentoo/pull/18443 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-tv/mythtv/files')
-rw-r--r--media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch61
-rw-r--r--media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_Dereferencing_type-punned_pointer.patch34
-rw-r--r--media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_unitialized_variables.patch22
3 files changed, 0 insertions, 117 deletions
diff --git a/media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch b/media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch
deleted file mode 100644
index 168c23379423..000000000000
--- a/media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: mythtv/libs/libmythui/mythuiwebbrowser.cpp
-Mythtv bug #13544
-===================================================================
---- a/libs/libmythui/mythuiwebbrowser.cpp
-+++ b/libs/libmythui/mythuiwebbrowser.cpp
-@@ -873,4 +873,8 @@
- void MythUIWebBrowser::Init(void)
- {
-+ // only do the initialisation for widgets not being stored in the global object store
-+ if (parent() == GetGlobalObjectStore())
-+ return;
-+
- if (m_initialized)
- return;
-@@ -1128,4 +1132,7 @@
- void MythUIWebBrowser::SetActive(bool active)
- {
-+ if (!m_browser)
-+ return;
-+
- if (m_active == active)
- return;
-@@ -1326,4 +1333,7 @@
- void MythUIWebBrowser::Scroll(int dx, int dy)
- {
-+ if (!m_browser)
-+ return;
-+
- QPoint startPos = m_browser->page()->currentFrame()->scrollPosition();
- QPoint endPos = startPos + QPoint(dx, dy);
-@@ -1435,4 +1445,7 @@
- void MythUIWebBrowser::UpdateScrollBars(void)
- {
-+ if (!m_browser)
-+ return;
-+
- QPoint position = m_browser->page()->currentFrame()->scrollPosition();
- if (m_verticalScrollbar)
-@@ -1461,5 +1474,5 @@
- UpdateScrollBars();
-
-- if (!m_image)
-+ if (!m_image || !m_browser)
- return;
-
-@@ -1480,4 +1493,7 @@
- void MythUIWebBrowser::Pulse(void)
- {
-+ if (!m_browser)
-+ return;
-+
- if (m_scrollAnimation.IsActive() &&
- m_destinationScrollPos !=
-@@ -1522,4 +1538,7 @@
- bool MythUIWebBrowser::keyPressEvent(QKeyEvent *event)
- {
-+ if (!m_browser)
-+ return false;
-+
- QStringList actions;
- bool handled = false;
diff --git a/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_Dereferencing_type-punned_pointer.patch b/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_Dereferencing_type-punned_pointer.patch
deleted file mode 100644
index bc0751c887c3..000000000000
--- a/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_Dereferencing_type-punned_pointer.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/libs/libmythfreemheg/Programs.cpp
-+++ b/libs/libmythfreemheg/Programs.cpp
-@@ -232,7 +232,10 @@ void MHResidentProgram::CallProgram(bool fIsFork, const MHObjectRef &success, co
- for (int i = 0; i < format.Size(); i++)
- {
- unsigned char ch = format.GetAt(i);
-- char buffer[5]; // Largest text is 4 chars for a year + null terminator
-+ // Largest text is 4 chars for a year + null terminator
-+ // But... adding a constant to the value might be 5 chars + null terminator
-+ // Using 6 gets rid of compiler warning
-+ char buffer[6];
-
- if (ch == '%')
- {
-@@ -249,16 +252,16 @@ void MHResidentProgram::CallProgram(bool fIsFork, const MHObjectRef &success, co
- switch (ch)
- {
- case 'Y':
-- sprintf(buffer, "%04d", timeStr->tm_year + 1900);
-+ sprintf(buffer, "%04d", (unsigned short)(timeStr->tm_year + 1900));
- break;
- case 'y':
- sprintf(buffer, "%02d", timeStr->tm_year % 100);
- break;
- case 'X':
-- sprintf(buffer, "%02d", timeStr->tm_mon + 1);
-+ sprintf(buffer, "%02d", (unsigned short)(timeStr->tm_mon + 1));
- break;
- case 'x':
-- sprintf(buffer, "%1d", timeStr->tm_mon + 1);
-+ sprintf(buffer, "%1d", (unsigned short)(timeStr->tm_mon + 1));
- break;
- case 'D':
- sprintf(buffer, "%02d", timeStr->tm_mday);
diff --git a/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_unitialized_variables.patch b/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_unitialized_variables.patch
deleted file mode 100644
index db296242515c..000000000000
--- a/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_unitialized_variables.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/libs/libmythtv/eitfixup.cpp
-+++ b/libs/libmythtv/eitfixup.cpp
-@@ -842,7 +842,7 @@ void EITFixUp::SetUKSubtitle(DBEventEIT &event) const
- void EITFixUp::FixUK(DBEventEIT &event) const
- {
- int position1;
-- int position2;
-+ int position2 = 0;
- QString strFull;
-
- bool isMovie = event.m_category.startsWith("Movie",Qt::CaseInsensitive) ||
---- a/libs/libmythui/mythuitext.cpp
-+++ b/libs/libmythui/mythuitext.cpp
-@@ -1058,7 +1058,7 @@ int MythUIText::MoveCursor(int lines)
- int lineCount = 0;
- int currPos = 0;
- int layoutStartPos = 0;
-- int xPos;
-+ int xPos = 0;
-
- for (int x = 0; x < m_Layouts.count(); x++)
- {