[arch-commits] Commit in kmix (4 files)

[Antonio Rojas]

    Date: Monday, December 10, 2018 @ 16:56:55
  Author: arojas
Revision: 341553

archrelease: copy trunk to extra-x86_64

Added:
  kmix/repos/extra-x86_64/PKGBUILD
    (from rev 341552, kmix/trunk/PKGBUILD)
  kmix/repos/extra-x86_64/kmix-qt5.12.patch
    (from rev 341552, kmix/trunk/kmix-qt5.12.patch)
Deleted:
  kmix/kde-unstable/
  kmix/repos/extra-x86_64/PKGBUILD

--------------------------------------+
 /extra-x86_64/PKGBUILD               |   43 +++++++++++++++++++++++++++++++++
 repos/extra-x86_64/PKGBUILD          |   43 ---------------------------------
 repos/extra-x86_64/kmix-qt5.12.patch |   14 ++++++++++
 3 files changed, 57 insertions(+), 43 deletions(-)

Deleted: repos/extra-x86_64/PKGBUILD
===================================================================
--- repos/extra-x86_64/PKGBUILD	2018-12-10 16:56:42 UTC (rev 341552)
+++ repos/extra-x86_64/PKGBUILD	2018-12-10 16:56:55 UTC (rev 341553)
@@ -1,43 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kmix
-pkgver=18.08.3
-pkgrel=2
-pkgdesc="KDE volume control program"
-url='https://kde.org/applications/multimedia/kmix/'
-arch=(x86_64)
-license=(GPL LGPL FDL)
-depends=(kinit hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools plasma-framework)
-conflicts=(kdemultimedia-kmix)
-replaces=(kdemultimedia-kmix)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
-        kmix-qt5.12.patch)
-sha256sums=('2d27ad00533188d55f01c4d98b1ca91a22e0cdcd1f3f77bae9005a2a357e1214'
-            'SKIP'
-            '9980bc24c289e86067c6f05b12d1b761918237e758329d72d8284fe7bee7eea5')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../kmix-qt5.12.patch # Fix PulseAudio support with Qt 5.12
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: kmix/repos/extra-x86_64/PKGBUILD (from rev 341552, kmix/trunk/PKGBUILD)
===================================================================
--- repos/extra-x86_64/PKGBUILD	                        (rev 0)
+++ repos/extra-x86_64/PKGBUILD	2018-12-10 16:56:55 UTC (rev 341553)
@@ -0,0 +1,43 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kmix
+pkgver=18.08.3
+pkgrel=2
+pkgdesc="KDE volume control program"
+url='https://kde.org/applications/multimedia/kmix/'
+arch=(x86_64)
+license=(GPL LGPL FDL)
+depends=(kinit hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools plasma-framework)
+conflicts=(kdemultimedia-kmix)
+replaces=(kdemultimedia-kmix)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+        kmix-qt5.12.patch)
+sha256sums=('2d27ad00533188d55f01c4d98b1ca91a22e0cdcd1f3f77bae9005a2a357e1214'
+            'SKIP'
+            '9980bc24c289e86067c6f05b12d1b761918237e758329d72d8284fe7bee7eea5')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kmix-qt5.12.patch # Fix PulseAudio support with Qt 5.12
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: kmix/repos/extra-x86_64/kmix-qt5.12.patch (from rev 341552, kmix/trunk/kmix-qt5.12.patch)
===================================================================
--- repos/extra-x86_64/kmix-qt5.12.patch	                        (rev 0)
+++ repos/extra-x86_64/kmix-qt5.12.patch	2018-12-10 16:56:55 UTC (rev 341553)
@@ -0,0 +1,14 @@
+diff --git a/backends/mixer_pulse.cpp b/backends/mixer_pulse.cpp
+index 7a52b1f..fd9bc21 100644
+--- a/backends/mixer_pulse.cpp
++++ b/backends/mixer_pulse.cpp
+@@ -972,7 +972,8 @@ Mixer_PULSE::Mixer_PULSE(Mixer *mixer, int devnum) : Mixer_Backend(mixer, devnum
+         s_pulseActive = INACTIVE;
+ 
+     // 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")) {
+         qCDebug(KMIX_LOG) << "Disabling PulseAudio integration for lack of GLib event loop";
+         s_pulseActive = INACTIVE;
+     }