Fix building with GCC 4.5 wrt #304755 by Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-cdr/k9copy/ChangeLog b/app-cdr/k9copy/ChangeLog
index faa7eb16564022c758c87aa06ad47246669a79f4..cbeaeec67a1c11223a4d420c674e2e82bc851d9f 100644 (file)
--- 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/Manifest b/app-cdr/k9copy/Manifest
index 1f5a213fc8d632cbf0a803ac576259d8eb295e23..2b3912816800e58e1302504da8e74c7921163f57 100644 (file)
--- a/app-cdr/k9copy/Manifest
+++ b/app-cdr/k9copy/Manifest
@@ -1,4 +1,5 @@
+AUX k9copy-2.3.5-gcc45.patch 984 RMD160 bec743a4c689aa51e7d7d71113a5091e26c785d7 SHA1 a86d6fb100ef2e24d0710990a5f25a820d479ce4 SHA256 292aa700fe72211c7506e355e16ff5eae877d16b4b73906e62ab171011ee4401
 DIST k9copy-2.3.5-Source.tar.gz 1507747 RMD160 00d05b3da95d7fbb7227c24c6d2819a3049c31cf SHA1 9ca21db87120fe9ad5a424c8a42aebf499497563 SHA256 a25eb57f7c47860ce0f399734106ada961e09583f033b828808f14a1afe50233
-EBUILD k9copy-2.3.5.ebuild 995 RMD160 89d546aa5ca9d852c9839be9d21f40befd4f4d5a SHA1 00fdf1024b60e7aa90bc159966f55984b0a90279 SHA256 a7b5fd0df9388006a44b2f67111fa956a7ae3585478bc4f7e03634eab1ad0bd1
-MISC ChangeLog 8925 RMD160 7ee823ae66b4ffe689e4a8c0d034198573cd8866 SHA1 db16ed3145fbfe79ae2f210a90e13989e61ea082 SHA256 1310000c137aecc3dab2370ab95a5c49f5f4cb568ba8ab6a145a9b7e60acb5ce
+EBUILD k9copy-2.3.5.ebuild 1039 RMD160 b61d98219d3f39f07890d73c953bbd72418a5c38 SHA1 0f8f9affa570fd7fa727d9cf40c4c35a1db5146c SHA256 544a9399f320e37a48474227559eab6f05ea21656829c2a5e944ca2137b520bd
+MISC ChangeLog 9095 RMD160 dbe684c069ee873362070ce9ffca50f885a74233 SHA1 c3d9604373c658f138e4dac8260fe1a1c273a7f9 SHA256 c975bd760748ac9ce1e93e32e7bb27e25df80f43a2bc225761e66c88fc296dce
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a

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 (file)
index 0000000..093ef01
--- /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 d944190d430870860b055e9bcd5a10cb616ed7a8..887d8bf4870d0c4694e9fe4a3be2a5ced31adf6e 100644 (file)
--- 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() {