From e6c2e53bb930aca1e8694400a9ce0f99d99547d2 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sat, 14 Aug 2021 20:37:59 +0200 Subject: [PATCH] nootka: update to 2.0.0 --- srcpkgs/nootka/patches/signed-char.patch | 62 +++++++++++++----------- srcpkgs/nootka/template | 16 ++++-- 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/srcpkgs/nootka/patches/signed-char.patch b/srcpkgs/nootka/patches/signed-char.patch index 28a266749cb1..73056d81fe71 100644 --- a/srcpkgs/nootka/patches/signed-char.patch +++ b/srcpkgs/nootka/patches/signed-char.patch @@ -1,13 +1,8 @@ -commit 17a9c38e654aa0b77c5387991cea1cd6d04c2517 -Author: q66 -Date: Thu Jan 2 00:36:14 2020 +0100 +Original patch by q66, adjusted for version 2.0.0. +Fix build on systems with unsigned chars by default. - fix build on systems with unsigned chars by default - -diff --git src/libs/core/music/tkeysignature.cpp src/libs/core/music/tkeysignature.cpp -index 51ccf34..0024770 100644 ---- a/src/libs/core/music/tkeysignature.cpp -+++ b/src/libs/core/music/tkeysignature.cpp +--- a/src/libs/core/music/tkeysignature.cpp 2021-06-05 13:17:35.000000000 +0200 ++++ b/src/libs/core/music/tkeysignature.cpp 2021-08-14 18:58:03.380770429 +0200 @@ -25,7 +25,7 @@ @@ -17,7 +12,7 @@ index 51ccf34..0024770 100644 {-1,-1,-1,-1,-1,-1,-1}, // Cb/ab {-1,-1,-1, 0,-1,-1,-1}, // Gb/eb { 0,-1,-1, 0,-1,-1,-1}, // Db/bb -@@ -43,8 +43,8 @@ const char TkeySignature::scalesDefArr[15][7] = { +@@ -43,8 +43,8 @@ { 1, 1, 1, 1, 1, 1, 1}, // C#/a# }; @@ -28,23 +23,34 @@ index 51ccf34..0024770 100644 QString TkeySignature::majorNames[15] = { QString(), QString(), QString(), QString(), QString(), QString(), QString(), QString(), QString(), QString(), -diff --git src/libs/core/music/tkeysignature.h src/libs/core/music/tkeysignature.h -index 6c98d66..676d3b9 100644 ---- a/src/libs/core/music/tkeysignature.h -+++ b/src/libs/core/music/tkeysignature.h -@@ -43,13 +43,13 @@ public: - /** Array with definitions of each scale. - * @p scalesDefArr[7] is C-major/a-minor and has 7 times 0 (no accids). - * The order os from 7b [0] to 7# [15]*/ -- static const char scalesDefArr[15][7]; -+ static const signed char scalesDefArr[15][7]; +--- a/src/libs/core/music/tkeysignature.h 2021-06-05 13:17:35.000000000 +0200 ++++ b/src/libs/core/music/tkeysignature.h 2021-08-14 19:01:28.596571380 +0200 +@@ -49,7 +49,7 @@ + * @p scalesDefArr[7] is C-major/a-minor and has 7 times 0 (no accids). + * The order os from 7b [0] to 7# [15] + */ +- static const char scalesDefArr[15][7]; ++ static const signed char scalesDefArr[15][7]; + + /** + * Those smart arrays keep which note in @p scalesDefArr is 1-st in key scale. +@@ -57,7 +57,7 @@ + * like @p scalesDefArr[8][4] point on accid of a G note. + * This is faster way then calculate it and takes less memory. + */ +- static const char majorKeys[15], minorKeys[15]; ++ static const signed char majorKeys[15], minorKeys[15]; - /** Those smart arrays keep which note in @p scalesDefArr is 1-st in key scale. - * F.e. For G-major is @p majorKeys[8] = 4, - * like @p scalesDefArr[8][4] point on accid of a G note. - * This is faster way then calculate it and takes less memory.*/ -- static const char majorKeys[15], minorKeys[15]; -+ static const signed char majorKeys[15], minorKeys[15]; + /** + * This method fulfills majorNames and minorNames arrays +--- a/src/libs/core/music/tnote.h 2021-06-05 13:17:35.000000000 +0200 ++++ b/src/libs/core/music/tnote.h 2021-08-14 18:55:34.210784018 +0200 +@@ -68,7 +68,7 @@ + * It can be: @li e_None = 3 @li e_Sharp = 1 @li e_DoubleSharp=2 + * @li e_Flat= -1 @li e_DoubleFlat= -2 @li e_Natural=0 + */ +- enum Ealter : char { ++ enum Ealter : signed char { + e_Natural = 0, e_Sharp = 1, e_DoubleSharp = 2, e_Flat = -1, e_DoubleFlat = -2, e_None = 3 + }; - /** This method fulfills majorNames and minorNames arrays - * appropriate keys names depends on naming style diff --git a/srcpkgs/nootka/template b/srcpkgs/nootka/template index 8726ab984e8c..9202230d13a6 100644 --- a/srcpkgs/nootka/template +++ b/srcpkgs/nootka/template @@ -1,14 +1,20 @@ # Template file for 'nootka' pkgname=nootka -version=1.4.7 -revision=2 +version=2.0.0 +revision=1 wrksrc="nootka-${version}-source" build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools" -makedepends="alsa-lib-devel fftw-devel libvorbis-devel qt5-devel soundtouch-devel" +makedepends="alsa-lib-devel fftw-devel jack-devel libvorbis-devel qt5-devel + qt5-declarative-devel qt5-quickcontrols2-devel qt5-tools-devel soundtouch-devel + $(vopt_if pulseaudio pulseaudio-devel)" short_desc="Application to learn classical score notation" maintainer="Orphaned " -license="GPL-3.0-only" +license="GPL-3.0-or-later" homepage="https://nootka.sourceforge.io" +changelog="https://www.opencode.net/seelook/nootka/-/blob/master/changes" distfiles="${SOURCEFORGE_SITE}/nootka/Nootka-${version}/nootka-${version}-source.tar.bz2" -checksum=1d85a2970ddb51117b0a98df4d84ca9e9498fbd1d2b1c55bfa62931333a73cf9 +checksum=e411c6e45b55facf49a2487bd47dccc876d8acbe599cda9a276cbce70474b59f + +build_options="pulseaudio" +build_options_default="pulseaudio"