diff options
| author | alexdiaconescu | 2016-12-29 17:43:59 +0200 |
|---|---|---|
| committer | alexdiaconescu | 2016-12-29 17:43:59 +0200 |
| commit | 52514e0ca7f8ff501535a6da9e7c506926fd7fec (patch) | |
| tree | 28509c523ddecb314599d8d324646242384dfe05 | |
| parent | a07d93e5fe6ea2aeb1df62e402b2fdf512178bc2 (diff) | |
| download | aur-52514e0ca7f8ff501535a6da9e7c506926fd7fec.tar.gz | |
Fix compiling with gcc 6.2
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | shuriken.patch | 26 |
3 files changed, 41 insertions, 6 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Apr 18 09:26:49 UTC 2016 +# Thu Dec 29 15:42:16 UTC 2016 pkgbase = shuriken pkgdesc = An open source beat slicer pkgver = 0.5.1 - pkgrel = 3 + pkgrel = 4 url = https://rock-hopper.github.io/shuriken install = shuriken.install arch = x86_64 @@ -20,9 +20,11 @@ pkgbase = shuriken source = https://github.com/rock-hopper/shuriken/archive/v0.5.1.tar.gz source = shuriken.desktop source = shuriken.png + source = shuriken.patch sha256sums = 93175d0e992afebd05b476a78a6809894376a3e8ba4ea95ee3f5d9a67947db7d sha256sums = f2144b34c35ecb855009a5d888d13bac2cf5b379274d7b60e4d9181d742fda99 sha256sums = b637b82c35bb4f27eebe779c7790a85758e1b9c64fff8553ede207dda0d9cb37 + sha256sums = 0c2a3a64465deb3f49bb4aa8fc4f0d210d2fcaa11e439c0893151e9ee727b6dc pkgname = shuriken @@ -4,7 +4,7 @@ pkgname=shuriken pkgver=0.5.1 -pkgrel=3 +pkgrel=4 pkgdesc="An open source beat slicer" url="https://rock-hopper.github.io/shuriken" arch=('x86_64' 'i686') @@ -17,10 +17,17 @@ conflicts=("${pkgname}") install="$pkgname.install" source=("https://github.com/rock-hopper/$pkgname/archive/v$pkgver.tar.gz" "$pkgname.desktop" - "$pkgname.png") + "$pkgname.png" + "$pkgname.patch") sha256sums=('93175d0e992afebd05b476a78a6809894376a3e8ba4ea95ee3f5d9a67947db7d' 'f2144b34c35ecb855009a5d888d13bac2cf5b379274d7b60e4d9181d742fda99' - 'b637b82c35bb4f27eebe779c7790a85758e1b9c64fff8553ede207dda0d9cb37') + 'b637b82c35bb4f27eebe779c7790a85758e1b9c64fff8553ede207dda0d9cb37' + '0c2a3a64465deb3f49bb4aa8fc4f0d210d2fcaa11e439c0893151e9ee727b6dc') + +prepare() { + cd "$pkgname-$pkgver" + patch -p1 -i "$srcdir/$pkgname.patch" +} build() { cd "$pkgname-$pkgver" @@ -43,7 +50,7 @@ build() { fi qmake-qt4 PREFIX=/usr ./Shuriken.pro -r -spec linux-g++$_arch - make + make CXXFLAGS=-fpermissive } package() { diff --git a/shuriken.patch b/shuriken.patch new file mode 100644 index 000000000000..9a0edc7bfeb9 --- /dev/null +++ b/shuriken.patch @@ -0,0 +1,26 @@ +diff -Naur shuriken-0.5.1a/src/audioanalyser.h shuriken-0.5.1b/src/audioanalyser.h +--- shuriken-0.5.1a/src/audioanalyser.h 2015-09-27 15:58:36.000000000 +0100 ++++ shuriken-0.5.1b/src/audioanalyser.h 2016-12-08 00:23:53.977421455 +0000 +@@ -30,7 +30,7 @@ + class AudioAnalyser + { + public: +- static const qreal MIN_INTER_ONSET_SECS = 0.05; ++ static constexpr qreal MIN_INTER_ONSET_SECS = 0.05; + + struct DetectionSettings + { +diff -Naur shuriken-0.5.1a/src/waveformitem.h shuriken-0.5.1b/src/waveformitem.h +--- shuriken-0.5.1a/src/waveformitem.h 2015-09-27 15:58:36.000000000 +0100 ++++ shuriken-0.5.1b/src/waveformitem.h 2016-12-08 00:22:52.538422424 +0000 +@@ -109,9 +109,9 @@ + + private: + static const int NOT_SET = -1; +- static const qreal DETAIL_LEVEL_MAX_CUTOFF = 0.05; +- static const qreal DETAIL_LEVEL_VERY_HIGH_CUTOFF = 1.0; +- static const qreal DETAIL_LEVEL_HIGH_CUTOFF = 10.0; ++ static constexpr qreal DETAIL_LEVEL_MAX_CUTOFF = 0.05; ++ static constexpr qreal DETAIL_LEVEL_VERY_HIGH_CUTOFF = 1.0; ++ static constexpr qreal DETAIL_LEVEL_HIGH_CUTOFF = 10.0; + |