Index: head/audio/flacon/Makefile =================================================================== --- head/audio/flacon/Makefile (revision 457037) +++ head/audio/flacon/Makefile (revision 457038) @@ -1,34 +1,21 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= flacon -PORTVERSION= 3.1.1 -PORTREVISION= 1 +PORTVERSION= 4.0.0 DISTVERSIONPREFIX= v CATEGORIES= audio MAINTAINER= danfe@FreeBSD.org COMMENT= Graphical audio file extractor and encoder LICENSE= LGPL21 LIB_DEPENDS= libuchardet.so:textproc/uchardet USES= cmake desktop-file-utils pkgconfig USE_GITHUB= yes - -OPTIONS_DEFINE= QT5 -QT5_DESC= Build against Qt 5 instead of Qt 4 - -QT5_CMAKE_ON= -DUSE_QT5:BOOL=ON -QT5_CMAKE_OFF= -DUSE_QT4:BOOL=ON -# :ts, would be handy here but is not available in fmake(1) -QT5_USE= QT5=${_QT5_DEPS},${_QT5_BDEPS:C/,/_build&/g:%=_build} -QT5_USE_OFF= QT4=${_QT4_DEPS},${_QT4_BDEPS:C/,/_build&/g:%=_build} - -_QT4_DEPS= corelib,gui,network -_QT4_BDEPS= linguisttools,moc,qmake,rcc,uic -_QT5_DEPS= core,gui,network,widgets -_QT5_BDEPS= qmake,buildtools,linguisttools +USE_QT5= buildtools_build concurrent_build qmake_build \ + linguisttools_build core gui network widgets .include Index: head/audio/flacon/distinfo =================================================================== --- head/audio/flacon/distinfo (revision 457037) +++ head/audio/flacon/distinfo (revision 457038) @@ -1,3 +1,3 @@ -TIMESTAMP = 1502219275 -SHA256 (flacon-flacon-v3.1.1_GH0.tar.gz) = ca5bd24ba61fc06a39e95b4b7fda188af437ad3eff666b55071895bde11bd15a -SIZE (flacon-flacon-v3.1.1_GH0.tar.gz) = 431743 +TIMESTAMP = 1513612271 +SHA256 (flacon-flacon-v4.0.0_GH0.tar.gz) = 3e128d32e6bc0d1bf618a2312953f9a894cce2699d36abe5f9c38ff1b153dc32 +SIZE (flacon-flacon-v4.0.0_GH0.tar.gz) = 1294289 Index: head/audio/flacon/files/patch-49e72de =================================================================== --- head/audio/flacon/files/patch-49e72de (revision 457037) +++ head/audio/flacon/files/patch-49e72de (nonexistent) @@ -1,62 +0,0 @@ -diff --git a/formats/format.cpp b/formats/format.cpp -index 53f7ed0..89abaf9 100644 ---- formats/format.cpp.orig -+++ formats/format.cpp -@@ -32,7 +32,14 @@ - #include - #include - --AudioFormatList AudioFormat::mAllFormats; -+/************************************************ -+ * -+ ************************************************/ -+AudioFormatList &formatList() -+{ -+ static AudioFormatList *afl = new AudioFormatList(); -+ return *afl; -+} - - - /************************************************ -@@ -43,9 +50,9 @@ bool AudioFormat::registerFormat(const AudioFormat &f) - // Some formats can be embedded as a chunk of RIFF stream. - // So the WAV format should be last and be checked in the last turn. - if (f.ext() == "wav") -- mAllFormats.append(&f); -+ formatList().append(&f); - else -- mAllFormats.insert(0, &f); -+ formatList().insert(0, &f); - return true; - } - -@@ -71,7 +78,7 @@ AudioFormat::~AudioFormat() - ************************************************/ - const AudioFormatList &AudioFormat::allFormats() - { -- return mAllFormats; -+ return formatList(); - } - - -diff --git a/formats/format.h b/formats/format.h -index b159b7a..0f9fcb6 100644 ---- formats/format.h.orig -+++ formats/format.h -@@ -70,8 +70,6 @@ class AudioFormat - protected: - virtual bool checkMagic(const QByteArray &data) const; - --private: -- static QList mAllFormats; - }; - - -@@ -79,6 +77,6 @@ class AudioFormat - - #define REGISTER_FORMAT(FORMAT) \ - static FORMAT static_##FORMAT##_Instance; \ -- static bool is_##FORMAT##_loaded = AudioFormat::registerFormat(static_##FORMAT##_Instance); -+ static bool is_##FORMAT##_loaded = AudioFormat::registerFormat(static_##FORMAT##_Instance); - - #endif // FORMAT_H Property changes on: head/audio/flacon/files/patch-49e72de ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/flacon/pkg-plist =================================================================== --- head/audio/flacon/pkg-plist (revision 457037) +++ head/audio/flacon/pkg-plist (revision 457038) @@ -1,32 +1,37 @@ bin/flacon man/man1/flacon.1.gz share/applications/flacon.desktop share/icons/hicolor/16x16/apps/flacon.png share/icons/hicolor/32x32/apps/flacon.png share/icons/hicolor/48x48/apps/flacon.png +share/icons/hicolor/64x64/apps/flacon.png +share/icons/hicolor/128x128/apps/flacon.png +share/icons/hicolor/256x256/apps/flacon.png +share/icons/hicolor/512x512/apps/flacon.png +share/icons/hicolor/scalable/apps/flacon.svg %%DATADIR%%/translations/flacon_cs.qm %%DATADIR%%/translations/flacon_cs_CZ.qm %%DATADIR%%/translations/flacon_de.qm %%DATADIR%%/translations/flacon_es.qm %%DATADIR%%/translations/flacon_es_MX.qm %%DATADIR%%/translations/flacon_et.qm %%DATADIR%%/translations/flacon_fr.qm %%DATADIR%%/translations/flacon_gl.qm %%DATADIR%%/translations/flacon_hu.qm %%DATADIR%%/translations/flacon_it.qm %%DATADIR%%/translations/flacon_ja_JP.qm %%DATADIR%%/translations/flacon_lt.qm %%DATADIR%%/translations/flacon_nb.qm %%DATADIR%%/translations/flacon_nl.qm %%DATADIR%%/translations/flacon_pl.qm %%DATADIR%%/translations/flacon_pl_PL.qm %%DATADIR%%/translations/flacon_pt_BR.qm %%DATADIR%%/translations/flacon_pt_PT.qm %%DATADIR%%/translations/flacon_ro_RO.qm %%DATADIR%%/translations/flacon_ru.qm %%DATADIR%%/translations/flacon_sr.qm %%DATADIR%%/translations/flacon_sr@latin.qm %%DATADIR%%/translations/flacon_tr.qm %%DATADIR%%/translations/flacon_uk.qm %%DATADIR%%/translations/flacon_zh_CN.qm %%DATADIR%%/translations/flacon_zh_TW.qm