Sun Apr 8 11:13:16 2012 UTC ()
Pullup ticket #3717 - requested by dholland
multimedia/kaffeine build fix

Revisions pulled up:
- multimedia/kaffeine/distinfo                                  1.2
- multimedia/kaffeine/patches/patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp 1.1

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sun Apr  8 02:23:46 UTC 2012

   Modified Files:
   	pkgsrc/multimedia/kaffeine: distinfo
   Added Files:
   	pkgsrc/multimedia/kaffeine/patches:
   	    patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp

   Log Message:
   Fix build with new xine-lib.


(sbd)
diff -r1.1.1.1 -r1.1.1.1.48.1 pkgsrc/multimedia/kaffeine/distinfo
diff -r0 -r1.1.2.2 pkgsrc/multimedia/kaffeine/patches/patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp

cvs diff -r1.1.1.1 -r1.1.1.1.48.1 pkgsrc/multimedia/kaffeine/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/kaffeine/Attic/distinfo 2006/12/06 18:30:11 1.1.1.1
+++ pkgsrc/multimedia/kaffeine/Attic/distinfo 2012/04/08 11:13:15 1.1.1.1.48.1
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.1.1.1 2006/12/06 18:30:11 xtraeme Exp $ 1$NetBSD: distinfo,v 1.1.1.1.48.1 2012/04/08 11:13:15 sbd Exp $
2 2
3SHA1 (kaffeine-0.8.3.tar.bz2) = 6198ffe59422124855007a42443e2a69f6451e66 3SHA1 (kaffeine-0.8.3.tar.bz2) = 6198ffe59422124855007a42443e2a69f6451e66
4RMD160 (kaffeine-0.8.3.tar.bz2) = f22a971481e8fd1a96063fef66d156d119c1e596 4RMD160 (kaffeine-0.8.3.tar.bz2) = f22a971481e8fd1a96063fef66d156d119c1e596
5Size (kaffeine-0.8.3.tar.bz2) = 2940941 bytes 5Size (kaffeine-0.8.3.tar.bz2) = 2940941 bytes
6SHA1 (patch-aa) = ae70b289c384e3ec33874ba79a5f3c6642d18c8f 6SHA1 (patch-aa) = ae70b289c384e3ec33874ba79a5f3c6642d18c8f
7SHA1 (patch-ab) = 3089b793f485b161543981267de146dd57b11092 7SHA1 (patch-ab) = 3089b793f485b161543981267de146dd57b11092
8SHA1 (patch-ac) = 0a52e900c9e79683aca8f27d0c65045574e81d31 8SHA1 (patch-ac) = 0a52e900c9e79683aca8f27d0c65045574e81d31
9SHA1 (patch-ad) = 85183e84ec7593cee6f18321242bad5a4611e888 9SHA1 (patch-ad) = 85183e84ec7593cee6f18321242bad5a4611e888
 10SHA1 (patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp) = 36638519eaac6679f69a88e861759037a95627d9

File Added: pkgsrc/multimedia/kaffeine/patches/Attic/patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp
$NetBSD: patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp,v 1.1.2.2 2012/04/08 11:13:16 sbd Exp $

Fix build with current xine-lib.

--- kaffeine/src/player-parts/xine-part/kxinewidget.cpp~	2006-11-26 19:12:24.000000000 +0000
+++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp
@@ -2494,7 +2494,7 @@ void KXineWidget::getAutoplayPlugins(QSt
 
 bool KXineWidget::getAutoplayPluginURLS(const QString& plugin, QStringList& list)
 {
-	char** urls = NULL;
+	const char *const *urls = NULL;
 	int num;
 	int i = 0;