summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-07-08 18:55:57 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-07-08 18:55:57 +0000
commit3ff3ec664a8d425d3f6878cffaac7e61d9ad0ebf (patch)
tree648bbed9ca0eec6eee9dcf95fb432a6f53c95d85 /media-plugins
parentqt USE flag is gone. tcltk->tcl/tk split (diff)
downloadgentoo-2-3ff3ec664a8d425d3f6878cffaac7e61d9ad0ebf.tar.gz
gentoo-2-3ff3ec664a8d425d3f6878cffaac7e61d9ad0ebf.tar.bz2
gentoo-2-3ff3ec664a8d425d3f6878cffaac7e61d9ad0ebf.zip
Added gcc4-compatibility patch.
(Portage version: 2.1.1_pre2-r6)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/vdr-newsticker/ChangeLog6
-rw-r--r--media-plugins/vdr-newsticker/files/vdr-newsticker-0.0.4-gcc4.diff51
-rw-r--r--media-plugins/vdr-newsticker/vdr-newsticker-0.0.4.ebuild4
3 files changed, 59 insertions, 2 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/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