enigma: update, remove unbuildable

1 files changed, 37 insertions, 27 deletions

diff --git a/packages/enigma/enigma/network_fix.diff b/packages/enigma/enigma/network_fix.diff
index 77352916ce..add4935657 100644
--- a/packages/enigma/enigma/network_fix.diff
+++ b/packages/enigma/enigma/network_fix.diff
@@ -4,7 +4,7 @@ RCS file: /cvs/tuxbox/apps/tuxbox/enigma/include/lib/dvb/edvb.h,v
 retrieving revision 1.37
 diff -u -r1.37 edvb.h
 --- a/include/lib/dvb/edvb.h	12 Jun 2005 19:55:44 -0000	1.37
-+++ b/include/lib/dvb/edvb.h	12 Sep 2005 15:45:30 -0000
++++ b/include/lib/dvb/edvb.h	1 Mar 2006 23:10:04 -0000
 @@ -196,6 +196,7 @@
  //////////////////////////////Network Stuff////////////////////////////////////
  public:
@@ -19,7 +19,7 @@ RCS file: /cvs/tuxbox/apps/tuxbox/enigma/lib/dvb/edvb.cpp,v
 retrieving revision 1.104
 diff -u -r1.104 edvb.cpp
 --- a/lib/dvb/edvb.cpp	24 Aug 2005 19:07:40 -0000	1.104
-+++ b/lib/dvb/edvb.cpp	12 Sep 2005 15:45:34 -0000
++++ b/lib/dvb/edvb.cpp	1 Mar 2006 23:10:05 -0000
 @@ -80,6 +80,7 @@
  {
  #ifndef DISABLE_NETWORK
@@ -57,26 +57,16 @@ diff -u -r1.104 edvb.cpp
  void eDVB::configureNetwork()
  {
  #ifndef USE_IFUPDOWN
-Index: src/setup_extra.h
+Index: po/de.po
 ===================================================================
-RCS file: /cvs/tuxbox/apps/tuxbox/enigma/src/setup_extra.h,v
-retrieving revision 1.12
-diff -u -r1.12 setup_extra.h
---- a/src/setup_extra.h	1 Sep 2005 22:33:22 -0000	1.12
-+++ b/src/setup_extra.h	12 Sep 2005 15:48:46 -0000
-@@ -19,6 +19,7 @@
- #ifndef TUXTXT_CFG_STANDALONE
- 	void tuxtxtCachingChanged(bool);
- #endif
-+	void networkFixChanged(bool);
- 	void colorbuttonsChanged(bool);
- 	void reinitializeHTTPServer(bool);
- 	void fastZappingChanged(bool b);
---- a/po/de.po	2006-01-10 21:14:35.000000000 +0100
-+++ a/po/de.po	2006-01-10 21:45:19.000000000 +0100
-@@ -4116,6 +4116,14 @@
+RCS file: /cvs/tuxbox/apps/tuxbox/enigma/po/de.po,v
+retrieving revision 1.85
+diff -u -r1.85 de.po
+--- a/po/de.po	25 Feb 2006 21:05:15 -0000	1.85
++++ b/po/de.po	1 Mar 2006 23:10:11 -0000
+@@ -4135,6 +4135,14 @@
  msgid "try to reconnect when an external cahandler connection was lost"
- msgstr ""
+ msgstr "Versucht die CAHandler Verbindung, wenn verloren, wiederherzustellen."
  
 +#: src/setup_extra.cpp:126
 +msgid "Enable network fix"
@@ -89,18 +79,23 @@ diff -u -r1.12 setup_extra.h
  #: src/setup_extra.cpp:127
  msgid "Enable file sharing"
  msgstr "Dateifreigaben aktivieren"
---- a/src/setup_extra.cpp	2006-01-10 21:14:49.000000000 +0100
-+++ a/src/setup_extra.cpp	2006-01-11 12:10:27.000000000 +0100
+Index: src/setup_extra.cpp
+===================================================================
+RCS file: /cvs/tuxbox/apps/tuxbox/enigma/src/setup_extra.cpp,v
+retrieving revision 1.61
+diff -u -r1.61 setup_extra.cpp
+--- a/src/setup_extra.cpp	5 Feb 2006 23:41:01 -0000	1.61
++++ b/src/setup_extra.cpp	1 Mar 2006 23:10:12 -0000
 @@ -122,8 +122,9 @@
- 	new eListBoxEntryCheck( (eListBox<eListBoxEntry>*)&list, _("Auto bouquet change"), "/elitedvb/extra/autobouquetchange", _("change into next bouquet when end of current bouquet is reached"));
- 	new eListBoxEntryCheck( (eListBox<eListBoxEntry>*)&list, _("Auto reconnect cahandler"), "/elitedvb/extra/cahandlerReconnect", _("try to reconnect when an external cahandler connection was lost"));
+ 	new eListBoxEntryCheck(&list, _("Auto bouquet change"), "/elitedvb/extra/autobouquetchange", _("change into next bouquet when end of current bouquet is reached"));
+ 	new eListBoxEntryCheck(&list, _("Auto reconnect cahandler"), "/elitedvb/extra/cahandlerReconnect", _("try to reconnect when an external cahandler connection was lost"));
  #ifndef DISABLE_NETWORK
 -	if ( eSystemInfo::getInstance()->getHwType() == eSystemInfo::DM7000 ||
 -	    eSystemInfo::getInstance()->getHwType() == eSystemInfo::DM7020)
-+	if ( eSystemInfo::getInstance()->getHwType() == eSystemInfo::DM7020 )
-+		CONNECT((new eListBoxEntryCheck( (eListBox<eListBoxEntry>*)&list, _("Enable network fix"), "/elitedvb/network/fix", _("enable this when your network is very slow(for testing)")))->selected, eExpertSetup::networkFixChanged );
++	if ( eSystemInfo::getInstance()->getHwType() == eSystemInfo::DM7020)
++		CONNECT((new eListBoxEntryCheck(&list, _("Enable network fix"), "/elitedvb/network/fix", _("enable this when your network is very slow(for testing)")))->selected, eExpertSetup::networkFixChanged );
 +	if ( eSystemInfo::getInstance()->getHwType() == eSystemInfo::DM7000 )
- 		new eListBoxEntryCheck( (eListBox<eListBoxEntry>*)&list, _("Enable file sharing"), "/elitedvb/network/samba", _("start file sharing(samba) on startup"));
+ 		new eListBoxEntryCheck(&list, _("Enable file sharing"), "/elitedvb/network/samba", _("start file sharing(samba) on startup"));
  #endif
  #ifndef TUXTXT_CFG_STANDALONE
 @@ -251,6 +252,11 @@
@@ -115,3 +110,18 @@ diff -u -r1.12 setup_extra.h
  void eExpertSetup::fastZappingChanged(bool b)
  {
  	Decoder::setFastZap(b);
+Index: src/setup_extra.h
+===================================================================
+RCS file: /cvs/tuxbox/apps/tuxbox/enigma/src/setup_extra.h,v
+retrieving revision 1.15
+diff -u -r1.15 setup_extra.h
+--- a/src/setup_extra.h	3 Nov 2005 12:31:31 -0000	1.15
++++ b/src/setup_extra.h	1 Mar 2006 23:10:12 -0000
+@@ -20,6 +20,7 @@
+ #ifndef TUXTXT_CFG_STANDALONE
+ 	void tuxtxtCachingChanged(bool);
+ #endif
++	void networkFixChanged(bool);
+ 	void colorbuttonsChanged(bool);
+ 	void reinitializeHTTPServer(bool);
+ 	void fastZappingChanged(bool b);