[pkgsrc/pkgsrc-2012Q1]: pkgsrc/audio/amarok-kde3 Pullup ticket #3713 - reques...

[sbd <sbd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/710d8d2a26e0
branches:  pkgsrc-2012Q1
changeset: 601999:710d8d2a26e0
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Sun Apr 08 10:53:25 2012 +0000

description:
Pullup ticket #3713 - requested by dholland
audio/amarok-kde3 build fix.

Revisions pulled up:
- audio/amarok-kde3/distinfo                                    1.3
- audio/amarok-kde3/patches/patch-amarok_src_engine_xine_xine-engine_cpp 1.1

---
   Module Name: pkgsrc
   Committed By:        dholland
   Date:                Sat Apr  7 23:20:42 UTC 2012

   Modified Files:
        pkgsrc/audio/amarok-kde3: distinfo
   Added Files:
        pkgsrc/audio/amarok-kde3/patches:
            patch-amarok_src_engine_xine_xine-engine_cpp

   Log Message:
   Patch build with new xine.

diffstat:

 audio/amarok-kde3/distinfo                                             |   3 +-
 audio/amarok-kde3/patches/patch-amarok_src_engine_xine_xine-engine_cpp |  15 ++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r 68b8b231472c -r 710d8d2a26e0 audio/amarok-kde3/distinfo
--- a/audio/amarok-kde3/distinfo        Sun Apr 08 09:19:15 2012 +0000
+++ b/audio/amarok-kde3/distinfo        Sun Apr 08 10:53:25 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2011/01/29 21:36:10 markd Exp $
+$NetBSD: distinfo,v 1.2.10.1 2012/04/08 10:53:25 sbd Exp $
 
 SHA1 (amarok-1.4.10.tar.bz2) = cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd
 RMD160 (amarok-1.4.10.tar.bz2) = f86c71dd0459e0cf1ff586cd6de240ca6501cf62
@@ -15,3 +15,4 @@
 SHA1 (patch-aj) = 667768476d217c78540368e450ca6048fa86d931
 SHA1 (patch-ak) = cc0b3d773af3441d99a0b3a5327ca694a0961d56
 SHA1 (patch-al) = f7cf6ade2fcdd4993287bde82cf41231dbb5b512
+SHA1 (patch-amarok_src_engine_xine_xine-engine_cpp) = 6319e5f6a902ae4d4b1372566e7ec4728a72297c
diff -r 68b8b231472c -r 710d8d2a26e0 audio/amarok-kde3/patches/patch-amarok_src_engine_xine_xine-engine_cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/amarok-kde3/patches/patch-amarok_src_engine_xine_xine-engine_cpp    Sun Apr 08 10:53:25 2012 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-amarok_src_engine_xine_xine-engine_cpp,v 1.1.2.2 2012/04/08 10:53:25 sbd Exp $
+
+Fix build with newer xine-lib.
+
+--- amarok/src/engine/xine/xine-engine.cpp~    2008-08-13 21:21:51.000000000 +0000
++++ amarok/src/engine/xine/xine-engine.cpp
+@@ -1131,7 +1131,7 @@ bool XineEngine::metaDataForUrl(const KU
+ 
+ bool XineEngine::getAudioCDContents(const QString &device, KURL::List &urls)
+ {
+-    char **xine_urls = NULL;
++    const char *const *xine_urls = NULL;
+     int num;
+     int i = 0;
+