1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00

Update `audio/flacon' to version 4.0.0, which features improved visual

style (including new icons), updated translations, and few other fixes.
Alas, this release also marks the drop of Qt4 support.

Reported by:	portscout

Because GitHub releases (tarballs) are not fetched with correct modification
time, set TIMESTAMP to 1513612271 which corresponds to commit c9bd11f tagged
as this release.
This commit is contained in:
Alexey Dokuchaev 2017-12-23 10:15:58 +00:00
parent ac9e260d16
commit e600e41aad
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=457038
4 changed files with 11 additions and 81 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= flacon
PORTVERSION= 3.1.1
PORTREVISION= 1
PORTVERSION= 4.0.0
DISTVERSIONPREFIX= v
CATEGORIES= audio
@ -16,19 +15,7 @@ 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 <bsd.port.mk>

View File

@ -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

View File

@ -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 <QByteArray>
#include <QFile>
-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<const AudioFormat*> 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

View File

@ -4,6 +4,11 @@ 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