added patch to fix compile problems on gcc-4.x

Package-Manager: portage-2.1-r2

3 files changed, 87 insertions, 9 deletions

diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog
index 263265b54e5d..6a085565bce1 100644
--- a/media-plugins/vdr-setup/ChangeLog
+++ b/media-plugins/vdr-setup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-setup
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.8 2006/08/15 10:27:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.9 2006/09/05 19:50:24 hd_brummy Exp $
+
+  05 Sep 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-setup-0.3.1-gcc-4.x.diff:
+  added patch to fix compile problems on gcc-4.x
 
   15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
   Assigned to Gentoo VDR Project.
diff --git a/media-plugins/vdr-setup/Manifest b/media-plugins/vdr-setup/Manifest
index 24e2476a5104..2e53f30ccee3 100644
--- a/media-plugins/vdr-setup/Manifest
+++ b/media-plugins/vdr-setup/Manifest
@@ -5,6 +5,10 @@ AUX vdr-setup-0.2.3-gentoo.diff 6713 RMD160 7b20f191388b812d5b7f31503c10f4886a19
 MD5 4dd1e551d51e11df975e6743ea2ead01 files/vdr-setup-0.2.3-gentoo.diff 6713
 RMD160 7b20f191388b812d5b7f31503c10f4886a19b987 files/vdr-setup-0.2.3-gentoo.diff 6713
 SHA256 f2667ed29477c25a0ca3f32aec1fe49bf64c346de75ffc938674ace566ef700f files/vdr-setup-0.2.3-gentoo.diff 6713
+AUX vdr-setup-0.3.1-gcc-4.x.diff 2560 RMD160 1ef325019522d4ee5757ec5ffdc51239ca1b8427 SHA1 5de78950064149e9e94ec65acadc1321b273b22a SHA256 fe8595e8965977f0df4aa1816607eb2f824bd5b8c72c5d885efd26b22eae8b88
+MD5 6b9f4b57fe2815b116fdf24466a38b3b files/vdr-setup-0.3.1-gcc-4.x.diff 2560
+RMD160 1ef325019522d4ee5757ec5ffdc51239ca1b8427 files/vdr-setup-0.3.1-gcc-4.x.diff 2560
+SHA256 fe8595e8965977f0df4aa1816607eb2f824bd5b8c72c5d885efd26b22eae8b88 files/vdr-setup-0.3.1-gcc-4.x.diff 2560
 AUX vdr-setup-0.3.1-gentoo.diff 6469 RMD160 98e688df457b440db002de80218002202250fbfb SHA1 156cd69c8e7817d09abd7c17d1cb81026933641b SHA256 d705d996f2375b00e1ddbdc3e56ac5db73310491adbc6657c7760d2e397d81b9
 MD5 41cf39f874c71c97dbe151092e736715 files/vdr-setup-0.3.1-gentoo.diff 6469
 RMD160 98e688df457b440db002de80218002202250fbfb files/vdr-setup-0.3.1-gentoo.diff 6469
@@ -31,10 +35,10 @@ EBUILD vdr-setup-0.3.1.ebuild 2101 RMD160 20d031927d3c58c0342b7a1d33c6078d5847de
 MD5 13becd2ed3db3bd5e01b98f314d778e5 vdr-setup-0.3.1.ebuild 2101
 RMD160 20d031927d3c58c0342b7a1d33c6078d5847de0c vdr-setup-0.3.1.ebuild 2101
 SHA256 d82c7bdac0192f683fca2bc78487fb2fe0c7e8ae8173cf3a2e13085a2e2be05b vdr-setup-0.3.1.ebuild 2101
-MISC ChangeLog 1591 RMD160 cd0b5676c28d624e86782d850eb640c498dcc762 SHA1 b59520c6056d1d4d2f346ae4ce9844bad97426f1 SHA256 a27255afa95c6afb1ccce15ea7f0ef617403ef7d4ae0c00eb10ccba8cc75382d
-MD5 de477a19040af500dca36083526f2cbb ChangeLog 1591
-RMD160 cd0b5676c28d624e86782d850eb640c498dcc762 ChangeLog 1591
-SHA256 a27255afa95c6afb1ccce15ea7f0ef617403ef7d4ae0c00eb10ccba8cc75382d ChangeLog 1591
+MISC ChangeLog 1740 RMD160 9a6f3cd4f3b8222c23f33f2ded5f2c397a875617 SHA1 fcd19aca9970371680b81224674120564c1d5729 SHA256 ff9c25a36778f81c63ea8c4aeddd21ea35b0afd8783bd65d272158087fddb19d
+MD5 e769c85b5591a5536195139e49c379dc ChangeLog 1740
+RMD160 9a6f3cd4f3b8222c23f33f2ded5f2c397a875617 ChangeLog 1740
+SHA256 ff9c25a36778f81c63ea8c4aeddd21ea35b0afd8783bd65d272158087fddb19d ChangeLog 1740
 MISC metadata.xml 540 RMD160 cca198c4529623f25ab1009757673485c021c7da SHA1 586e6fd714fc530db6d4ca19cee2de28d19d9a38 SHA256 a9aa7b1d1b97ae4d5656042dbddab1cdfc9092b6acb94114a59eba5b44175233
 MD5 e516803e84d1e9932b498f664b21574d metadata.xml 540
 RMD160 cca198c4529623f25ab1009757673485c021c7da metadata.xml 540
