git » kmix.git » commit 8a0e3da

KDE Applications 18.12.0

author Antonio Rojas
2018-12-13 11:24:54 UTC
committer Antonio Rojas
2018-12-13 11:24:54 UTC
parent 84d73ae018b19176a4dcdee0ddb6f363f675a577

KDE Applications 18.12.0

PKGBUILD +6 -11
kmix-qt5.12.patch +0 -14

diff --git a/PKGBUILD b/PKGBUILD
index b7f14a8..8150886 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,29 +3,24 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kmix
-pkgver=18.08.3
-pkgrel=2
+pkgver=18.12.0
+pkgrel=1
 pkgdesc="KDE volume control program"
 url='https://kde.org/applications/multimedia/kmix/'
 arch=(x86_64)
 license=(GPL LGPL FDL)
-depends=(kinit hicolor-icon-theme)
+depends=(knotifications kxmlgui 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')
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('49311a4043acaba2ee58ce3b715334aef11a19338b1c84b2f15484c48569a126'
+            'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
 prepare() {
   mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../kmix-qt5.12.patch # Fix PulseAudio support with Qt 5.12
 }
 
 build() {
diff --git a/kmix-qt5.12.patch b/kmix-qt5.12.patch
deleted file mode 100644
index a78d16f..0000000
--- a/kmix-qt5.12.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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;
-     }