From 77e498695adcd04e251199ba4e4257cc3e635407 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 29 Apr 2013 21:14:58 +0000
Subject: The implicit conversion from QString to ofstream file name argument
 is ambigious, so explicitly use the ascii() version.

---
 audio/xsidplay/distinfo                            |  5 ++++-
 audio/xsidplay/patches/patch-src_ConfigFileOld.cpp | 13 +++++++++++++
 audio/xsidplay/patches/patch-src_HistoryFile.cpp   | 13 +++++++++++++
 audio/xsidplay/patches/patch-src_Playlist.cpp      | 13 +++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 audio/xsidplay/patches/patch-src_ConfigFileOld.cpp
 create mode 100644 audio/xsidplay/patches/patch-src_HistoryFile.cpp
 create mode 100644 audio/xsidplay/patches/patch-src_Playlist.cpp

(limited to 'audio')

diff --git a/audio/xsidplay/distinfo b/audio/xsidplay/distinfo
index 36633f58383..98a02a7e8d4 100644
--- a/audio/xsidplay/distinfo
+++ b/audio/xsidplay/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2011/11/27 11:51:16 marino Exp $
+$NetBSD: distinfo,v 1.14 2013/04/29 21:14:58 joerg Exp $
 
 SHA1 (xsidplay-1.6.5.1a.tgz) = 60f2262a8dd79b276272d49eff9a07277dc6c9aa
 RMD160 (xsidplay-1.6.5.1a.tgz) = 9a0529c7b76e7659feddc35c04aaf81ae2002984
@@ -6,3 +6,6 @@ Size (xsidplay-1.6.5.1a.tgz) = 355698 bytes
 SHA1 (patch-aa) = ca8ce2db592937d2f5328aae885d9be0074e156e
 SHA1 (patch-ab) = 7b67abc283fdedb6211fb41829a77dade0deb2df
 SHA1 (patch-ac) = ec7d71b9cc3be97601c842d22887d147933853e3
+SHA1 (patch-src_ConfigFileOld.cpp) = 22577eaf32a2811b605ee8dacb10456e7433a8e9
+SHA1 (patch-src_HistoryFile.cpp) = e9b83cac451d441797684646682553a4151cd65c
+SHA1 (patch-src_Playlist.cpp) = 5e93bf8aa3a925367cef012995d597d821d601f4
diff --git a/audio/xsidplay/patches/patch-src_ConfigFileOld.cpp b/audio/xsidplay/patches/patch-src_ConfigFileOld.cpp
new file mode 100644
index 00000000000..506169963bb
--- /dev/null
+++ b/audio/xsidplay/patches/patch-src_ConfigFileOld.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_ConfigFileOld.cpp,v 1.1 2013/04/29 21:14:58 joerg Exp $
+
+--- src/ConfigFileOld.cpp.orig	2013-04-29 19:09:27.000000000 +0000
++++ src/ConfigFileOld.cpp
+@@ -339,7 +339,7 @@ bool ConfigFileOld::save()
+ #ifdef XSID_HAVE_IOS_BIN
+     ofstream toFile(fileName,ios::out|ios::bin|ios::trunc);
+ #else
+-    ofstream toFile(fileName,ios::out|ios::binary|ios::trunc);
++    ofstream toFile(fileName.ascii(),ios::out|ios::binary|ios::trunc);
+ #endif
+     if ( !toFile.fail() )
+     {
diff --git a/audio/xsidplay/patches/patch-src_HistoryFile.cpp b/audio/xsidplay/patches/patch-src_HistoryFile.cpp
new file mode 100644
index 00000000000..6f24594711e
--- /dev/null
+++ b/audio/xsidplay/patches/patch-src_HistoryFile.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_HistoryFile.cpp,v 1.1 2013/04/29 21:14:59 joerg Exp $
+
+--- src/HistoryFile.cpp.orig	2013-04-29 19:14:06.000000000 +0000
++++ src/HistoryFile.cpp
+@@ -94,7 +94,7 @@ bool HistoryFile::save(HistoryDialog& di
+ #ifdef XSID_HAVE_IOS_BIN
+     ofstream toFile(fileName,ios::out|ios::bin|ios::trunc);
+ #else
+-    ofstream toFile(fileName,ios::out|ios::binary|ios::trunc);
++    ofstream toFile(fileName.ascii(),ios::out|ios::binary|ios::trunc);
+ #endif
+     if ( !toFile.fail() )
+     {
diff --git a/audio/xsidplay/patches/patch-src_Playlist.cpp b/audio/xsidplay/patches/patch-src_Playlist.cpp
new file mode 100644
index 00000000000..014304ed0bf
--- /dev/null
+++ b/audio/xsidplay/patches/patch-src_Playlist.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Playlist.cpp,v 1.1 2013/04/29 21:14:59 joerg Exp $
+
+--- src/Playlist.cpp.orig	2013-04-29 19:14:27.000000000 +0000
++++ src/Playlist.cpp
+@@ -373,7 +373,7 @@ bool Playlist::save()
+ #ifdef XSID_HAVE_IOS_BIN
+     ofstream toFile(fileName,ios::out|ios::bin|ios::trunc);
+ #else
+-    ofstream toFile(fileName,ios::out|ios::binary|ios::trunc);
++    ofstream toFile(fileName.ascii(),ios::out|ios::binary|ios::trunc);
+ #endif
+     if ( !toFile.fail() )
+     {
-- 
cgit v1.2.3