diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-28 08:12:25 -0600 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-28 08:12:43 -0600 |
commit | 1a54b529519b09afe9b5e0160e60e05c0920b2c9 (patch) | |
tree | f7ae5dd96e2c5822987861354eb80e5f27ebb16a /user/phonon/qt59.patch | |
parent | fd63dbb46621a57d0c1e684d32e32b28b7c43d5a (diff) | |
download | packages-1a54b529519b09afe9b5e0160e60e05c0920b2c9.tar.gz packages-1a54b529519b09afe9b5e0160e60e05c0920b2c9.tar.bz2 packages-1a54b529519b09afe9b5e0160e60e05c0920b2c9.tar.xz packages-1a54b529519b09afe9b5e0160e60e05c0920b2c9.zip |
user/phonon: Fix a few issues
* Remove patches for building against older Qt
* Split locale files
* Remove old CMake options that upstream no longer supports
Diffstat (limited to 'user/phonon/qt59.patch')
-rw-r--r-- | user/phonon/qt59.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/user/phonon/qt59.patch b/user/phonon/qt59.patch deleted file mode 100644 index 0ee5d017f..000000000 --- a/user/phonon/qt59.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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; - } |