@@ -46,9 +50,10 @@ MD5 2eb323cfb45d45fce4b23731d6fb2381 files/digest-vdr-setup-0.3.1 235
 RMD160 861af167c79ba63649dee0b6828ae1848f2130d3 files/digest-vdr-setup-0.3.1 235
 SHA256 6abec5c30a9726bafb1e37c26c8223a017291f8c5652be51806624b8b5544782 files/digest-vdr-setup-0.3.1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
+Comment: no further Information
 
-iD8DBQFE4aF6t2vP6XvVdOcRAie4AJwMmHEGNbrRq3eQozYewbjd1qlIWwCfebWA
-qiTVvfY3uv++HJMA0DE2O5E=
-=R4iH
+iD8DBQFE/dUidn07HTTCgIoRAq5TAJ41NXbq9PmVzPlrSTNlx3BB/2DTgQCfZ2k3
+pjEuRRSYwm63seGoYUvDdV4=
+=09Xm
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-setup/files/vdr-setup-0.3.1-gcc-4.x.diff b/media-plugins/vdr-setup/files/vdr-setup-0.3.1-gcc-4.x.diff
new file mode 100644
index 000000000000..ba905ade82d7
--- /dev/null
+++ b/media-plugins/vdr-setup/files/vdr-setup-0.3.1-gcc-4.x.diff
@@ -0,0 +1,69 @@
+Patch will fix compile problems with gcc-4.1.1
+Joerg Bornkessel hd_brummy@gentoo.org 
+05 Sep 2006
+
+written with help of LordJaxom
+
+diff -Naur setup-0.3.1.orig/menus.h setup-0.3.1/menus.h
+--- setup-0.3.1.orig/menus.h	2006-09-05 20:35:37.941397850 +0200
++++ setup-0.3.1/menus.h	2006-09-05 20:39:08.866579848 +0200
+@@ -101,7 +101,7 @@
+   public:
+     MenuEntryValueList();
+     ~MenuEntryValueList();
+-    MenuEntryValueList const &MenuEntryValueList::operator =(MenuEntryValueList const &right   );
++    MenuEntryValueList const &operator =(MenuEntryValueList const &right   );
+     void copy(MenuEntryValueList const &other);
+     void destroy();
+     void Add(const char *value);
+@@ -132,9 +132,9 @@
+     MenuEntry();
+     ~MenuEntry();
+     void destroy();
+-    bool MenuEntry::AddEntry( TiXmlNode *node  );
+-    bool MenuEntry::AddSubEntry( TiXmlNode *node  );
+-    bool MenuEntry::AddSelectionValues( TiXmlNode *node, const char *selection);
++    bool AddEntry( TiXmlNode *node  );
++    bool AddSubEntry( TiXmlNode *node  );
++    bool AddSelectionValues( TiXmlNode *node, const char *selection);
+     TiXmlNode *SaveXml( );
+     void SetSysconfigName(const char* nam);
+     const char*GetSysconfigName();
+diff -Naur setup-0.3.1.orig/plugins.h setup-0.3.1/plugins.h
+--- setup-0.3.1.orig/plugins.h	2006-09-05 20:35:37.953398599 +0200
++++ setup-0.3.1/plugins.h	2006-09-05 20:36:53.458117352 +0200
+@@ -33,20 +33,20 @@
+     bool operator< (Plugin &param);
+     bool operator> (Plugin &param);
+     void Print();
+-    const char* Plugin::GetName();
+-    const char* Plugin::GetInfo();
+-    const char* Plugin::GetParameter();
+-    void Plugin::SetName(const char* name);
+-    void Plugin::SetInfo(const char* info);
+-    void Plugin::SetParameter(const char* parameter);
+-    void Plugin::SetActive(int flag);
+-    void Plugin::SetProtect(bool protect);
+-    int  Plugin::GetActive();
+-    int  *Plugin::GetActiveRef();
+-    void Plugin::SetInSystem(bool flag);
+-    bool Plugin::GetInSystem();
+-    bool Plugin::GetProtect();
+-    const char* Plugin::GetActiveString();
++    const char* GetName();
++    const char* GetInfo();
++    const char* GetParameter();
++    void SetName(const char* name);
++    void SetInfo(const char* info);
++    void SetParameter(const char* parameter);
++    void SetActive(int flag);
++    void SetProtect(bool protect);
++    int  GetActive();
++    int  *GetActiveRef();
++    void SetInSystem(bool flag);
++    bool GetInSystem();
++    bool GetProtect();
++    const char* GetActiveString();
+ };
+ 
+ class Plugins  : public cList<Plugin>