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

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

5 files changed, 42 insertions, 31 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/Manifest b/app-cdr/k9copy/Manifest
index 609ed432a963..a1a3b16b8968 100644
--- a/app-cdr/k9copy/Manifest
+++ b/app-cdr/k9copy/Manifest
@@ -1,5 +1,25 @@
-AUX k9copy-2.3.5-gcc45.patch 984 RMD160 bec743a4c689aa51e7d7d71113a5091e26c785d7 SHA1 a86d6fb100ef2e24d0710990a5f25a820d479ce4 SHA256 292aa700fe72211c7506e355e16ff5eae877d16b4b73906e62ab171011ee4401
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX k9copy-2.3.6-return.patch 205 RMD160 9a734c1bc0ee9b4a69d0a1c84c0e338d4c473b52 SHA1 efc9d53f6cc67543a007e9aa78d85e880fb0b216 SHA256 4563523438fb290f37c569411e2d9cb8838280996cc9df5214701e7658598903
 DIST k9copy-2.3.6-Source.tar.gz 1562476 RMD160 c61a2f3802b50fd99058f448f1687d7bbd543267 SHA1 e0399b42a8dc8b9ea5b0bb332a1e2d7bfa18e104 SHA256 d2ebbb6ee72b8e6b3e7daf62746442e8e3a2edb54603333a418d7da753045436
-EBUILD k9copy-2.3.6.ebuild 1148 RMD160 ebd4a8d06514543f236472633528199612b94be6 SHA1 24b6698ff2ab86a246683f270ebcef194ebe6dc6 SHA256 ab7b2b6c7691e70a3d9d8050a76c590d3d78ec27753a55c4511d1a7ed4ad8bbe
-MISC ChangeLog 9859 RMD160 eefe14633af0330a196f75c5a6ae4e362e7bd9d6 SHA1 4898fe4796a7942c58f0c4d72de8bfd5c16942c7 SHA256 d33e4edadd7010a49526a19cc134bc8c52fcfce22322427feec2a65af81eb515
+EBUILD k9copy-2.3.6.ebuild 1192 RMD160 3b82cb787544328b29ccfd8e90f777cd81618929 SHA1 d9b231bc364f2d64e7c6d3f2cecb2278065d1ed9 SHA256 be07eb5482bc89c7405a6bb33f62191d1bf397224ab7da36af7ab58910209af7
+MISC ChangeLog 10074 RMD160 6bd3fbdc1d1d5765ad98461a95f58e8663b6907b SHA1 760e34b65d7bb0babb78db33f40c985974b6ac18 SHA256 37656b654f2823a3d779f521718b2468f309e363b12ac022720a33f3db7cae41
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNaYj8AAoJENwGBM22xffeZMgP/A7bF6hZxesA0oIjFBxcLlnR
+qdpL0mTOhBYMo98ux19YJqzZiw53M4RlX0tHR8hkHecdR2paEyqamK1r7XYUVcAt
+vYbTPvRBo3A9pRLOasFr9FiMJ435WhgOJu2YtJrBWOktUJCtbz6gJYlOSZncHmb7
+lH9tvXfIDYZ0hwee2RBGgLodVFM/3H/pbxVcr5f/swuITwG+B7vd7mwz+MPfciFw
+XqkR2xyOvDdqr6aKV+sSCO1KPBYfqdayKaqzWe7UcWHOtBM/DBcqQq0IT0csAPkw
+rqXPDSY7p9sB4xrr8dwtz13EQTalTE8u3A5NU8z9hH1aoJfegPIJXPtFS7/xBUrs
+JJwrU2bpCogTOKhe0n9+/tkE3ppRTtebDg6kPuyVS7pAYDsCVW9mTCNelYykIrSF
+URlSdw7o2oGoFXqX+Rt0U1jou4wwzo612cLLpLuc5+l0SzPMxzy7CnAwlmUW54tg
+IMP2i4qvt/8kIAQj1eBG5NoSioy8lG4X5yGWoveoJ6E+YZqz6tHs2ILhYkvV75wW
+wag28gLSWSFMLYNLSRTN5H0VumJp3rVvxxi754ELzKCxzqsUx0UuPjNr+a7dJWF5
+RgWks3cNQBvI7PvHp9aUoHvwELVddPT7AwGTwvJIF2L8N5zzRz/3o/n7XBTpdMVg
+NV0/aT78v8cq1aw2P+Pu
+=kU1a
+-----END PGP SIGNATURE-----
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."