Added patch for format strings warnings. Could fix problems with HTTP streams on 64-bit systems.

(Portage version: 2.0.51.22-r1)

3 files changed, 96 insertions, 3 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index e609c2c805d0..09d4ade2e519 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.30 2005/04/18 16:21:56 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.31 2005/05/29 23:44:20 flameeyes Exp $
+
+  29 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kaffeine-0.6-formats.patch, kaffeine-0.6-r1.ebuild:
+  Added patch for format strings warnings. Could fix problems with HTTP
+  streams on 64-bit systems.
 
   18 Apr 2005; Carsten Lohrke <carlo@gentoo.org> kaffeine-0.6.ebuild,
   kaffeine-0.6-r1.ebuild:
diff --git a/media-video/kaffeine/files/kaffeine-0.6-formats.patch b/media-video/kaffeine/files/kaffeine-0.6-formats.patch
new file mode 100644
index 000000000000..7ee47fc6ca2b
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-0.6-formats.patch
@@ -0,0 +1,81 @@
+diff -ur -x '*~' kaffeine-0.6/kaffeine/dvb/dvbpanel.cpp kaffeine-0.6-gcc4/kaffeine/dvb/dvbpanel.cpp
+--- kaffeine-0.6/kaffeine/dvb/dvbpanel.cpp	2005-02-02 11:08:24.000000000 +0100
++++ kaffeine-0.6-gcc4/kaffeine/dvb/dvbpanel.cpp	2005-05-30 01:25:44.710617768 +0200
+@@ -679,7 +679,7 @@
+ 	int apidn=napid;
+ 	int i;
+ 	
+-	fprintf( stderr, "Tuning to : %s / autocount : %d\n", chan->name.latin1(), autocount );
++	fprintf( stderr, "Tuning to : %s / autocount : %lu\n", chan->name.latin1(), autocount );
+ 	QTime tm;
+ 	tm.start();
+ 	int ret = dvb->goLive( chan, fifoName, apidn );
+diff -ur -x '*~' kaffeine-0.6/kaffeine/dvb/dvbsi.cpp kaffeine-0.6-gcc4/kaffeine/dvb/dvbsi.cpp
+--- kaffeine-0.6/kaffeine/dvb/dvbsi.cpp	2005-02-02 11:08:25.000000000 +0100
++++ kaffeine-0.6-gcc4/kaffeine/dvb/dvbsi.cpp	2005-05-30 01:26:16.219827640 +0200
+@@ -176,19 +176,19 @@
+ 				s = t.setNum( getBits(b,0,32), 16 );
+ 				freq = s.toInt();
+ 				freq /=100;
+-				fprintf( stderr, "          %d\n", freq );
++				fprintf( stderr, "          %lu\n", freq );
+ 				trans->freqlist.append( freq );
+ 				break;
+ 			case 2: // cable
+ 				s = t.setNum( getBits(b,0,32), 16 );
+ 				freq = s.toInt();
+ 				freq /=10;
+-				fprintf( stderr, "          %d\n", freq );
++				fprintf( stderr, "          %lu\n", freq );
+ 				trans->freqlist.append( freq );
+ 				break;
+ 			case 3: // terrestrial
+ 				freq = getBits(b,0,32)/100;
+-				fprintf( stderr, "          %d\n", freq );
++				fprintf( stderr, "          %lu\n", freq );
+ 				trans->freqlist.append( freq );
+ 				break;
+ 		}
+@@ -385,7 +385,7 @@
+ 					}
+ 				}
+ 				if ( j!=-1 ) {
+-					fprintf(stderr,"          Appending freq %d to %d\n", trans->freqlist[i], curtrans->freq );
++					fprintf(stderr,"          Appending freq %lu to %lu\n", trans->freqlist[i], curtrans->freq );
+ 					curtrans->freqlist.append( trans->freqlist[i] );
+ 				}
+ 			}
+diff -ur -x '*~' kaffeine-0.6/kaffeine/dvb/dvbstream.cpp kaffeine-0.6-gcc4/kaffeine/dvb/dvbstream.cpp
+--- kaffeine-0.6/kaffeine/dvb/dvbstream.cpp	2005-02-15 09:18:35.000000000 +0100
++++ kaffeine-0.6-gcc4/kaffeine/dvb/dvbstream.cpp	2005-05-30 01:26:51.809417200 +0200
+@@ -262,7 +262,7 @@
+ 			feparams.u.qam.symbol_rate = srate;
+ 			feparams.u.qam.fec_inner = chan->tp.coderateH;
+ 			feparams.u.qam.modulation = chan->tp.modulation;
+-			fprintf(stderr,"inv:%d sr:%d fecH:%d mod:%d\n", chan->tp.inversion,
++			fprintf(stderr,"inv:%d sr:%lu fecH:%d mod:%d\n", chan->tp.inversion,
+ 				srate, chan->tp.coderateH, chan->tp.modulation );
+ 			break;
+ 		}
+diff -ur -x '*~' kaffeine-0.6/kaffeine/player-parts/http.c kaffeine-0.6-gcc4/kaffeine/player-parts/http.c
+--- kaffeine-0.6/kaffeine/player-parts/http.c	2005-02-02 11:08:25.000000000 +0100
++++ kaffeine-0.6-gcc4/kaffeine/player-parts/http.c	2005-05-30 01:24:39.999455360 +0200
+@@ -56,6 +56,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <errno.h>
++#include <inttypes.h>
+ 
+ #include "http.h"
+ 
+@@ -516,8 +517,8 @@
+ 	if (this->contentlength == 0) {
+ 	  intmax_t contentlength;
+ 	  
+-	  if ( strlen(this->buf)<(BUFSIZE-20) && sscanf(this->buf, "Content-Length: %Ld", &contentlength) == 1) {
+-	    printf ("http: content length = %Ld bytes\n", contentlength);
++	  if ( strlen(this->buf)<(BUFSIZE-20) && sscanf(this->buf, "Content-Length: %" PRIdMAX, &contentlength) == 1) {
++	    printf ("http: content length = %" PRIdMAX " bytes\n", contentlength);
+ 	    this->contentlength = (off_t)contentlength;
+ 	  }
+         }
diff --git a/media-video/kaffeine/kaffeine-0.6-r1.ebuild b/media-video/kaffeine/kaffeine-0.6-r1.ebuild
index b456b6283799..206812d01384 100644
--- a/media-video/kaffeine/kaffeine-0.6-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-0.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.6-r1.ebuild,v 1.2 2005/04/18 16:21:56 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.6-r1.ebuild,v 1.3 2005/05/29 23:44:20 flameeyes Exp $
 
-inherit kde
+inherit eutils kde
 
 DESCRIPTION="Media player for KDE based on xine-lib."
 HOMEPAGE="http://kaffeine.sourceforge.net/"
@@ -20,3 +20,10 @@ DEPEND=">=x11-base/xorg-x11-6.8.0-r4
 # the dependency on xorg-x11 is meant to avoid bug #59746
 
 need-kde 3.2
+
+src_unpack() {
+	kde_src_unpack
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-formats.patch
+}