add some new patches queued for 30.1

5 files changed, 98 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ac68a5aae2c..32c424837560 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mythtv
 	pkgdesc = A Homebrew PVR project
 	pkgver = 30.0
-	pkgrel = 4
+	pkgrel = 5
 	epoch = 1
 	url = https://www.mythtv.org/
 	arch = x86_64
@@ -61,10 +61,16 @@ pkgbase = mythtv
 	source = mythbackend.service
 	source = 99-mythbackend.rules
 	source = sysusers.d
+	source = 001-timezone.patch
+	source = 002-in_progress.patch
+	source = 003-mythcount.patch
 	sha256sums = 7f7ae9b8927659616f181afc12d7ddc26b0a4b0d13982e2586985f4770640b43
 	sha256sums = 086f573884e4df1ff6e6e8de5a423a9ff900166acfe085abe65b62f32730e4a3
 	sha256sums = ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333
 	sha256sums = 470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae
+	sha256sums = 965b279c2a5c51229f0cf42b37e1df0413e22375c9796f85d10f7a5921478a42
+	sha256sums = ca0084165572f679bee7813653dd67fdb7eba528e1add56d6bd6ba5394d571ea
+	sha256sums = 64575e3bf452d473970b1c752152b2404397012c7eb6ba64c0d445234135b5d2
 
 pkgname = mythtv
 
diff --git a/001-timezone.patch b/001-timezone.patch
new file mode 100644
index 000000000000..520299a4aa7d
--- /dev/null
+++ b/001-timezone.patch
@@ -0,0 +1,25 @@
+Index: mythtv/programs/mythfrontend/prevreclist.cpp

+===================================================================

+--- mythtv/programs/mythfrontend/prevreclist.cpp	(revision 0e7e57f9c2eb0e2c4f47dcb30788a4e54d6808ba)

++++ mythtv/programs/mythfrontend/prevreclist.cpp	(revision c08b7ae0e7589dbe54d817a1d6296688e576d675)

+@@ -237,5 +237,7 @@

+ bool PrevRecordedList::LoadDates(void)

