[arch-commits] Commit in kdemultimedia-kmix/repos (12 files)
Antonio Rojas
arojas at archlinux.org
Wed Dec 9 08:02:04 UTC 2015
Date: Wednesday, December 9, 2015 @ 09:02:04
Author: arojas
Revision: 254937
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64
Added:
kdemultimedia-kmix/repos/kde-unstable-i686/PKGBUILD
(from rev 254936, kdemultimedia-kmix/kde-unstable/PKGBUILD)
kdemultimedia-kmix/repos/kde-unstable-i686/kdemultimedia-kmix.install
(from rev 254936, kdemultimedia-kmix/kde-unstable/kdemultimedia-kmix.install)
kdemultimedia-kmix/repos/kde-unstable-i686/use-qdbus-qt4.patch
(from rev 254936, kdemultimedia-kmix/kde-unstable/use-qdbus-qt4.patch)
kdemultimedia-kmix/repos/kde-unstable-x86_64/PKGBUILD
(from rev 254936, kdemultimedia-kmix/kde-unstable/PKGBUILD)
kdemultimedia-kmix/repos/kde-unstable-x86_64/kdemultimedia-kmix.install
(from rev 254936, kdemultimedia-kmix/kde-unstable/kdemultimedia-kmix.install)
kdemultimedia-kmix/repos/kde-unstable-x86_64/use-qdbus-qt4.patch
(from rev 254936, kdemultimedia-kmix/kde-unstable/use-qdbus-qt4.patch)
Deleted:
kdemultimedia-kmix/repos/kde-unstable-i686/PKGBUILD
kdemultimedia-kmix/repos/kde-unstable-i686/kdemultimedia-kmix.install
kdemultimedia-kmix/repos/kde-unstable-i686/use-qdbus-qt4.patch
kdemultimedia-kmix/repos/kde-unstable-x86_64/PKGBUILD
kdemultimedia-kmix/repos/kde-unstable-x86_64/kdemultimedia-kmix.install
kdemultimedia-kmix/repos/kde-unstable-x86_64/use-qdbus-qt4.patch
------------------------------------------------+
/PKGBUILD | 140 +++++++++++++++++++++++
/kdemultimedia-kmix.install | 22 +++
/use-qdbus-qt4.patch | 118 +++++++++++++++++++
kde-unstable-i686/PKGBUILD | 70 -----------
kde-unstable-i686/kdemultimedia-kmix.install | 11 -
kde-unstable-i686/use-qdbus-qt4.patch | 59 ---------
kde-unstable-x86_64/PKGBUILD | 70 -----------
kde-unstable-x86_64/kdemultimedia-kmix.install | 11 -
kde-unstable-x86_64/use-qdbus-qt4.patch | 59 ---------
9 files changed, 280 insertions(+), 280 deletions(-)
Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD 2015-12-09 08:01:36 UTC (rev 254936)
+++ kde-unstable-i686/PKGBUILD 2015-12-09 08:02:04 UTC (rev 254937)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kdemultimedia-kmix
-pkgname=('kdemultimedia-kmix' 'kmix')
-pkgver=15.11.90
-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')
-source=("http://download.kde.org/unstable/applications/${pkgver}/src/kmix-${pkgver}.tar.xz"
- 'use-qdbus-qt4.patch')
-sha1sums=('e595e7ffc8a3f1f07d56154c300dd2e59285fc0c'
- '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 \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package_kdemultimedia-kmix() {
- depends=('kdebase-runtime')
- optdepends=('libcanberra-pulse: PulseAudio support')
- groups=('kde-applications' 'kdemultimedia')
- install=$pkgbase.install
-
- 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')
- install=$pkgbase.install
-
- cd build-kf5
- make DESTDIR="$pkgdir" install
-}
Copied: kdemultimedia-kmix/repos/kde-unstable-i686/PKGBUILD (from rev 254936, kdemultimedia-kmix/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD (rev 0)
+++ kde-unstable-i686/PKGBUILD 2015-12-09 08:02:04 UTC (rev 254937)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdemultimedia-kmix
+pkgname=('kdemultimedia-kmix' 'kmix')
+pkgver=15.11.90
+pkgrel=2
+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')
+source=("http://download.kde.org/unstable/applications/${pkgver}/src/kmix-${pkgver}.tar.xz"
+ 'use-qdbus-qt4.patch')
+sha1sums=('e595e7ffc8a3f1f07d56154c300dd2e59285fc0c'
+ '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 \
+ -DLIB_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package_kdemultimedia-kmix() {
+ depends=('kdebase-runtime')
+ optdepends=('libcanberra-pulse: PulseAudio support')
+ groups=('kde-applications' 'kdemultimedia')
+ install=$pkgbase.install
+
+ 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')
+ install=$pkgbase.install
+
+ cd build-kf5
+ make DESTDIR="$pkgdir" install
+}
Deleted: kde-unstable-i686/kdemultimedia-kmix.install
===================================================================
--- kde-unstable-i686/kdemultimedia-kmix.install 2015-12-09 08:01:36 UTC (rev 254936)
+++ kde-unstable-i686/kdemultimedia-kmix.install 2015-12-09 08:02:04 UTC (rev 254937)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdemultimedia-kmix/repos/kde-unstable-i686/kdemultimedia-kmix.install (from rev 254936, kdemultimedia-kmix/kde-unstable/kdemultimedia-kmix.install)
===================================================================
--- kde-unstable-i686/kdemultimedia-kmix.install (rev 0)
+++ kde-unstable-i686/kdemultimedia-kmix.install 2015-12-09 08:02:04 UTC (rev 254937)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: kde-unstable-i686/use-qdbus-qt4.patch
===================================================================
--- kde-unstable-i686/use-qdbus-qt4.patch 2015-12-09 08:01:36 UTC (rev 254936)
+++ kde-unstable-i686/use-qdbus-qt4.patch 2015-12-09 08:02:04 UTC (rev 254937)
@@ -1,59 +0,0 @@
---- 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
Copied: kdemultimedia-kmix/repos/kde-unstable-i686/use-qdbus-qt4.patch (from rev 254936, kdemultimedia-kmix/kde-unstable/use-qdbus-qt4.patch)
===================================================================
--- kde-unstable-i686/use-qdbus-qt4.patch (rev 0)
+++ kde-unstable-i686/use-qdbus-qt4.patch 2015-12-09 08:02:04 UTC (rev 254937)
@@ -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
Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD 2015-12-09 08:01:36 UTC (rev 254936)
+++ kde-unstable-x86_64/PKGBUILD 2015-12-09 08:02:04 UTC (rev 254937)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kdemultimedia-kmix
-pkgname=('kdemultimedia-kmix' 'kmix')
-pkgver=15.11.90
-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')
-source=("http://download.kde.org/unstable/applications/${pkgver}/src/kmix-${pkgver}.tar.xz"
- 'use-qdbus-qt4.patch')
-sha1sums=('e595e7ffc8a3f1f07d56154c300dd2e59285fc0c'
- '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 \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package_kdemultimedia-kmix() {
- depends=('kdebase-runtime')
- optdepends=('libcanberra-pulse: PulseAudio support')
- groups=('kde-applications' 'kdemultimedia')
- install=$pkgbase.install
-
- 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')
- install=$pkgbase.install
-
- cd build-kf5
- make DESTDIR="$pkgdir" install
-}
Copied: kdemultimedia-kmix/repos/kde-unstable-x86_64/PKGBUILD (from rev 254936, kdemultimedia-kmix/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD (rev 0)
+++ kde-unstable-x86_64/PKGBUILD 2015-12-09 08:02:04 UTC (rev 254937)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdemultimedia-kmix
+pkgname=('kdemultimedia-kmix' 'kmix')
+pkgver=15.11.90
+pkgrel=2
+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')
+source=("http://download.kde.org/unstable/applications/${pkgver}/src/kmix-${pkgver}.tar.xz"
+ 'use-qdbus-qt4.patch')
+sha1sums=('e595e7ffc8a3f1f07d56154c300dd2e59285fc0c'
+ '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 \
+ -DLIB_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package_kdemultimedia-kmix() {
+ depends=('kdebase-runtime')
+ optdepends=('libcanberra-pulse: PulseAudio support')
+ groups=('kde-applications' 'kdemultimedia')
+ install=$pkgbase.install
+
+ 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')
+ install=$pkgbase.install
+
+ cd build-kf5
+ make DESTDIR="$pkgdir" install
+}
Deleted: kde-unstable-x86_64/kdemultimedia-kmix.install
===================================================================
--- kde-unstable-x86_64/kdemultimedia-kmix.install 2015-12-09 08:01:36 UTC (rev 254936)
+++ kde-unstable-x86_64/kdemultimedia-kmix.install 2015-12-09 08:02:04 UTC (rev 254937)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdemultimedia-kmix/repos/kde-unstable-x86_64/kdemultimedia-kmix.install (from rev 254936, kdemultimedia-kmix/kde-unstable/kdemultimedia-kmix.install)
===================================================================
--- kde-unstable-x86_64/kdemultimedia-kmix.install (rev 0)
+++ kde-unstable-x86_64/kdemultimedia-kmix.install 2015-12-09 08:02:04 UTC (rev 254937)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: kde-unstable-x86_64/use-qdbus-qt4.patch
===================================================================
--- kde-unstable-x86_64/use-qdbus-qt4.patch 2015-12-09 08:01:36 UTC (rev 254936)
+++ kde-unstable-x86_64/use-qdbus-qt4.patch 2015-12-09 08:02:04 UTC (rev 254937)
@@ -1,59 +0,0 @@
---- 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
Copied: kdemultimedia-kmix/repos/kde-unstable-x86_64/use-qdbus-qt4.patch (from rev 254936, kdemultimedia-kmix/kde-unstable/use-qdbus-qt4.patch)
===================================================================
--- kde-unstable-x86_64/use-qdbus-qt4.patch (rev 0)
+++ kde-unstable-x86_64/use-qdbus-qt4.patch 2015-12-09 08:02:04 UTC (rev 254937)
@@ -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
More information about the arch-commits
mailing list