From ecb67efc2ecf7671447d3eb22d94b4b5d817208d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 21 Sep 2018 20:55:17 +0000
Subject: mythtv mythplugins mythweb: update to latest fixes

mythweb: add Channel.php_remove_small_icons.patch to remove icons that are less than 100 bytes so that they will be pulled from the backend
---
 abs/core/mythtv/stable-29/git_src/git_hash                 |  2 +-
 abs/core/mythtv/stable-29/mythplugins/PKGBUILD             |  2 +-
 abs/core/mythtv/stable-29/mythtv/PKGBUILD                  |  2 +-
 .../stable-29/mythweb/Channel.php_remove_small_icons.patch | 14 ++++++++++++++
 abs/core/mythtv/stable-29/mythweb/PKGBUILD                 |  6 ++++--
 5 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 abs/core/mythtv/stable-29/mythweb/Channel.php_remove_small_icons.patch

diff --git a/abs/core/mythtv/stable-29/git_src/git_hash b/abs/core/mythtv/stable-29/git_src/git_hash
index 524ff49..01dcaa0 100644
--- a/abs/core/mythtv/stable-29/git_src/git_hash
+++ b/abs/core/mythtv/stable-29/git_src/git_hash
@@ -1 +1 @@
-e5fc66e822072037aeaf8c54c4292f17f65cef56
+b9c5f8b2ff983343d2545ec87022d18fcf65fe1f
diff --git a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD
index 7dcae9e..d7da4fe 100644
--- a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
          'mythweather'
          'mythzoneminder')
 pkgver=29.1
-pkgrel=9
+pkgrel=10
 arch=('x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
diff --git a/abs/core/mythtv/stable-29/mythtv/PKGBUILD b/abs/core/mythtv/stable-29/mythtv/PKGBUILD
index a850229..1d54b46 100644
--- a/abs/core/mythtv/stable-29/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-29/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=29.1
-pkgrel=9
+pkgrel=10
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('x86_64')
diff --git a/abs/core/mythtv/stable-29/mythweb/Channel.php_remove_small_icons.patch b/abs/core/mythtv/stable-29/mythweb/Channel.php_remove_small_icons.patch
new file mode 100644
index 0000000..f786d15
--- /dev/null
+++ b/abs/core/mythtv/stable-29/mythweb/Channel.php_remove_small_icons.patch
@@ -0,0 +1,14 @@
+diff --git a/modules/tv/classes/Channel.php b/modules/tv/classes/Channel.php
+index a4350283..be45b6ff 100644
+--- ./modules/tv/classes/Channel.php
++++ ./modules/tv/classes/Channel.php
+@@ -113,6 +113,9 @@ class Channel extends MythBase {
+         foreach ($channel_data AS $key => $value)
+             $this->$key = $value;
+         $this->icon = 'data/tv_icons/'.basename($channel_data['icon']);
++        // Remove icons smaller than 100 bytes
++        if (file_exists($this->icon) && filesize($this->icon) < 100)
++            unlink($this->icon);
+     // Try to copy over any missing channel icons
+         if ($channel_data['icon'] && !file_exists($this->icon)) {
+         // Local file?
diff --git a/abs/core/mythtv/stable-29/mythweb/PKGBUILD b/abs/core/mythtv/stable-29/mythweb/PKGBUILD
index f83912e..7057f25 100644
--- a/abs/core/mythtv/stable-29/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-29/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweb
 pkgver=29
-pkgrel=5
+pkgrel=6
 commit_hash=`cat ../git_src/git_hash_web`
 pkgdesc="Web interface for MythTV's backend, $commit_hash"
 arch=('x86_64')
@@ -10,7 +10,8 @@ depends=('lighttpd' "mythtv>=${pkgver}" 'php' 'supplemental-web')
 groups=('mythtv-extras')
 install=mythweb.install
 
-patches=('video.css.patch')
+patches=('video.css.patch'
+         'Channel.php_remove_small_icons.patch')
 source=(`echo ${patches[@]:0}` 
         'mythweb.include'
         'mythweb_gen_light.conf')
@@ -54,5 +55,6 @@ package() {
     install -D -m0744 ${srcdir}/mythweb_gen_light.conf ${pkgdir}/etc/gen_light_conf.d/mythweb.conf
 }
 md5sums=('668a36e404c8254f56e7a7304e655332'
+         '333d145899a1b48a7648d933344ee9ed'
          '7645a6399434cbba35639713ac5d88e0'
          'df190116b3aba35720fb6631885f973f')
-- 
cgit v0.12

