mythinstall: update for mythtv 0.27. closes #938.

5 files changed, 7 insertions, 154 deletions

diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 7f2bef6..4f4531f 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Jams
 pkgname=mythinstall
-pkgver=3
-pkgrel=80
+pkgver=8.1
+pkgrel=1
 pkgdesc="LinHES installer/systemconfig GUI."
 arch=('i686'  'x86_64')
-depends=('mythtv>=0.25')
-makedepends=('mythtv>=0.25')
+depends=('mythtv>=0.27')
+makedepends=('mythtv>=0.27')
 logofiles=`ls logo*.png`
 source=('install-ui.xml' $logofiles)
 
@@ -22,7 +22,7 @@ package() {
     ln -s MythVantage mythvantage
     ln -s MythVantage mythinstall
     #cd -
-echo $logofiles    
+    echo $logofiles    
     for i in $logofiles
     do
        install -D -m 0755 $srcdir/$i $pkgdir/usr/MythVantage/logos/$i
diff --git a/abs/core/mythinstall/checkout_MythVantage.sh b/abs/core/mythinstall/checkout_MythVantage.sh
index e0d4b0c..269cc64 100755
--- a/abs/core/mythinstall/checkout_MythVantage.sh
+++ b/abs/core/mythinstall/checkout_MythVantage.sh
@@ -2,8 +2,8 @@
 MYDIR=`pwd`
 
 PREFIX="\/usr\/include\/mythtv"
-LIBVERSION=0.25
-VERSION=0.25.0
+LIBVERSION=0.27
+VERSION=0.27.0
 
 
 function setup_links {
@@ -56,13 +56,6 @@ sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common
 
 #echo 'INCLUDEPATH += $$MYTHPATH/mythtv/libs/libmythtv/' >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
 
-#remove hitchhiker guide to timezones
-patch -N $MYDIR/src/MythVantage-app/mythinstall/misc_settings.cpp < $MYDIR/misc_settings.cpp.patch
-patch -N $MYDIR/src/MythVantage-app/mythinstall/misc_settings.h < $MYDIR/misc_settings.h.patch
-
-#update help screen
-patch -N $MYDIR/src/MythVantage-app/mythinstall/main.cpp < $MYDIR/main.cpp.patch
-
 cd $MYDIR/src/MythVantage-app/mythinstall && qmake
 make || exit 1
 #cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
diff --git a/abs/core/mythinstall/main.cpp.patch b/abs/core/mythinstall/main.cpp.patch
deleted file mode 100644
index 9c4c3ce..0000000
--- a/abs/core/mythinstall/main.cpp.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- main.cpp.orig	2013-09-18 13:57:34.589499257 +0000
-+++ main.cpp	2013-09-18 14:27:59.535328888 +0000
-@@ -445,38 +445,45 @@
-     {
-         DialogBox *dia = NULL;
-         QString prompt;
--        QString *problems = new QString("			Help Screen");
-+        QString *problems = new QString("LinHES Help");
-         problems->append("\n");
--        problems->append("-------------------------------------------------");
-+        problems->append("Visit http://linhes.org for additional help.");
-         problems->append("\n");
--        problems->append("Alt+h This screen");
-+        problems->append("\n");
-+        problems->append("------Keyboard Shortcuts---------------------------------");
-+        problems->append("\n");
-+        problems->append("Alt + h: This Screen");
-         problems->append("\n");
- #ifdef __MVAPP__
--        problems->append("F2 open/close  terminal");
-+        problems->append("F2: Open/Close Terminal");
-         problems->append("\n");
--        problems->append("Shift + Return  opens new xterm");
-+        problems->append("Shift + Return: Open New Terminal (xterm)");
-         problems->append("\n");
--        problems->append("Alt+F2 for 2nd desktop  Alt+F1 to go back");
-+        problems->append("Alt + F2: Show 2nd desktop  Alt + F1 To Go Back");
-         problems->append("\n");
--        problems->append("Alt+c Capture myth screenshot");
-+        problems->append("Alt + c: Capture Myth Screenshot");
-         problems->append("\n");
- #else
--        problems->append("Alt + X  opens new xterm ");
-+        problems->append("Alt + x: Open New Terminal (xterm)");
-         problems->append("\n");
--        problems->append("Alt + m  start mythfrontend");
-+        problems->append("Alt + m: Open mythfrontend");
-         problems->append("\n");
--        problems->append("m will display a popup for power/about");
-+        problems->append("m in mythfrontend: Display Power/About Menu");
-         problems->append("\n");
- #endif
--        problems->append("Ctrl + Alt + u  unhide  mouse cursor");
-+        problems->append("Alt + 1: Start Master mythbackend");
-+        problems->append("\n");
-+        problems->append("Alt + 2: Stop Master mythbackend");
-+        problems->append("\n");
-+        problems->append("Alt + 3: Restart Master mythbackend");
-         problems->append("\n");
--        problems->append("Alt+1 start   masterbackend");
-+        problems->append("Alt + s: Open mythtv-setup");
-         problems->append("\n");
--        problems->append("Alt+2 stop    masterbackend");
-+        problems->append("Alt + u: Unhide/Hide Mouse Pointer");
-         problems->append("\n");
--        problems->append("Alt+3 restart masterbackend");
-+        problems->append("Alt + w: Open Web Browser (Chrome if installed)");
-         problems->append("\n");
--        problems->append("Alt+s  run mythtv-setup");
-+        problems->append("Alt + f: Restart Window Manager");
-         problems->append("\n");
- 
- 
diff --git a/abs/core/mythinstall/misc_settings.cpp.patch b/abs/core/mythinstall/misc_settings.cpp.patch
deleted file mode 100644
index 75c4d8d..0000000
--- a/abs/core/mythinstall/misc_settings.cpp.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- misc_settings.cpp.orig	2013-09-06 21:04:22.406221919 +0000
-+++ misc_settings.cpp	2013-09-06 21:01:01.927900734 +0000
-@@ -74,17 +74,17 @@
- //         miscsettings_2->addChild(HostZipcode());
- 
-     TimezoneRegion *timezoneregion = new TimezoneRegion();
--    TimezoneButton *timezonebutton = new TimezoneButton();
-+//    TimezoneButton *timezonebutton = new TimezoneButton();
- 
-     VerticalConfigurationGroup* miscsettings =
-         new VerticalConfigurationGroup(false, true,false,false);
--    miscsettings->addChild(timezonebutton);
-+//    miscsettings->addChild(timezonebutton);
-     if (  showLabels  && ( hostparm.ThisTimeZone != "" ))
-     {
-         if (MVAPP)
-         {
-             miscsettings->addChild(temptimezone);
--            timezonebutton->disableButton();
-+//            timezonebutton->disableButton();
-         }
-         else
-             miscsettings->addChild(timezoneregion);
-@@ -104,13 +104,13 @@
- 
- 
- 
--    connect(timezonebutton, SIGNAL(mf_launch_tzgui()),timezoneregion ,SLOT(timezone_gathersettings()));
-+//    connect(timezonebutton, SIGNAL(mf_launch_tzgui()),timezoneregion ,SLOT(timezone_gathersettings()));
- 
-     connect(timezoneregion,SIGNAL(mf_show_tz(QString)),this,SLOT(mf_show_tz(QString)));
-     connect(this,SIGNAL(update_timezone(QString)),timezoneregion,SLOT(update_timezone_values(QString)));
- 
-     autoLaunchTimer = new QTimer(this);
--    connect(autoLaunchTimer, SIGNAL(timeout()), timezonebutton, SLOT(launch_tzgui()));
-+//    connect(autoLaunchTimer, SIGNAL(timeout()), timezonebutton, SLOT(launch_tzgui()));
-     autoLaunchTimer->start(0);
- }
- 
-@@ -191,7 +191,7 @@
- 
- 
- //_______________Misc time timezone
--
-+/*
- TimezoneButton::TimezoneButton():
-     VerticalConfigurationGroup(false,false,false,false)
- {
-@@ -211,7 +211,7 @@
- {
-     TZButton->setEnabled(false);
- }
--
-+*/
- //This is used for the timezone
- QStringList findFilesRecursively ( QStringList paths, QString fileTypes ) {
-     if ( fileTypes.isEmpty() ) fileTypes = "*";
diff --git a/abs/core/mythinstall/misc_settings.h.patch b/abs/core/mythinstall/misc_settings.h.patch
deleted file mode 100644
index 10c69fb..0000000
--- a/abs/core/mythinstall/misc_settings.h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc_settings.h.orig	2013-09-06 20:57:11.240009509 +0000
-+++ misc_settings.h	2013-09-06 21:06:16.558645309 +0000
-@@ -35,7 +35,7 @@
-     MiscMainFrame2();
- };
- 
--
-+/*
- class TimezoneButton: public VerticalConfigurationGroup {
-     Q_OBJECT
- public:
-@@ -48,7 +48,7 @@
-     QString mf_launch_tzgui();
- 
- };
--
-+*/
- class TimezoneRegion: public TriggeredConfigurationGroup {
-     Q_OBJECT
- public: