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

[Felix Yan]

    Date: Sunday, August 21, 2016 @ 03:35:40
  Author: felixonmars
Revision: 274406

upgpkg: kdemultimedia-kmix 16.08.0-1

Upstream release

Added:
  kdemultimedia-kmix/trunk/
  kdemultimedia-kmix/trunk/PKGBUILD
  kdemultimedia-kmix/trunk/use-qdbus-qt4.patch
Deleted:
  kdemultimedia-kmix/trunk/

---------------------+
 PKGBUILD            |   68 ++++++++++++++++++++++++++++++++++++++++++++++++++
 use-qdbus-qt4.patch |   59 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

Added: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	                        (rev 0)
+++ trunk/PKGBUILD	2016-08-21 03:35:40 UTC (rev 274406)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdemultimedia-kmix
+pkgname=('kdemultimedia-kmix' 'kmix')
+pkgver=16.08.0
+pkgrel=1
+pkgdesc="KDE volume control program"
+url='http://kde.org/applications/multimedia/kmix/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+makedepends=('cmake' 'automoc4' 'kdelibs' 'extra-cmake-modules' 'python' 'kdoctools' 'kdelibs4support' 'plasma-framework'
+             'libcanberra' 'kdesignerplugin')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kmix-${pkgver}.tar.xz"
+        'use-qdbus-qt4.patch')
+sha1sums=('5b4fc27c25bc084786cd441e2f07bbd7336eb626'
+          'f89a076c5a29c51d213864e27d07baf5400ece03')
+
+prepare() {
+  mkdir -p build{,-kf5}
+
+  cp -r kmix-$pkgver kmix-kf5-$pkgver
+
+  # FS#40786
+  cd kmix-${pkgver}
+  sed -i 's|qdbus|qdbus-qt4|' apps/kmixremote
+  
+  # https://bugs.kde.org/show_bug.cgi?id=343621
+  cd ../kmix-kf5-$pkgver
+  sed -e 's|${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}|${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake/modules|' -i CMakeLists.txt
+}
+
+build() {
+  cd build
+  cmake ../kmix-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+
+  cd ../build-kf5
+  cmake ../kmix-kf5-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKMIX_KF5_BUILD=ON \
+    -DKDE_INSTALL_LIBDIR=lib
+  make
+}
+
+package_kdemultimedia-kmix() {
+  depends=('kdebase-runtime')
+  optdepends=('libcanberra-pulse: PulseAudio support')
+  groups=('kde-applications' 'kdemultimedia')
+  
+  cd build
+  make DESTDIR="$pkgdir" install
+}
+
+package_kmix() {
+  pkgdesc="KDE volume control program (experimental KF5 version)"
+  depends=('kdelibs4support' 'libcanberra' 'hicolor-icon-theme')
+  optdepends=('libcanberra-pulse: PulseAudio support')
+  conflicts=('kdemultimedia-kmix')
+  
+  cd build-kf5
+  make DESTDIR="$pkgdir" install
+}


Property changes on: kdemultimedia-kmix/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: trunk/use-qdbus-qt4.patch
===================================================================
--- trunk/use-qdbus-qt4.patch	                        (rev 0)
+++ trunk/use-qdbus-qt4.patch	2016-08-21 03:35:40 UTC (rev 274406)
@@ -0,0 +1,59 @@
+--- kmix-4.13.2/apps/kmixremote~	2014-06-14 15:17:06.856474667 +0000
++++ kmix-4.13.2/apps/kmixremote	2014-06-14 15:17:44.759594763 +0000
+@@ -28,7 +28,7 @@
+ # Prints the mixer DBUS ID's on the console. leaving out the "/Mixers/" prefix
+ function listMixers
+ {
+-  qdbus org.kde.kmix /Mixers org.freedesktop.DBus.Properties.Get org.kde.KMix.MixSet mixers | cut -f3 -d/
++  qdbus-qt4 org.kde.kmix /Mixers org.freedesktop.DBus.Properties.Get org.kde.KMix.MixSet mixers | cut -f3 -d/
+   errorCode=$?
+   if test $errorCode != 0; then
+     echo "Error $errorCode listing mixers. KMix is not running."
+@@ -38,7 +38,7 @@
+ # Prints the mixer control DBUS ID's of the given mixer on the console. leaving out the "/Mixers/" prefix
+ function listControls
+ {
+-  qdbus org.kde.kmix $1 org.freedesktop.DBus.Properties.Get org.kde.KMix.Mixer controls  | cut -f4 -d/
++  qdbus-qt4 org.kde.kmix $1 org.freedesktop.DBus.Properties.Get org.kde.KMix.Mixer controls  | cut -f4 -d/
+   errorCode=$?
+   if test $errorCode != 0; then
+     echo "Error $errorCode listing controls. KMix is not running."
+@@ -47,8 +47,8 @@
+ 
+ command=""
+ 
+-if ! type qdbus >/dev/null  2>&1 ; then
+-  exit_with_error "$0 requires qdbus, but it cannot be found. Please install or check \$PATH"
++if ! type qdbus-qt4 >/dev/null  2>&1 ; then
++  exit_with_error "$0 requires qdbus-qt4, but it cannot be found. Please install or check \$PATH"
+ fi
+ 
+ # Read args
+@@ -58,8 +58,8 @@
+   if test -z "$arg"; then
+     break
+   elif test "x--master" = "x$arg"; then
+-    mixer=`qdbus org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterMixer`
+-    control=`qdbus org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterControl`
++    mixer=`qdbus-qt4 org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterMixer`
++    control=`qdbus-qt4 org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterControl`
+   elif test "x--help" = "x$arg" -o "x-h" = "x$arg"; then
+     usage
+     exit 0
+@@ -113,13 +113,13 @@
+ # --- EXECUTE PHASE --------------------------------------------------------------------------------------------------
+ if test "xget" = "x$command"; then
+   # GET
+-  qdbus org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Get org.kde.KMix.Control volume
++  qdbus-qt4 org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Get org.kde.KMix.Control volume
+ elif test "xset" = "x$command"; then
+   # SET
+-  qdbus org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control volume $genericArg
++  qdbus-qt4 org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control volume $genericArg
+ elif test "xmute" = "x$command"; then
+   # MUTE
+-  qdbus org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control mute $genericArg
++  qdbus-qt4 org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control mute $genericArg
+ else
+   exit_with_error "No such command '$command'"
+ fi