diff options
-rw-r--r-- | audio/mp3diags/distinfo | 5 | ||||
-rw-r--r-- | audio/mp3diags/patches/patch-src_Helpers.h | 16 | ||||
-rw-r--r-- | audio/mp3diags/patches/patch-src_fstream__unicode.cpp | 28 | ||||
-rw-r--r-- | audio/mp3diags/patches/patch-src_fstream__unicode.h | 51 |
4 files changed, 99 insertions, 1 deletions
diff --git a/audio/mp3diags/distinfo b/audio/mp3diags/distinfo index 095d18d21bd..e4d4688d306 100644 --- a/audio/mp3diags/distinfo +++ b/audio/mp3diags/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2013/05/26 20:02:38 wiz Exp $ +$NetBSD: distinfo,v 1.13 2014/01/02 15:52:56 wiz Exp $ SHA1 (MP3Diags-1.0.12.079.tar.gz) = dfcdda867215a22820f935e81aa5bb61c4d5fb81 RMD160 (MP3Diags-1.0.12.079.tar.gz) = 1bf10a9f18f090f365aa8d82801c218e6c651fa0 @@ -6,4 +6,7 @@ Size (MP3Diags-1.0.12.079.tar.gz) = 959757 bytes SHA1 (patch-aa) = 679dcb25b6acfc9c2fcb6076a467477cb03058bb SHA1 (patch-src_FileRenamerDlgImpl.h) = 9448a5b364fd75119b34e82ca906eba2dd7dc960 SHA1 (patch-src_Helpers.cpp) = f0972524e34cbaa98ac8fc67038cf2bd5858a5c3 +SHA1 (patch-src_Helpers.h) = 8f65908564d7d8708f12bcd57f3ed46520dad1ec SHA1 (patch-src_Notes.h) = 63c5f620a5c5caca4ad6b9aab3b3ab3c2f57ad30 +SHA1 (patch-src_fstream__unicode.cpp) = 5a78606369119880c65937373eec55581fc77c2a +SHA1 (patch-src_fstream__unicode.h) = 068d7bdf3a04f27973769a21effd9814c9c8245b diff --git a/audio/mp3diags/patches/patch-src_Helpers.h b/audio/mp3diags/patches/patch-src_Helpers.h new file mode 100644 index 00000000000..67e31c6f42c --- /dev/null +++ b/audio/mp3diags/patches/patch-src_Helpers.h @@ -0,0 +1,16 @@ +$NetBSD: patch-src_Helpers.h,v 1.1 2014/01/02 15:52:56 wiz Exp $ + +Add missing headers for streamsize type. + +--- src/Helpers.h.orig 2010-03-19 17:35:22.000000000 +0000 ++++ src/Helpers.h +@@ -24,7 +24,9 @@ + #define HelpersH + + ++#include <ios> + #include <iosfwd> ++#include <iostream> + #include <string> + #include <stdexcept> + #include <cstdlib> // for exit() diff --git a/audio/mp3diags/patches/patch-src_fstream__unicode.cpp b/audio/mp3diags/patches/patch-src_fstream__unicode.cpp new file mode 100644 index 00000000000..1ffc669e614 --- /dev/null +++ b/audio/mp3diags/patches/patch-src_fstream__unicode.cpp @@ -0,0 +1,28 @@ +$NetBSD: patch-src_fstream__unicode.cpp,v 1.1 2014/01/02 15:52:56 wiz Exp $ + +clang support from upstream SVN 278. + +--- src/fstream_unicode.cpp.orig 2009-11-03 12:20:00.000000000 +0000 ++++ src/fstream_unicode.cpp +@@ -19,7 +19,7 @@ + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +-#ifdef __GNUC__ ++#if defined(__GNUC__) && !defined(__llvm__) + + + #include "fstream_unicode.h" +@@ -178,9 +178,10 @@ int unicodeOpenHlp(const int& fd, std::i + + //ttt2 review O_SHORT_LIVED + +-#else // #ifdef __GNUC__ ++#else // #if defined(__GNUC__) && !defined(__llvm__) + + // nothing to do for now; the MSVC version is fully inline and no ports to other compilers exist + +-#endif // #ifdef __GNUC__ ++#endif // #if defined(__GNUC__) && !defined(__llvm__) ++ + diff --git a/audio/mp3diags/patches/patch-src_fstream__unicode.h b/audio/mp3diags/patches/patch-src_fstream__unicode.h new file mode 100644 index 00000000000..8a261045948 --- /dev/null +++ b/audio/mp3diags/patches/patch-src_fstream__unicode.h @@ -0,0 +1,51 @@ +$NetBSD: patch-src_fstream__unicode.h,v 1.1 2014/01/02 15:52:56 wiz Exp $ + +clang support from upstream SVN 278. + +--- src/fstream_unicode.h.orig 2009-09-15 04:49:36.000000000 +0000 ++++ src/fstream_unicode.h +@@ -57,7 +57,7 @@ std::string, without the need of calling + + */ + +-#ifdef __GNUC__ ++#if defined(__GNUC__) && !defined(__llvm__) + + #include <ext/stdio_filebuf.h> + #include <istream> +@@ -578,7 +578,7 @@ typedef basic_ofstream_unicode<char> ofs + typedef basic_fstream_unicode<char> fstream_unicode; + + +-#elif defined(_MSC_VER) && _MSC_VER>=1400 // #ifdef __GNUC__ ++#elif defined(_MSC_VER) && _MSC_VER>=1400 // #if defined(__GNUC__) && !defined(__llvm__) + + // Visual Studio port by Sebastian Schuberth + +@@ -682,7 +682,17 @@ class fstream_utf8:public std::fstream + } + }; + +-#else // _MSC_VER / __GNUC__ ++#elif defined(__llvm__) ++ ++ #include <fstream> ++ ++ //ttt2 not sure these are enough outside Linux ++ typedef std::basic_ifstream<char> ifstream_utf8; ++ typedef std::basic_ofstream<char> ofstream_utf8; ++ typedef std::basic_fstream<char> fstream_utf8; ++ ++ ++#else // _MSC_VER / gcc / __llvm__ + + //#error classes i/ofstream_utf8 need to be ported to this compiler + #warning classes i/ofstream_utf8 need to be ported to your compiler +@@ -693,6 +703,6 @@ class fstream_utf8:public std::fstream + typedef std::basic_ofstream<char> ofstream_utf8; + typedef std::basic_fstream<char> fstream_utf8; + +-#endif // _MSC_VER / __GNUC__ ++#endif // _MSC_VER / gcc / __llvm__ + + #endif // FStreamUtf8H |