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

[Antonio Rojas]

    Date: Wednesday, January 9, 2019 @ 19:03:45
  Author: arojas
Revision: 343195

Update to 4.10.2

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

---------------------+
 PKGBUILD            |   16 +++++-----------
 phonon-qt5.12.patch |   14 --------------
 2 files changed, 5 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-09 18:48:10 UTC (rev 343194)
+++ PKGBUILD	2019-01-09 19:03:45 UTC (rev 343195)
@@ -4,8 +4,8 @@
 pkgbase=phonon
 pkgname=(phonon-qt5)
 pkgdesc="The multimedia framework by KDE"
-pkgver=4.10.1
-pkgrel=3
+pkgver=4.10.2
+pkgrel=1
 arch=(x86_64)
 url='http://phonon.kde.org/'
 license=(LGPL)
@@ -12,24 +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}
-        phonon-qt5.12.patch)
-sha256sums=('e5a98df31aeffc22493afc8d6adbca5d6f0c27cc2eed73b3be05195321e08db7'
-            'SKIP'
-            'f3173010f015ab681e471bf6a8203ce20aaa743ee727c5b98e25a7f926ac5209')
+source=("http://download.kde.org/stable/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig})
+sha256sums=('34edb1985778575eb7004e4e45151cd7bc995f61ddd6ce3b050b97b7bd778809'
+            'SKIP')
 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() {
   cd build
   cmake ../$pkgbase-$pkgver \
-    -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
     -DPHONON_BUILD_PHONON4QT5=ON \

Deleted: phonon-qt5.12.patch
===================================================================
--- phonon-qt5.12.patch	2019-01-09 18:48:10 UTC (rev 343194)
+++ phonon-qt5.12.patch	2019-01-09 19:03:45 UTC (rev 343195)
@@ -1,14 +0,0 @@
-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;
-     }