Add upstream patch to fix compilation with kde-4.6, bug 350352

(Portage version: 2.1.9.41/cvs/Linux x86_64)

4 files changed, 19 insertions, 28 deletions

diff --git a/app-cdr/k9copy/ChangeLog b/app-cdr/k9copy/ChangeLog
index 16b3e4721682..683d9cfed2ac 100644
--- a/app-cdr/k9copy/ChangeLog
+++ b/app-cdr/k9copy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/k9copy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.61 2011/01/30 12:13:13 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.62 2011/02/26 23:11:47 dilfridge Exp $
+
+  26 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/k9copy-2.3.5-gcc45.patch, k9copy-2.3.6.ebuild,
+  +files/k9copy-2.3.6-return.patch:
+  Add upstream patch to fix compilation with kde-4.6, bug 350352
 
   30 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org> -k9copy-2.3.5.ebuild:
   Remove old
diff --git a/app-cdr/k9copy/files/k9copy-2.3.5-gcc45.patch b/app-cdr/k9copy/files/k9copy-2.3.5-gcc45.patch
deleted file mode 100644
index 093ef01e9869..000000000000
--- a/app-cdr/k9copy/files/k9copy-2.3.5-gcc45.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/files/k9copy-2.3.6-return.patch b/app-cdr/k9copy/files/k9copy-2.3.6-return.patch
new file mode 100644
index 000000000000..86316f30936e
--- /dev/null
+++ b/app-cdr/k9copy/files/k9copy-2.3.6-return.patch
@@ -0,0 +1,10 @@
+--- kde4/src/mpeg2/kdecmpeg2.cpp	2009/11/23 21:58:43	450
++++ kde4/src/mpeg2/kdecmpeg2.cpp	2011/02/06 20:41:08	561
+@@ -286,6 +286,7 @@
+ 	      }
+     	}
+     }
++    return 0;
+ }
+ 
+ void kDecMPEG2::sync() {
diff --git a/app-cdr/k9copy/k9copy-2.3.6.ebuild b/app-cdr/k9copy/k9copy-2.3.6.ebuild
index 870a7d10ff2a..be48f723c3ad 100644
--- a/app-cdr/k9copy/k9copy-2.3.6.ebuild
+++ b/app-cdr/k9copy/k9copy-2.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.6.ebuild,v 1.4 2011/01/30 09:00:31 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.6.ebuild,v 1.5 2011/02/26 23:11:47 dilfridge Exp $
 
 EAPI=3
 
@@ -40,6 +40,8 @@ RDEPEND="${DEPEND}
 
 DOCS=( README )
 
+PATCHES=( "${FILESDIR}/${P}-return.patch" )
+
 pkg_postinst() {
 	kde4-base_pkg_postinst
 	has_version '>=app-cdr/k3b-1.50' || elog "If you want K3b burning support in ${P}, please install app-cdr/k3b separately."