diff options
Diffstat (limited to 'user/minuet')
| -rw-r--r-- | user/minuet/APKBUILD | 14 | ||||
| -rw-r--r-- | user/minuet/missing-header.patch | 30 |
2 files changed, 37 insertions, 7 deletions
diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index 6f84a8dc4..ec72e7c0b 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=19.08.0 +pkgver=22.04.2 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -12,10 +12,11 @@ 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/applications/$pkgver/src/minuet-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/minuet-$pkgver.tar.xz + missing-header.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +27,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="bffe36bae1d2f2d39a402f9758cf4a6307909bf8a6d56576c3986c97e3b51088a5e72c5e409188b5039026d6a675881c40177bec143ae78d96a12bdb76c94c38 minuet-19.08.0.tar.xz" +sha512sums="5cff0d4d0a5a5511131298b5e7f6774fb8b0b0e1217054305f7df2fe397f4f0e50086c8e5b8f45137cf83d16fe2bab2d331c12b2303e84abf42e19b3c165f692 minuet-22.04.2.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" + |