Merge branch 'testing'

6 files changed, 31 insertions, 10 deletions

diff --git a/abs/core/mythtv/stable-29/git_src/git_hash b/abs/core/mythtv/stable-29/git_src/git_hash
index 524ff49..3fed727 100644
--- a/abs/core/mythtv/stable-29/git_src/git_hash
+++ b/abs/core/mythtv/stable-29/git_src/git_hash
@@ -1 +1 @@
-e5fc66e822072037aeaf8c54c4292f17f65cef56
+951f1fe7ea0bd54a8bb5ef08f3b55feee5169340
diff --git a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD
index 7dcae9e..69128c3 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=11
 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..1e3d14c 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=11
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('x86_64')
@@ -138,7 +138,7 @@ md5sums=('fb5a87c52a31168a0c8fdde72f27cc45'
          '6add9c16bbb988067e82029327e567b2'
          'b0b238320fa78a4928dce2cea7c85071'
          '8e4492d1777234a021f368bd6ee964ee'
-         'f2cb8dc8c4bff42102563a9e80011e19'
+         'e6f5c4f7ed0410fa07da6057d2631520'
          'a1c7fb6a3bd11b7b21f2ea8327a843e1'
          'd05eaf66c434a131c8efb4d87e99b402'
          '5f2bd4065b145b7b7ff09dfd6f08276c'
diff --git a/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch b/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch
index 59024b7..2b57dc1 100644
--- a/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch
+++ b/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch
@@ -1,5 +1,5 @@
---- src/mythtv/i18n/mythfrontend_en_us.ts.orig	2018-05-23 18:35:11.221352872 +0000
-+++ src/mythtv/i18n/mythfrontend_en_us.ts	2018-06-19 04:42:01.650264282 +0000
+--- src/mythtv/i18n/mythfrontend_en_us.ts.orig	2018-10-12 15:14:32.718932846 +0000
++++ src/mythtv/i18n/mythfrontend_en_us.ts	2018-10-12 15:15:18.343034045 +0000
 @@ -573,7 +573,7 @@
      <message>
          <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="400"/>
@@ -23809,7 +23809,7 @@
      </message>
      <message>
          <location filename="../programs/mythfrontend/videodlg.cpp" line="2552"/>
-@@ -30706,7 +31489,7 @@
+@@ -30706,19 +31489,19 @@
      <message>
          <location filename="../programs/mythfrontend/videodlg.cpp" line="2152"/>
          <source>Fetching details for %1</source>
@@ -23818,7 +23818,12 @@
      </message>
      <message>
          <location filename="../programs/mythfrontend/videodlg.cpp" line="3557"/>
-@@ -30718,7 +31501,7 @@
+         <source>Are you sure you want to permanently delete:
+ %1</source>
+-        <translation>Are you sure you want to permanently delete:
++        <translation>Are you sure you want to delete:
+ %1</translation>
+     </message>
      <message>
          <location filename="../programs/mythfrontend/videodlg.cpp" line="3595"/>
          <source>Failed to delete file</source>
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')