Merge branch 'testing'

10 files changed, 32 insertions, 51 deletions

diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash b/abs/core/mythtv/stable-0.28/git_src/git_hash
index ace800a..7a99331 100644
--- a/abs/core/mythtv/stable-0.28/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.28/git_src/git_hash
@@ -1 +1 @@
-2131fb291c49fc62cf8ac0c1b26c89193d2436dc
+5a7b3c8d418f52b02f971469e230fb016f1f0e16
diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash_web b/abs/core/mythtv/stable-0.28/git_src/git_hash_web
index 98b5fa0..35248ef 100644
--- a/abs/core/mythtv/stable-0.28/git_src/git_hash_web
+++ b/abs/core/mythtv/stable-0.28/git_src/git_hash_web
@@ -1 +1 @@
-3fa642f00da9529674ea93110396d036da1d43ff
+7ed09ed8ed00e600a5336e571460f67034bdec6c
diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
index d161477..e2baa8b 100644
--- a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
          'mythweather'
          'mythzoneminder')
 pkgver=0.28
-pkgrel=25
+pkgrel=31
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
index 5fb2f90..0b04f72 100644
--- a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.28
-pkgrel=25
+pkgrel=31
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('i686' 'x86_64')
@@ -27,10 +27,12 @@ patches=(
          'autoskip_reduce_commskip_jumpback.patch'
          'change_msg_types.patch'
          'disable_mythnotification_tuner_failure.patch'
+         'disable_subtitle_cutdown_in_recording_options.patch'
          'tv.cpp_fix_caps.patch'
          'add_categorytype_Program.pm.patch'
          'searchMetatdataSelectedGrabber.patch'
          'addDamagedToProgDetails.patch'
+         'defaultThemeLinHES.patch'
          )
 
 optdepends=()
@@ -112,8 +114,10 @@ md5sums=('e30b482dcd5f3e71c6419fd753bab2b1'
          '0bf5e92c0609a7eda8f253bf2e032590'
          'f8a56ac814722b110dc9859169b9bda9'
          '1cd668136deea20efb79cf3e6310effc'
+         '3420d15014274b5bf8083355af71304b'
          '62c42b1043ebf65959fa9eced9ca3ed8'
          'fa836371ebeb3be5b9855be8dd016f82'
          '0f674b9cad031ba1e03aaf6b5ee1499f'
          '6add9c16bbb988067e82029327e567b2'
+         '6f916ebc2b1d0ca75c9aa6cec62c6fbb'
          'e73bb7c5036e44a68b6f6aa2f1bac077')
diff --git a/abs/core/mythtv/stable-0.28/mythtv/defaultThemeLinHES.patch b/abs/core/mythtv/stable-0.28/mythtv/defaultThemeLinHES.patch
new file mode 100644
index 0000000..5fb192c
--- /dev/null
+++ b/abs/core/mythtv/stable-0.28/mythtv/defaultThemeLinHES.patch
@@ -0,0 +1,11 @@
+--- src/mythtv/libs/libmythui/mythuihelper.h.orig	2016-12-29 16:08:28.319634823 +0000
++++ src/mythtv/libs/libmythui/mythuihelper.h	2016-12-29 16:09:03.245104062 +0000
+@@ -9,7 +9,7 @@
+ #include "mythuiexp.h"
+ #include "themeinfo.h"
+ 
+-#define DEFAULT_UI_THEME "Terra"
++#define DEFAULT_UI_THEME "LinHES"
+ #define FALLBACK_UI_THEME "MythCenter-wide"
+ 
+ class MythUIHelperPrivate;
diff --git a/abs/core/mythtv/stable-0.28/mythtv/disable_subtitle_cutdown_in_recording_options.patch b/abs/core/mythtv/stable-0.28/mythtv/disable_subtitle_cutdown_in_recording_options.patch
new file mode 100644
index 0000000..ed958e0
--- /dev/null
+++ b/abs/core/mythtv/stable-0.28/mythtv/disable_subtitle_cutdown_in_recording_options.patch
@@ -0,0 +1,12 @@
+--- src/mythtv/programs/mythfrontend/playbackbox.cpp.orig	2016-12-12 20:49:50.224910076 +0000
++++ src/mythtv/programs/mythfrontend/playbackbox.cpp	2016-12-12 20:50:40.898386010 +0000
+@@ -3289,9 +3289,6 @@
+     if (!pginfo.GetSubtitle().isEmpty())
+     {
+         extra = QString('\n') + pginfo.GetSubtitle();
+-        int maxll = max(title.length(), 20);
+-        if (extra.length() > maxll)
+-            extra = extra.left(maxll - 3) + "...";
+     }
+ 
+     return QString("\n%1%2\n%3").arg(title).arg(extra).arg(timedate);
diff --git a/abs/core/mythtv/stable-0.28/mythtv/fixQTvirtualkeyboard.patch.28 b/abs/core/mythtv/stable-0.28/mythtv/fixQTvirtualkeyboard.patch.28
deleted file mode 100644
index bfaad97..0000000
--- a/abs/core/mythtv/stable-0.28/mythtv/fixQTvirtualkeyboard.patch.28
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/mythtv/libs/libmythui/mythmainwindow.cpp.orig	2016-03-15 17:30:19.608956780 +0000
-+++ src/mythtv/libs/libmythui/mythmainwindow.cpp	2016-03-15 17:37:17.368720092 +0000
-@@ -1458,6 +1458,7 @@
- #endif
-     if (currentWidget())
-     {
-+#ifdef Q_OS_MAC
-         // don't disable the current widget, instead we disable all its children
-         // on mac, disabling the current active widget entirely prevent keyboard to
-         // work on the newly opened widget.
-@@ -1473,6 +1474,9 @@
-             }
-         }
-     }
-+#else
-+        currentWidget()->setEnabled(false);
-+#endif
- #ifdef USE_OPENGL_QT5
-     else
-     {
-@@ -1506,8 +1510,6 @@
-     if (!current)
-     {
-         current = this;
--        // We're be to the main window, enable it just in case
--        setEnabled(true);
- #ifdef USE_OPENGL_QT5
-         // Restore WA_PaintOnScreen, used by OpenGL GUI painter
-         setAttribute(Qt::WA_PaintOnScreen, d->m_bSavedPOS);
-@@ -1515,6 +1517,7 @@
-         QTimer::singleShot(2, d->paintwin, SLOT(update()));
- #endif
-     }
-+#ifdef Q_OS_MAC
-     else
-     {
-         QList<QWidget*> list = current->findChildren<QWidget *>();
-@@ -1529,6 +1532,8 @@
-         }
-     }
-     current->raise();
-+#endif
-+    current->setEnabled(true);
-     current->setFocus();
-     current->setMouseTracking(true);
- 
diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml.del
index e317b36..e317b36 100644
--- a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml
+++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml.del
diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml.del
index 6b26d11..6b26d11 100644
--- a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml
+++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml.del
diff --git a/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD
index 785056e..62fbf57 100644
--- a/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweb
 pkgver=0.28
-pkgrel=8
+pkgrel=9
 commit_hash=`cat ../git_src/git_hash_web`
 pkgdesc="Web interface for MythTV's backend, $commit_hash"
 arch=('i686' 'x86_64')