summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-04-16 22:01:57 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-04-16 22:01:57 +0000
commiteab9f0998e37bbf98fbb104f19298a5b6540f410 (patch)
tree141802b8b306f390ac9bcd796f6bd46f579713bb /app-cdr/k9copy
parentamd64 stable, bug 315483 (diff)
downloadgentoo-2-eab9f0998e37bbf98fbb104f19298a5b6540f410.tar.gz
gentoo-2-eab9f0998e37bbf98fbb104f19298a5b6540f410.tar.bz2
gentoo-2-eab9f0998e37bbf98fbb104f19298a5b6540f410.zip
Fix building with GCC 4.5 wrt #304755 by Kacper Kowalik.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr/k9copy')
-rw-r--r--app-cdr/k9copy/ChangeLog6
-rw-r--r--app-cdr/k9copy/files/k9copy-2.3.5-gcc45.patch26
-rw-r--r--app-cdr/k9copy/k9copy-2.3.5.ebuild4
3 files changed, 34 insertions, 2 deletions
diff --git a/app-cdr/k9copy/ChangeLog b/app-cdr/k9copy/ChangeLog
index faa7eb165640..cbeaeec67a1c 100644
--- a/app-cdr/k9copy/ChangeLog
+++ b/app-cdr/k9copy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/k9copy
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.53 2010/02/12 09:17:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.54 2010/04/16 22:01:56 ssuominen Exp $
+
+ 16 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> k9copy-2.3.5.ebuild,
+ +files/k9copy-2.3.5-gcc45.patch:
+ Fix building with GCC 4.5 wrt #304755 by Kacper Kowalik.
*k9copy-2.3.5 (12 Feb 2010)
diff --git a/app-cdr/k9copy/files/k9copy-2.3.5-gcc45.patch b/app-cdr/k9copy/files/k9copy-2.3.5-gcc45.patch
new file mode 100644
index 000000000000..093ef01e9869
--- /dev/null
+++ b/app-cdr/k9copy/files/k9copy-2.3.5-gcc45.patch
@@ -0,0 +1,26 @@
+Passing const char * instead of QByteArray to printf
+
+http://bugs.gentoo.org/show_bug.cgi?id=304755
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- src/xine/k9xineplayer.cpp
++++ src/xine/k9xineplayer.cpp
+@@ -251,7 +251,7 @@
+
+ if ((vo_port = xine_open_video_driver(xine,
+ m_vo.toAscii(), XINE_VISUAL_TYPE_X11, (void *) &vis)) == NULL) {
+- printf("I'm unable to initialize '%s' video driver. Giving up.\n", m_vo.toAscii());
++ printf("I'm unable to initialize '%s' video driver. Giving up.\n", m_vo.toAscii().constData());
+ return ;
+ }
+
+@@ -270,7 +270,7 @@
+ running=false;
+ m_title="";
+ if ((!xine_open(stream, m_mrl.toUtf8())) || (!xine_play(stream, 0, 0))) {
+- printf("Unable to open mrl '%s'\n", m_mrl.toUtf8());
++ printf("Unable to open mrl '%s'\n", m_mrl.toUtf8().constData());
+ return ;
+ }
+ QTimer::singleShot (500, this, SLOT (updatePosition ()));
diff --git a/app-cdr/k9copy/k9copy-2.3.5.ebuild b/app-cdr/k9copy/k9copy-2.3.5.ebuild
index d944190d4308..887d8bf4870d 100644
--- a/app-cdr/k9copy/k9copy-2.3.5.ebuild
+++ b/app-cdr/k9copy/k9copy-2.3.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.5.ebuild,v 1.1 2010/02/12 09:17:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.5.ebuild,v 1.2 2010/04/16 22:01:56 ssuominen Exp $
EAPI=2
KDE_LINGUAS="ca cs de el es_AR es fr it nl pl pt_BR ru sr@Latn sr tr zh_TW"
@@ -27,6 +27,8 @@ RDEPEND="${DEPEND}
S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}/${P}-gcc45.patch" )
+
DOCS="README"
pkg_postinst() {