+ {

+-    QString querystr = "SELECT DISTINCT YEAR(starttime), MONTH(starttime) "

++    QString querystr = "SELECT DISTINCT "

++            "YEAR(CONVERT_TZ(starttime,'UTC','SYSTEM')), "

++            "MONTH(CONVERT_TZ(starttime,'UTC','SYSTEM')) "

+         "FROM oldrecorded "

+         "WHERE oldrecorded.future = 0 " + m_where;

+@@ -404,6 +406,9 @@

+     MSqlBindings bindings;

+     QString sql = " AND oldrecorded.title = :TITLE " + m_where;

+-    int selected = m_titleList->GetCurrentPos();

+-    bindings[":TITLE"] = m_titleData[selected]->GetTitle();

++    uint selected = m_titleList->GetCurrentPos();

++    if (selected < m_titleData.size())

++        bindings[":TITLE"] = m_titleData[selected]->GetTitle();

++    else

++        bindings[":TITLE"] = "";

+     if (!m_title.isEmpty())

+         bindings[":MTITLE"] = m_title;

diff --git a/002-in_progress.patch b/002-in_progress.patch
new file mode 100644
index 000000000000..345d6ec796cd
--- /dev/null
+++ b/002-in_progress.patch
@@ -0,0 +1,26 @@
+Index: mythtv/libs/libmythtv/mythplayer.cpp

+===================================================================

+--- mythtv/libs/libmythtv/mythplayer.cpp	(revision 2032ac013221e9367c9f720459e5e9f546caf66e)

++++ mythtv/libs/libmythtv/mythplayer.cpp	(revision 0bf0880d3e7ff0f78d1b90953e1f48618421e62d)

+@@ -3174,6 +3174,6 @@

+     QString subfn = player_ctx->m_buffer->GetSubtitleFilename();

+     TVState desiredState = player_ctx->GetState();

+-    bool isInProgress =

+-        desiredState == kState_WatchingRecording || kState_WatchingLiveTV;

++    bool isInProgress = (desiredState == kState_WatchingRecording ||

++                         desiredState == kState_WatchingLiveTV);

+     if (GetSubReader())

+         GetSubReader()->LoadExternalSubtitles(subfn, isInProgress &&

+Index: mythtv/libs/libmythtv/playercontext.cpp

+===================================================================

+--- mythtv/libs/libmythtv/playercontext.cpp	(revision 2032ac013221e9367c9f720459e5e9f546caf66e)

++++ mythtv/libs/libmythtv/playercontext.cpp	(revision 0bf0880d3e7ff0f78d1b90953e1f48618421e62d)

+@@ -404,6 +404,6 @@

+     {

+         QString subfn = m_buffer->GetSubtitleFilename();

+-        bool isInProgress =

+-            desiredState == kState_WatchingRecording || kState_WatchingLiveTV;

++        bool isInProgress = (desiredState == kState_WatchingRecording ||

++                             desiredState == kState_WatchingLiveTV);

+         if (!subfn.isEmpty() && player->GetSubReader())

+             player->GetSubReader()->LoadExternalSubtitles(subfn, isInProgress);

diff --git a/003-mythcount.patch b/003-mythcount.patch
new file mode 100644
index 000000000000..599384a1cbb1
--- /dev/null
+++ b/003-mythcount.patch
@@ -0,0 +1,23 @@
+diff --git a/bindings/php/MythBackend.php b/bindings/php/MythBackend.php
+index 54472e9489..9360e8801e 100644
+--- a/bindings/php/MythBackend.php
++++ b/bindings/php/MythBackend.php
+@@ -42,7 +42,7 @@ class MythBackend {
+                             ."need to check your mythweb.conf file or re-run mythtv-setup",
+                             FATAL);
+         }
+-                
++
+                 if (!isset($Backends[$host]))
+                         $Backends[$host] = array();
+ 
+@@ -191,7 +191,8 @@ class MythBackend {
+     // Parse the records, starting at the offset point
+         $row = 0;
+         $col = 0;
+-        $count = count($records);
++       if ($records) $count = count($records);
++       else $count = 0;
+         for($i = $offset; $i < $count; $i++) {
+             $rows[$row][$col] = $records[$i];
+         // Every $NUMPROGRAMLINES fields (0 through ($NUMPROGRAMLINES-1)) means
diff --git a/PKGBUILD b/PKGBUILD
index b735fe706637..f4c2ce5f85c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=mythtv
 pkgver=30.0
-pkgrel=4
+pkgrel=5
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('x86_64')
@@ -32,15 +32,30 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/MythTV/$pkgname/archive/v$p
         'mythbackend.service'
         '99-mythbackend.rules'
         'sysusers.d'
+        '001-timezone.patch'
+        '002-in_progress.patch'
+        '003-mythcount.patch'
 )
 sha256sums=('7f7ae9b8927659616f181afc12d7ddc26b0a4b0d13982e2586985f4770640b43'
             '086f573884e4df1ff6e6e8de5a423a9ff900166acfe085abe65b62f32730e4a3'
             'ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333'
-            '470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae')
+            '470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae'
+            '965b279c2a5c51229f0cf42b37e1df0413e22375c9796f85d10f7a5921478a42'
+            'ca0084165572f679bee7813653dd67fdb7eba528e1add56d6bd6ba5394d571ea'
+            '64575e3bf452d473970b1c752152b2404397012c7eb6ba64c0d445234135b5d2')
 
 prepare() {
   cd $pkgname-$pkgver/$pkgname
 
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    msg2 "Applying patch $src..."
+    patch -Np1 < "../../$src"
+  done
+
   find 'bindings/python' 'contrib' 'programs/scripts' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 }