Added gcc4-compatibility patch.

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 81 insertions, 15 deletions

diff --git a/media-plugins/vdr-newsticker/ChangeLog b/media-plugins/vdr-newsticker/ChangeLog
index fd1877013712..fb4647e354c9 100644
--- a/media-plugins/vdr-newsticker/ChangeLog
+++ b/media-plugins/vdr-newsticker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-newsticker
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-newsticker/ChangeLog,v 1.1 2006/03/20 17:03:12 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-newsticker/ChangeLog,v 1.2 2006/07/08 18:55:57 zzam Exp $
+
+  08 Jul 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-newsticker-0.0.4-gcc4.diff, vdr-newsticker-0.0.4.ebuild:
+  Added gcc4-compatibility patch.
 
 *vdr-newsticker-0.0.4 (20 Mar 2006)
 
diff --git a/media-plugins/vdr-newsticker/Manifest b/media-plugins/vdr-newsticker/Manifest
index 5d84dd551777..0ac1fa7c5d32 100644
--- a/media-plugins/vdr-newsticker/Manifest
+++ b/media-plugins/vdr-newsticker/Manifest
@@ -1,25 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e3afd2d7890e42ebf577a59f8c539433 ChangeLog 411
-RMD160 1c1f07e8cc5aa720cdb0a35a68ec136aab322ff3 ChangeLog 411
-SHA256 ecd2536f8919769257a48e8cc400a510b587b716492013ffa98c78f1a20085db ChangeLog 411
-MD5 272e80264827a212d393f745a2d29a32 files/digest-vdr-newsticker-0.0.4 259
-RMD160 1a31e4b63f4f49cd1ec75a4ab13a1b73810b3826 files/digest-vdr-newsticker-0.0.4 259
-SHA256 713495c0b36db6accf35a757397430166aecbaebf0df30074851df0f794dd71e files/digest-vdr-newsticker-0.0.4 259
+AUX rc-addon.sh 205 RMD160 48ae915f97bf99e0016a8de17a1989e22fb01e57 SHA1 fa89bdc78182eee3c126b52d107f297c2d3bea35 SHA256 37759df19c20a4d1af6ad1a1b3e02c7c31312a91425a40880655f3d301c1abb1
 MD5 b1c008dd718af90b25565679827cea26 files/rc-addon.sh 205
 RMD160 48ae915f97bf99e0016a8de17a1989e22fb01e57 files/rc-addon.sh 205
 SHA256 37759df19c20a4d1af6ad1a1b3e02c7c31312a91425a40880655f3d301c1abb1 files/rc-addon.sh 205
+AUX vdr-newsticker-0.0.4-gcc4.diff 1757 RMD160 88f682449bb448ecea2705c441966e52fe6a8f3a SHA1 7cb7e813534c09694ad57001e9f926d525770b1e SHA256 dd314b779c5aca8f608dec6ff94abce3fe2948342b91a9a0f9c6e32e96292e46
+MD5 a07c364b95818dd1ef9c7e0c73d2c6ea files/vdr-newsticker-0.0.4-gcc4.diff 1757
+RMD160 88f682449bb448ecea2705c441966e52fe6a8f3a files/vdr-newsticker-0.0.4-gcc4.diff 1757
+SHA256 dd314b779c5aca8f608dec6ff94abce3fe2948342b91a9a0f9c6e32e96292e46 files/vdr-newsticker-0.0.4-gcc4.diff 1757
+DIST vdr-newsticker-0.0.4.tar.gz 15480 RMD160 239836bf0b04a59ce7c0750f0b4d91203fca9690 SHA1 74e44e40708425c3b013322dfac9c6e6e3e74da2 SHA256 6bdae99dbb42a138939a5c2ca92aa6fb51c00a482a37c142c5eff218c63ad518
+EBUILD vdr-newsticker-0.0.4.ebuild 667 RMD160 6e8fe24b426d605dd4bdba5bbf30a2936a6bac05 SHA1 3bb80d8200fb0a54504cdb753e8ca6b80bc85231 SHA256 97a45183fd1ab0839425eae1b9e0ece8bfa25bd7974afa5c2363c4bd79ba2429
+MD5 56221e9b7246bc9eb46e81dc19ff5f3d vdr-newsticker-0.0.4.ebuild 667
+RMD160 6e8fe24b426d605dd4bdba5bbf30a2936a6bac05 vdr-newsticker-0.0.4.ebuild 667
+SHA256 97a45183fd1ab0839425eae1b9e0ece8bfa25bd7974afa5c2363c4bd79ba2429 vdr-newsticker-0.0.4.ebuild 667
+MISC ChangeLog 569 RMD160 b960728ff157264a1735a04c75236756d7e9025e SHA1 5b5de135ddd5b503ebacf4e26a82593e6b0fbf5d SHA256 ab6ef98f8ea643556337258d315180d2ac853b620921c437e6778397ae831525
+MD5 f1c96fec8d3ce0712689131b4869ba96 ChangeLog 569
+RMD160 b960728ff157264a1735a04c75236756d7e9025e ChangeLog 569
+SHA256 ab6ef98f8ea643556337258d315180d2ac853b620921c437e6778397ae831525 ChangeLog 569
+MISC metadata.xml 300 RMD160 c85719cef743cf573efe73f8f84564292085c91c SHA1 4c00933e1ed60039fae091034d83e28d0890e87c SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587
 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
 RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300
 SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 metadata.xml 300
