diff options
| author | marino <marino> | 2012-12-15 11:10:37 +0000 |
|---|---|---|
| committer | marino <marino> | 2012-12-15 11:10:37 +0000 |
| commit | ae9ad9f4b0c798541877061dcb7b31d6aa9ac0c3 (patch) | |
| tree | fe4f6ba539ace4de51480fcfa4734570f2bfa11c /audio | |
| parent | a0bc17850807b10c378aea4d7f84f1fda71abf7d (diff) | |
| download | pkgsrc-ae9ad9f4b0c798541877061dcb7b31d6aa9ac0c3.tar.gz | |
audio/mp3diags: Fix out-of-scope errors
getpid and clearPtrContainer were out-of-scope.
Add unistd.h and pearl namespace to fix (seen on gcc 4.6+)
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/mp3diags/distinfo | 5 | ||||
| -rw-r--r-- | audio/mp3diags/patches/patch-src_Helpers.cpp | 16 | ||||
| -rw-r--r-- | audio/mp3diags/patches/patch-src_SimpleSaxHandler.h | 15 |
3 files changed, 30 insertions, 6 deletions
diff --git a/audio/mp3diags/distinfo b/audio/mp3diags/distinfo index 892de63b479..3091a121de0 100644 --- a/audio/mp3diags/distinfo +++ b/audio/mp3diags/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.10 2012/01/11 19:25:08 hans Exp $ +$NetBSD: distinfo,v 1.11 2012/12/15 11:10:37 marino Exp $ SHA1 (MP3Diags-1.0.09.063.tar.gz) = 27e95e7b92073bc9e2bae16efd5a3573e4f884c7 RMD160 (MP3Diags-1.0.09.063.tar.gz) = a279687a2617b95f4d2d38bd9922f786043e415e Size (MP3Diags-1.0.09.063.tar.gz) = 958959 bytes SHA1 (patch-aa) = 679dcb25b6acfc9c2fcb6076a467477cb03058bb SHA1 (patch-src_FileRenamerDlgImpl.h) = 9448a5b364fd75119b34e82ca906eba2dd7dc960 -SHA1 (patch-src_Helpers.cpp) = 067d914b96940eb971a50bedfbb525ac7349e356 +SHA1 (patch-src_Helpers.cpp) = f0972524e34cbaa98ac8fc67038cf2bd5858a5c3 SHA1 (patch-src_Notes.h) = 63c5f620a5c5caca4ad6b9aab3b3ab3c2f57ad30 +SHA1 (patch-src_SimpleSaxHandler.h) = 5d74fca1c760d3daaec0db232867f88af7652ff6 diff --git a/audio/mp3diags/patches/patch-src_Helpers.cpp b/audio/mp3diags/patches/patch-src_Helpers.cpp index 81e1ad15690..08ba4e1de09 100644 --- a/audio/mp3diags/patches/patch-src_Helpers.cpp +++ b/audio/mp3diags/patches/patch-src_Helpers.cpp @@ -1,8 +1,16 @@ -$NetBSD: patch-src_Helpers.cpp,v 1.1 2012/01/11 19:25:08 hans Exp $ +$NetBSD: patch-src_Helpers.cpp,v 1.2 2012/12/15 11:10:38 marino Exp $ ---- src/Helpers.cpp.orig 2011-09-10 19:51:46.000000000 +0200 -+++ src/Helpers.cpp 2012-01-02 11:31:20.777472032 +0100 -@@ -914,7 +914,7 @@ QString getSystemInfo() //ttt2 perhaps s +--- src/Helpers.cpp.orig 2011-09-10 17:51:46.000000000 +0000 ++++ src/Helpers.cpp +@@ -20,6 +20,7 @@ + ***************************************************************************/ + + ++#include <unistd.h> + #include <iostream> + #include "fstream_unicode.h" + #include <sstream> +@@ -914,7 +915,7 @@ QString getSystemInfo() //ttt2 perhaps s filters << "*-release" << "*_version"; dir.setNameFilters(filters); QStringList lFiles (dir.entryList(QDir::Files)); diff --git a/audio/mp3diags/patches/patch-src_SimpleSaxHandler.h b/audio/mp3diags/patches/patch-src_SimpleSaxHandler.h new file mode 100644 index 00000000000..1f9e9e7f19e --- /dev/null +++ b/audio/mp3diags/patches/patch-src_SimpleSaxHandler.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_SimpleSaxHandler.h,v 1.1 2012/12/15 11:10:38 marino Exp $ + +Fix "clearPtrContainer" out of scope error on gcc4.6+ + +--- src/SimpleSaxHandler.h.orig 2009-10-13 12:02:58.000000000 +0000 ++++ src/SimpleSaxHandler.h +@@ -101,7 +101,7 @@ struct SimpleSaxHandler : public QXmlDef + + /*override*/ ~SimpleSaxHandler() + { +- clearPtrContainer(m_lpNodes); ++ pearl::clearPtrContainer(m_lpNodes); + } + + private: |