summaryrefslogtreecommitdiff
path: root/user/minuet
diff options
context:
space:
mode:
Diffstat (limited to 'user/minuet')
-rw-r--r--user/minuet/APKBUILD9
-rw-r--r--user/minuet/missing-header.patch30
2 files changed, 36 insertions, 3 deletions
diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD
index 193c03ed5..5ac0ca4db 100644
--- a/user/minuet/APKBUILD
+++ b/user/minuet/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=minuet
-pkgver=20.04.3
+pkgver=20.08.1
pkgrel=0
pkgdesc="Music education software"
url="https://minuet.kde.org/"
@@ -12,7 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
qt5-qtquickcontrols2-dev qt5-qtsvg-dev kcoreaddons-dev ki18n-dev
kcrash-dev kdoctools-dev fluidsynth-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/release-service/$pkgver/src/minuet-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/minuet-$pkgver.tar.xz
+ missing-header.patch
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -37,4 +39,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5353e7c2461b5d53ed119d1ecdd27e2561068347ac244e17a9eda961d269fd0b4ce41a3c61ecdc0f8c48a8f7cca40f4bd3e0dcaa49fb800b598e8809d3c25073 minuet-20.04.3.tar.xz"
+sha512sums="a64d912351697a7e7928ad1593432b2ccc9abe112be87cbee7649adced17e4e643ab05d3a3970d45b005683fd9bee7b81b9e1f21e27334545a7ddecbd452fdca minuet-20.08.1.tar.xz
+5758385b1d18c0fc89335b9fbbfee0e7800ec03bdaaeea7a61bac4e0ed911e302b35697c54e4547a379dd3625a13214f8851d4eedfa3132ee5d9fd82e19cd241 missing-header.patch"
diff --git a/user/minuet/missing-header.patch b/user/minuet/missing-header.patch
new file mode 100644
index 000000000..a9aa00984
--- /dev/null
+++ b/user/minuet/missing-header.patch
@@ -0,0 +1,30 @@
+Compiler error:
+
+/usr/src/packages/user/minuet/src/minuet-20.08.1/src/utils/xdgdatadirs.cpp: In function ‘QStringList Utils::getXdgDataDirs()’:
+/usr/src/packages/user/minuet/src/minuet-20.08.1/src/utils/xdgdatadirs.cpp:16:89: error: invalid use of incomplete type ‘class QVector<QStringRef>’
+ const auto paths = xdgDataDirsEnv.splitRef(QLatin1Char(':'), QString::SkipEmptyParts);
+ ^
+In file included from /usr/include/QtCore/qglobal.h:1212,
+ from /usr/include/QtCore/qchar.h:43,
+ from /usr/include/QtCore/qstring.h:48,
+ from /usr/include/QtCore/qdir.h:43,
+ from /usr/include/QtCore/QDir:1,
+ from /usr/src/packages/user/minuet/src/minuet-20.08.1/src/utils/xdgdatadirs.cpp:1:
+/usr/include/QtCore/qtypeinfo.h:193:1: note: declaration of ‘class QVector<QStringRef>’
+ Q_DECLARE_MOVABLE_CONTAINER(QVector);
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+/usr/src/packages/user/minuet/src/minuet-20.08.1/src/utils/xdgdatadirs.cpp:18:29: error: unable to deduce ‘auto&&’ from ‘paths’
+ for (const auto &path : paths) {
+ ^~~~~
+make[2]: *** [src/utils/CMakeFiles/minuetutils.dir/build.make:76: src/utils/CMakeFiles/minuetutils.dir/xdgdatadirs.cpp.o] Error 1
+
+
+--- minuet-20.08.1/src/utils/xdgdatadirs.cpp.old 2020-08-31 18:34:27.000000000 +0000
++++ minuet-20.08.1/src/utils/xdgdatadirs.cpp 2020-09-18 00:14:59.175663978 +0000
+@@ -1,5 +1,6 @@
+ #include <QDir>
+ #include <QFile>
++#include <QVector>
+
+ #include "xdgdatadirs.h"
+