From b8d84c4b9e541261c24420f2582cc080ccdd813e Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 12 Mar 2014 12:28:27 +0000 Subject: Update to 1.2.01: 17.01.2014 - 1.2.01 - 1.2 as the new stable branch - build fix for clang and for Solaris - fixed broken links in documentation and moved alternate downloads from Dropbox to my ISP 31.03.2013 - 1.2.00 - new version number to support the new "stable" branch 01.12.2012 - 1.1.21.080 - fixed bug that caused a "%s" to be shown instead of the list of files about to be changed --- audio/mp3diags/Makefile | 5 +-- audio/mp3diags/distinfo | 16 +++---- audio/mp3diags/patches/patch-aa | 16 ++++--- .../patches/patch-src_FileRenamerDlgImpl.h | 16 ------- audio/mp3diags/patches/patch-src_Helpers.h | 17 -------- audio/mp3diags/patches/patch-src_Notes.h | 27 +++++++----- .../mp3diags/patches/patch-src_fstream__unicode.h | 51 ---------------------- 7 files changed, 34 insertions(+), 114 deletions(-) delete mode 100644 audio/mp3diags/patches/patch-src_FileRenamerDlgImpl.h delete mode 100644 audio/mp3diags/patches/patch-src_Helpers.h delete mode 100644 audio/mp3diags/patches/patch-src_fstream__unicode.h diff --git a/audio/mp3diags/Makefile b/audio/mp3diags/Makefile index dd6a2c6767d..ba072ddfd86 100644 --- a/audio/mp3diags/Makefile +++ b/audio/mp3diags/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2014/02/12 23:17:34 tron Exp $ +# $NetBSD: Makefile,v 1.43 2014/03/12 12:28:27 wiz Exp $ -DISTNAME= MP3Diags-1.0.12.079 +DISTNAME= MP3Diags-1.2.01 PKGNAME= ${DISTNAME:S/MP3D/mp3d/} -PKGREVISION= 6 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3diags/} diff --git a/audio/mp3diags/distinfo b/audio/mp3diags/distinfo index 066c6d8e43b..e48434726e0 100644 --- a/audio/mp3diags/distinfo +++ b/audio/mp3diags/distinfo @@ -1,11 +1,7 @@ -$NetBSD: distinfo,v 1.16 2014/01/04 22:57:19 wiz Exp $ +$NetBSD: distinfo,v 1.17 2014/03/12 12:28:27 wiz Exp $ -SHA1 (MP3Diags-1.0.12.079.tar.gz) = dfcdda867215a22820f935e81aa5bb61c4d5fb81 -RMD160 (MP3Diags-1.0.12.079.tar.gz) = 1bf10a9f18f090f365aa8d82801c218e6c651fa0 -Size (MP3Diags-1.0.12.079.tar.gz) = 959757 bytes -SHA1 (patch-aa) = 679dcb25b6acfc9c2fcb6076a467477cb03058bb -SHA1 (patch-src_FileRenamerDlgImpl.h) = 8520f3ae85a2f34f9f9ebd5f744e3be1f8d476c2 -SHA1 (patch-src_Helpers.h) = 6352cad39f6f248612570a66461737e80471bd57 -SHA1 (patch-src_Notes.h) = fe707d30093bb1140e3acc29631bbd65c40a3622 -SHA1 (patch-src_fstream__unicode.cpp) = 5a78606369119880c65937373eec55581fc77c2a -SHA1 (patch-src_fstream__unicode.h) = 068d7bdf3a04f27973769a21effd9814c9c8245b +SHA1 (MP3Diags-1.2.01.tar.gz) = 777c5b23426e36aec2557035b6192dec4b909a39 +RMD160 (MP3Diags-1.2.01.tar.gz) = c69961189a5789d91642637794ccf201562c4b9e +Size (MP3Diags-1.2.01.tar.gz) = 1221991 bytes +SHA1 (patch-aa) = 4aae1922ca2b7fa9dbb30f1b5ceabb773a56c55f +SHA1 (patch-src_Notes.h) = cec467222fe8e3b269582b256c4d394673497838 diff --git a/audio/mp3diags/patches/patch-aa b/audio/mp3diags/patches/patch-aa index 043db63d9fc..871d12c1c88 100644 --- a/audio/mp3diags/patches/patch-aa +++ b/audio/mp3diags/patches/patch-aa @@ -1,13 +1,17 @@ -$NetBSD: patch-aa,v 1.6 2011/09/08 20:32:21 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2014/03/12 12:28:28 wiz Exp $ Fix name of boost library for pkgsrc. ---- src/src.pro.orig 2010-12-29 09:47:57.000000000 +0000 +--- src/src.pro.orig 2014-01-17 13:06:41.000000000 +0000 +++ src/src.pro -@@ -158,5 +158,5 @@ ThreadRunner.ui \ - #DEFINES += DISABLE_CHECK_FOR_UPDATES +@@ -164,8 +164,8 @@ ThreadRunner.ui \ + QMAKE_CXXFLAGS_DEBUG += -DGENERATE_TOC_zz LIBS += -lz \ -- -lboost_serialization-mt -+ -lboost_serialization +- -lboost_serialization-mt \ +- -lboost_program_options-mt ++ -lboost_serialization \ ++ -lboost_program_options + + TRANSLATIONS = translations/mp3diags_cs.ts \ diff --git a/audio/mp3diags/patches/patch-src_FileRenamerDlgImpl.h b/audio/mp3diags/patches/patch-src_FileRenamerDlgImpl.h deleted file mode 100644 index 05e4cdc36ce..00000000000 --- a/audio/mp3diags/patches/patch-src_FileRenamerDlgImpl.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_FileRenamerDlgImpl.h,v 1.2 2014/01/04 15:11:43 wiz Exp $ - -http://sourceforge.net/p/mp3diags/code/279/ - ---- src/FileRenamerDlgImpl.h.orig 2009-10-20 16:15:39.000000000 +0200 -+++ src/FileRenamerDlgImpl.h 2012-01-02 11:33:04.351881930 +0100 -@@ -33,6 +33,9 @@ - - #include "ui_FileRenamer.h" - -+#ifdef ERR -+#undef ERR -+#endif - - class CommonData; - class QSettings; diff --git a/audio/mp3diags/patches/patch-src_Helpers.h b/audio/mp3diags/patches/patch-src_Helpers.h deleted file mode 100644 index 6f6e36789b5..00000000000 --- a/audio/mp3diags/patches/patch-src_Helpers.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_Helpers.h,v 1.3 2014/01/04 22:57:19 wiz Exp $ - -Add missing headers for streamsize type. -http://sourceforge.net/p/mp3diags/code/279/ - ---- src/Helpers.h.orig 2010-03-19 17:35:22.000000000 +0000 -+++ src/Helpers.h -@@ -24,7 +24,8 @@ - #define HelpersH - - --#include -+#include -+#include - #include - #include - #include // for exit() diff --git a/audio/mp3diags/patches/patch-src_Notes.h b/audio/mp3diags/patches/patch-src_Notes.h index ebce2a252b1..61be66fa3dd 100644 --- a/audio/mp3diags/patches/patch-src_Notes.h +++ b/audio/mp3diags/patches/patch-src_Notes.h @@ -1,17 +1,22 @@ -$NetBSD: patch-src_Notes.h,v 1.2 2014/01/04 15:11:43 wiz Exp $ +$NetBSD: patch-src_Notes.h,v 1.3 2014/03/12 12:28:28 wiz Exp $ -http://sourceforge.net/p/mp3diags/code/279/ +Fix +cd src/ && /usr/bin/make -f Makefile all +/usr/pkg/qt4/bin/moc -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I/usr/pkg/qt4/mkspecs/netbsd-g++ -I. -I/usr/pkg/qt4/include/QtCore -I/usr/pkg/qt4/include/QtNetwork -I/usr/pkg/qt4/include/QtGui -I/usr/pkg/qt4/include/QtXml -I/usr/pkg/qt4/include -I. -I. -I/usr/pkg/include CommonData.h -o moc_CommonData.cpp +usr/pkg/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN" ---- src/Notes.h.orig 2010-02-13 07:58:04.000000000 +0100 -+++ src/Notes.h 2012-01-02 11:26:42.140106730 +0100 -@@ -32,6 +32,10 @@ +using patch similar to one reported in +https://bugreports.qt-project.org/browse/QTBUG-22829 + +--- src/Notes.h.orig 2014-01-16 13:37:29.000000000 +0000 ++++ src/Notes.h +@@ -33,7 +33,9 @@ + #include "SerSupport.h" #include - -+#ifdef ERR -+#undef ERR ++#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 + #include +#endif -+ - /* - Stores a message that is added while parsing a file. Multiple messages may be added, depending on the issues found. + #ifdef ERR + #undef ERR diff --git a/audio/mp3diags/patches/patch-src_fstream__unicode.h b/audio/mp3diags/patches/patch-src_fstream__unicode.h deleted file mode 100644 index 8a261045948..00000000000 --- a/audio/mp3diags/patches/patch-src_fstream__unicode.h +++ /dev/null @@ -1,51 +0,0 @@ -$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 - #include -@@ -578,7 +578,7 @@ typedef basic_ofstream_unicode ofs - typedef basic_fstream_unicode 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 -+ -+ //ttt2 not sure these are enough outside Linux -+ typedef std::basic_ifstream ifstream_utf8; -+ typedef std::basic_ofstream ofstream_utf8; -+ typedef std::basic_fstream 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 ofstream_utf8; - typedef std::basic_fstream fstream_utf8; - --#endif // _MSC_VER / __GNUC__ -+#endif // _MSC_VER / gcc / __llvm__ - - #endif // FStreamUtf8H -- cgit v1.2.3