[arch-commits] Commit in phonon/trunk (PKGBUILD phonon-qt5.12.patch)

[Antonio Rojas]

    Date: Monday, December 10, 2018 @ 16:33:49
  Author: arojas
Revision: 341548

Fix PulseAudio support with Qt 5.12

Added:
  phonon/trunk/phonon-qt5.12.patch
Modified:
  phonon/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   11 ++++++++---
 phonon-qt5.12.patch |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-10 16:21:45 UTC (rev 341547)
+++ PKGBUILD	2018-12-10 16:33:49 UTC (rev 341548)
@@ -5,7 +5,7 @@
 pkgname=(phonon-qt5)
 pkgdesc="The multimedia framework by KDE"
 pkgver=4.10.1
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url='http://phonon.kde.org/'
 license=(LGPL)
@@ -12,13 +12,18 @@
 depends=(libpulse qt5-base)
 optdepends=('pulseaudio: PulseAudio support' 'qt5-tools: Designer plugin')
 makedepends=(extra-cmake-modules qt5-tools)
-source=("http://download.kde.org/stable/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig})
+source=("http://download.kde.org/stable/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig}
+        phonon-qt5.12.patch)
 sha256sums=('e5a98df31aeffc22493afc8d6adbca5d6f0c27cc2eed73b3be05195321e08db7'
-            'SKIP')
+            'SKIP'
+            'f3173010f015ab681e471bf6a8203ce20aaa743ee727c5b98e25a7f926ac5209')
 validpgpkeys=(CB9387521E1EE0127DA804843FDBB55084CC5D84) # Harald Sitter <sitter at kde.org>
 
 prepare() {
   mkdir -p build
+
+  cd $pkgbase-$pkgver
+  patch -p1 -i ../phonon-qt5.12.patch # Fix PulseAudio support with Qt 5.12
 }
 
 build() {

Added: phonon-qt5.12.patch
===================================================================
--- phonon-qt5.12.patch	                        (rev 0)
+++ phonon-qt5.12.patch	2018-12-10 16:33:49 UTC (rev 341548)
@@ -0,0 +1,14 @@
+diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp
+index b7009b11..d3240840 100644
+--- a/phonon/pulsesupport.cpp
++++ b/phonon/pulsesupport.cpp
+@@ -840,7 +840,8 @@ PulseSupport::PulseSupport()
+     }
+ 
+     // We require a glib event loop
+-    if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) {
++    if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib") &&
++        !QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("GlibEventDispatcher")) {
+         qWarning("WARNING: Disabling PulseAudio integration for lack of GLib event loop.");
+         return;
+     }