summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
Diffstat (limited to 'abs')
-rw-r--r--abs/core/mythinstall/PKGBUILD12
-rwxr-xr-xabs/core/mythinstall/checkout_MythVantage.sh8
-rw-r--r--abs/core/mythinstall/misc_settings.cpp.patch57
-rw-r--r--abs/core/mythinstall/misc_settings.h.patch20
4 files changed, 87 insertions, 10 deletions
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index b95d720..40a3a06 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=3
-pkgrel=77
+pkgrel=78
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.25')
@@ -9,13 +9,13 @@ makedepends=('mythtv>=0.25')
logofiles=`ls logo*.png`
source=('install-ui.xml' $logofiles)
-build() {
+package() {
# It is assumed that you have built the mythtv package in the same
- cd $startdir
- cd -
+ #cd $startdir
+ #cd -
#install -D MythVantage-app/mythinstall/install-ui.xml $pkgdir/usr/share/mythtv/themes/default/install-ui.xml
install -D $srcdir/install-ui.xml $pkgdir/usr/share/mythtv/themes/default/install-ui.xml
- MVBINDIR=$startdir/pkg/usr/MythVantage/bin
+ MVBINDIR=$pkgdir/usr/MythVantage/bin
mkdir -p $MVBINDIR
install -m 0755 $startdir/mythinstall.bin $MVBINDIR/MythVantage
cd $MVBINDIR
@@ -25,7 +25,7 @@ build() {
for i in $logofiles
do
- install -D -m 0755 $startdir/$i $startdir/pkg/usr/MythVantage/logos/$i
+ install -D -m 0755 $srcdir/$i $/pkgdir/usr/MythVantage/logos/$i
done
}
diff --git a/abs/core/mythinstall/checkout_MythVantage.sh b/abs/core/mythinstall/checkout_MythVantage.sh
index ecc7cd0..bb1a7b7 100755
--- a/abs/core/mythinstall/checkout_MythVantage.sh
+++ b/abs/core/mythinstall/checkout_MythVantage.sh
@@ -56,11 +56,11 @@ 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
+
cd $MYDIR/src/MythVantage-app/mythinstall && qmake
make || exit 1
#cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
#make ||exit 1
-
-
-
-
diff --git a/abs/core/mythinstall/misc_settings.cpp.patch b/abs/core/mythinstall/misc_settings.cpp.patch
new file mode 100644
index 0000000..75c4d8d
--- /dev/null
+++ b/abs/core/mythinstall/misc_settings.cpp.patch
@@ -0,0 +1,57 @@
+--- 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
new file mode 100644
index 0000000..10c69fb
--- /dev/null
+++ b/abs/core/mythinstall/misc_settings.h.patch
@@ -0,0 +1,20 @@
+--- 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: