From 36963161e3cb55f75865217f9d0423f8acabb8a0 Mon Sep 17 00:00:00 2001
From: "Edinaldo P. Silva" <edps.mundognu@gmail.com>
Date: Wed, 20 Dec 2017 22:48:57 +0000
Subject: audio/flacon: Updated for version 4.0.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 audio/flacon/README                    |  5 ---
 audio/flacon/audioformat_segfault.diff | 62 ----------------------------------
 audio/flacon/flacon.SlackBuild         |  6 +---
 audio/flacon/flacon.info               |  8 ++---
 4 files changed, 5 insertions(+), 76 deletions(-)
 delete mode 100644 audio/flacon/audioformat_segfault.diff

(limited to 'audio')

diff --git a/audio/flacon/README b/audio/flacon/README
index 927ba66840..c27425d5ec 100644
--- a/audio/flacon/README
+++ b/audio/flacon/README
@@ -25,8 +25,3 @@ And the optional dependencies:
  * opus-tools
  * ttaenc
  * vorbisgain
-
-NOTE:
-
-To build with Qt5, into SlackBuild file change the line "-DUSE_QT5=No"
-to: "-DUSE_QT5=Yes".
diff --git a/audio/flacon/audioformat_segfault.diff b/audio/flacon/audioformat_segfault.diff
deleted file mode 100644
index a2360bd71c..0000000000
--- a/audio/flacon/audioformat_segfault.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/formats/format.cpp b/formats/format.cpp
-index 53f7ed0..89abaf9 100644
---- a/formats/format.cpp
-+++ b/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
---- a/formats/format.h
-+++ b/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
diff --git a/audio/flacon/flacon.SlackBuild b/audio/flacon/flacon.SlackBuild
index 74742054fd..4c9dce28c0 100644
--- a/audio/flacon/flacon.SlackBuild
+++ b/audio/flacon/flacon.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=flacon
-VERSION=${VERSION:-3.1.1}
+VERSION=${VERSION:-4.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,13 +69,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/audioformat_segfault.diff
-
 cmake \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX=/usr \
-  -DUSE_QT5=No \
   .
 make
 make install DESTDIR=$PKG
@@ -83,7 +80,6 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# only moving gzipped manpage:
 mv $PKG/usr/share/man $PKG/usr/man
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/audio/flacon/flacon.info b/audio/flacon/flacon.info
index 52290e7df8..9579e666df 100644
--- a/audio/flacon/flacon.info
+++ b/audio/flacon/flacon.info
@@ -1,10 +1,10 @@
 PRGNAM="flacon"
-VERSION="3.1.1"
+VERSION="4.0.0"
 HOMEPAGE="https://flacon.github.io/"
-DOWNLOAD="https://github.com/flacon/flacon/archive/v3.1.1/flacon-3.1.1.tar.gz"
-MD5SUM="d9918783dc9c8c3efca1382ccd49a5ed"
+DOWNLOAD="https://github.com/flacon/flacon/archive/v4.0.0/flacon-4.0.0.tar.gz"
+MD5SUM="1d180b73bb36ebc36e81f660fce8f39a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libuchardet"
+REQUIRES="qt5 libuchardet"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
-- 
cgit v1.2.3