diff options
| -rw-r--r-- | user/phonon/APKBUILD | 11 | ||||
| -rw-r--r-- | user/phonon/ecm.patch | 11 | ||||
| -rw-r--r-- | user/phonon/qt59.patch | 15 |
3 files changed, 34 insertions, 3 deletions
diff --git a/user/phonon/APKBUILD b/user/phonon/APKBUILD index 75a4375f3..0b08f443a 100644 --- a/user/phonon/APKBUILD +++ b/user/phonon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=phonon -pkgver=4.10.3 +pkgver=4.11.1 pkgrel=0 pkgdesc="Qt library for playing multimedia files" url="https://phonon.kde.org/" @@ -11,7 +11,10 @@ depends="" makedepends="cmake extra-cmake-modules pulseaudio-dev qt5-qtbase-dev qt5-qttools-dev" subpackages="$pkgname-dev $pkgname-designer" -source="https://download.kde.org/stable/phonon/$pkgver/phonon-$pkgver.tar.xz" +source="https://download.kde.org/stable/phonon/$pkgver/phonon-$pkgver.tar.xz + ecm.patch + qt59.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -49,4 +52,6 @@ designer() { rmdir "$pkgdir"/usr/lib/qt5/plugins || true # Never mind } -sha512sums="2619ac0d7873205a2773bdb226695b5a9e2deb4f47b1a0bb9dbf9a905e3f82f7834ced1b4b1e7a6dadf50fca289f92a5749e3057546c3e16a41e1d6420b594c6 phonon-4.10.3.tar.xz" +sha512sums="858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74 phonon-4.11.1.tar.xz +4de5a7ec143f7bf5068b376b77a1d8acb85225ee87d7ab59cb315ef59be3351305602354b8ef96a1a3fbb17308441704f2c2dfa2fcefadf0560708b4eb377e64 ecm.patch +06614abd2db7634acdf7bd27c026ea4544845bdd995b4bdeb9b1d2c9fa61940bdb839c39c18c4c9c487b95c2a91aae48056742ce2c8e558bd9186a941b8d0bac qt59.patch" diff --git a/user/phonon/ecm.patch b/user/phonon/ecm.patch new file mode 100644 index 000000000..71776a981 --- /dev/null +++ b/user/phonon/ecm.patch @@ -0,0 +1,11 @@ +--- phonon-4.11.1/CMakeLists.txt.old 2019-09-26 10:29:38.000000000 +0000 ++++ phonon-4.11.1/CMakeLists.txt 2019-09-30 21:04:18.966519535 +0000 +@@ -15,7 +15,7 @@ + set(CMAKE_AUTOUIC TRUE) + set(CMAKE_AUTORCC TRUE) + +-find_package(ECM 5.60 NO_MODULE) ++find_package(ECM 5.54 NO_MODULE) + set_package_properties(ECM PROPERTIES + TYPE REQUIRED + DESCRIPTION "Extra CMake Modules" diff --git a/user/phonon/qt59.patch b/user/phonon/qt59.patch new file mode 100644 index 000000000..0ee5d017f --- /dev/null +++ b/user/phonon/qt59.patch @@ -0,0 +1,15 @@ +--- phonon-4.11.1/phonon/factory.cpp.old 2019-09-26 10:29:38.000000000 +0000 ++++ phonon-4.11.1/phonon/factory.cpp 2019-09-30 21:07:16.417472319 +0000 +@@ -474,7 +474,11 @@ + } + + // Apply PHONON_BACKEND override if set. +- const QString backendEnv = qEnvironmentVariable("PHONON_BACKEND"); ++ const QByteArray backendVal = qgetenv("PHONON_BACKEND"); ++ if (backendVal.isNull()) { ++ return backendList; ++ } ++ const QString backendEnv = QString::fromLocal8Bit(backendVal); + if (backendEnv.isEmpty()) { + return backendList; + } |