-MD5 90991996b689df9c4447d47a4053ffd1 vdr-newsticker-0.0.4.ebuild 629
-RMD160 82f9c3dd6dbebd08f89787a96d2cabe349a5570a vdr-newsticker-0.0.4.ebuild 629
-SHA256 5e6ba0592420b558d82f22c04ca57d9fdbc67d9e6af1ee9ad11883ddca50bf1b vdr-newsticker-0.0.4.ebuild 629
+MD5 272e80264827a212d393f745a2d29a32 files/digest-vdr-newsticker-0.0.4 259
+RMD160 1a31e4b63f4f49cd1ec75a4ab13a1b73810b3826 files/digest-vdr-newsticker-0.0.4 259
+SHA256 713495c0b36db6accf35a757397430166aecbaebf0df30074851df0f794dd71e files/digest-vdr-newsticker-0.0.4 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEHuBlZfSl1Kp5KmoRAo0eAKDvYfD4i/uEwkqwJnvDTEgNNelyxACg0Uw+
-la7eIhvaFmN9xRmmriVzLDI=
-=d6Aq
+iD8DBQFEr//EZfSl1Kp5KmoRAnHnAKCRwr68QYscqIxrCFAgiRxsH2orRQCeM4/q
+bWcVJnWgnkq8ILPk/NWCA84=
+=832x
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-newsticker/files/vdr-newsticker-0.0.4-gcc4.diff b/media-plugins/vdr-newsticker/files/vdr-newsticker-0.0.4-gcc4.diff
new file mode 100644
index 000000000000..f9655c3cdb50
--- /dev/null
+++ b/media-plugins/vdr-newsticker/files/vdr-newsticker-0.0.4-gcc4.diff
@@ -0,0 +1,51 @@
+Nur in newsticker-0.0.4: libvdr-newsticker.so.
+Nur in newsticker-0.0.4: libvdr-newsticker.so.1.4.1.
+diff -ru newsticker-0.0.4-orig/news.c newsticker-0.0.4/news.c
+--- newsticker-0.0.4-orig/news.c	2006-07-08 20:51:58.078637544 +0200
++++ newsticker-0.0.4/news.c	2006-07-08 20:53:29.315335150 +0200
+@@ -48,7 +48,7 @@
+ bool strloadfile(char* file,char* output)

+ {

+ 	//int count = 0;

+-	ifstream fin(file);

++	std::ifstream fin(file);

+ 	if(fin)

+ 	{

+ 		char ch;

+@@ -73,7 +73,7 @@
+ int getfilestringlength(char* filename)

+ {

+ 	int count = 0;

+-	ifstream fin(filename);

++	std::ifstream fin(filename);

+ 	if(fin)

+ 	{

+ 		char ch;

+diff -ru newsticker-0.0.4-orig/news.h newsticker-0.0.4/news.h
+--- newsticker-0.0.4-orig/news.h	2006-07-08 20:51:58.078637544 +0200
++++ newsticker-0.0.4/news.h	2006-07-08 20:52:51.039686999 +0200
+@@ -20,8 +20,8 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+-#include <iostream.h>

+-#include <fstream.h>
++#include <iostream>
++#include <fstream>
+ 
+ #define INT_SIZEOFBUF 300 * 1024 // Buffer 200Kb 

+ 

+Dateien newsticker-0.0.4-orig/news.o und newsticker-0.0.4/news.o sind verschieden.
+diff -ru newsticker-0.0.4-orig/newsticker.c newsticker-0.0.4/newsticker.c
+--- newsticker-0.0.4-orig/newsticker.c	2006-07-08 20:51:58.078637544 +0200
++++ newsticker-0.0.4/newsticker.c	2006-07-08 20:53:02.660794735 +0200
+@@ -98,7 +98,7 @@
+   void Show(void) {Start(); }
+   eOSState ProcessKey(eKeys Key);
+   int scrollMessage(char* message, int speed, int position, cOsd *osd, tColor ColorFg, tColor ColorBg, eDvbFont font);
+-  cOsd* cOSDNewsticker::createOSDLine(int row, eDvbFont font);
++  cOsd* createOSDLine(int row, eDvbFont font);
+   };
+ 
+ cOSDNewsticker::cOSDNewsticker(void)
+Nur in newsticker-0.0.4: newsticker.o.
diff --git a/media-plugins/vdr-newsticker/vdr-newsticker-0.0.4.ebuild b/media-plugins/vdr-newsticker/vdr-newsticker-0.0.4.ebuild
index ea8c3abd095c..be50d3adf69c 100644
--- a/media-plugins/vdr-newsticker/vdr-newsticker-0.0.4.ebuild
+++ b/media-plugins/vdr-newsticker/vdr-newsticker-0.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-newsticker/vdr-newsticker-0.0.4.ebuild,v 1.1 2006/03/20 17:03:12 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-newsticker/vdr-newsticker-0.0.4.ebuild,v 1.2 2006/07/08 18:55:57 zzam Exp $
 
 IUSE=""
 
@@ -16,6 +16,8 @@ LICENSE="GPL-2"
 DEPEND=">=media-video/vdr-1.2.6
 	net-misc/wget"
 
+PATCHES="${FILESDIR}/${P}-gcc4.diff"
+
 src_install() {
 	vdr-plugin_src_install