Date: Tuesday, October 13, 2015 @ 09:46:25 Author: arojas Revision: 249110
archrelease: copy trunk to extra-i686, extra-x86_64 Added: kdemultimedia-kmix/repos/extra-i686/PKGBUILD (from rev 249109, kdemultimedia-kmix/trunk/PKGBUILD) kdemultimedia-kmix/repos/extra-i686/kdemultimedia-kmix.install (from rev 249109, kdemultimedia-kmix/trunk/kdemultimedia-kmix.install) kdemultimedia-kmix/repos/extra-i686/use-qdbus-qt4.patch (from rev 249109, kdemultimedia-kmix/trunk/use-qdbus-qt4.patch) kdemultimedia-kmix/repos/extra-x86_64/PKGBUILD (from rev 249109, kdemultimedia-kmix/trunk/PKGBUILD) kdemultimedia-kmix/repos/extra-x86_64/kdemultimedia-kmix.install (from rev 249109, kdemultimedia-kmix/trunk/kdemultimedia-kmix.install) kdemultimedia-kmix/repos/extra-x86_64/use-qdbus-qt4.patch (from rev 249109, kdemultimedia-kmix/trunk/use-qdbus-qt4.patch) Deleted: kdemultimedia-kmix/repos/extra-i686/PKGBUILD kdemultimedia-kmix/repos/extra-i686/kdemultimedia-kmix.install kdemultimedia-kmix/repos/extra-i686/use-qdbus-qt4.patch kdemultimedia-kmix/repos/extra-x86_64/PKGBUILD kdemultimedia-kmix/repos/extra-x86_64/kdemultimedia-kmix.install kdemultimedia-kmix/repos/extra-x86_64/use-qdbus-qt4.patch -----------------------------------------+ /PKGBUILD | 140 ++++++++++++++++++++++++++++++ /kdemultimedia-kmix.install | 22 ++++ /use-qdbus-qt4.patch | 118 +++++++++++++++++++++++++ extra-i686/PKGBUILD | 70 --------------- extra-i686/kdemultimedia-kmix.install | 11 -- extra-i686/use-qdbus-qt4.patch | 59 ------------ extra-x86_64/PKGBUILD | 70 --------------- extra-x86_64/kdemultimedia-kmix.install | 11 -- extra-x86_64/use-qdbus-qt4.patch | 59 ------------ 9 files changed, 280 insertions(+), 280 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-10-13 07:45:55 UTC (rev 249109) +++ extra-i686/PKGBUILD 2015-10-13 07:46:25 UTC (rev 249110) @@ -1,70 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgbase=kdemultimedia-kmix -pkgname=('kdemultimedia-kmix' 'kmix') -pkgver=15.08.1 -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' 'kcmutils' 'libcanberra') -source=("http://download.kde.org/stable/applications/${pkgver}/src/kmix-${pkgver}.tar.xz" - 'use-qdbus-qt4.patch') -sha1sums=('19ae3bffa4d579eddb5f9bd57aabb3fac8511847' - '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' 'kcmutils' '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/extra-i686/PKGBUILD (from rev 249109, kdemultimedia-kmix/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-10-13 07:46:25 UTC (rev 249110) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgbase=kdemultimedia-kmix +pkgname=('kdemultimedia-kmix' 'kmix') +pkgver=15.08.2 +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' 'kcmutils' 'libcanberra') +source=("http://download.kde.org/stable/applications/${pkgver}/src/kmix-${pkgver}.tar.xz" + 'use-qdbus-qt4.patch') +sha1sums=('92a11bfa0c9b084b3fa0e0e4d0cdaf2415b13033' + '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' 'kcmutils' 'libcanberra' 'hicolor-icon-theme') + optdepends=('libcanberra-pulse: PulseAudio support') + conflicts=('kdemultimedia-kmix') + install="${pkgbase}.install" + + cd build-kf5 + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/kdemultimedia-kmix.install =================================================================== --- extra-i686/kdemultimedia-kmix.install 2015-10-13 07:45:55 UTC (rev 249109) +++ extra-i686/kdemultimedia-kmix.install 2015-10-13 07:46:25 UTC (rev 249110) @@ -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/extra-i686/kdemultimedia-kmix.install (from rev 249109, kdemultimedia-kmix/trunk/kdemultimedia-kmix.install) =================================================================== --- extra-i686/kdemultimedia-kmix.install (rev 0) +++ extra-i686/kdemultimedia-kmix.install 2015-10-13 07:46:25 UTC (rev 249110) @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-i686/use-qdbus-qt4.patch =================================================================== --- extra-i686/use-qdbus-qt4.patch 2015-10-13 07:45:55 UTC (rev 249109) +++ extra-i686/use-qdbus-qt4.patch 2015-10-13 07:46:25 UTC (rev 249110) @@ -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/extra-i686/use-qdbus-qt4.patch (from rev 249109, kdemultimedia-kmix/trunk/use-qdbus-qt4.patch) =================================================================== --- extra-i686/use-qdbus-qt4.patch (rev 0) +++ extra-i686/use-qdbus-qt4.patch 2015-10-13 07:46:25 UTC (rev 249110) @@ -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: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-10-13 07:45:55 UTC (rev 249109) +++ extra-x86_64/PKGBUILD 2015-10-13 07:46:25 UTC (rev 249110) @@ -1,70 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgbase=kdemultimedia-kmix -pkgname=('kdemultimedia-kmix' 'kmix') -pkgver=15.08.1 -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' 'kcmutils' 'libcanberra') -source=("http://download.kde.org/stable/applications/${pkgver}/src/kmix-${pkgver}.tar.xz" - 'use-qdbus-qt4.patch') -sha1sums=('19ae3bffa4d579eddb5f9bd57aabb3fac8511847' - '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' 'kcmutils' '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/extra-x86_64/PKGBUILD (from rev 249109, kdemultimedia-kmix/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-10-13 07:46:25 UTC (rev 249110) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgbase=kdemultimedia-kmix +pkgname=('kdemultimedia-kmix' 'kmix') +pkgver=15.08.2 +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' 'kcmutils' 'libcanberra') +source=("http://download.kde.org/stable/applications/${pkgver}/src/kmix-${pkgver}.tar.xz" + 'use-qdbus-qt4.patch') +sha1sums=('92a11bfa0c9b084b3fa0e0e4d0cdaf2415b13033' + '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' 'kcmutils' 'libcanberra' 'hicolor-icon-theme') + optdepends=('libcanberra-pulse: PulseAudio support') + conflicts=('kdemultimedia-kmix') + install="${pkgbase}.install" + + cd build-kf5 + make DESTDIR="${pkgdir}" install +} Deleted: extra-x86_64/kdemultimedia-kmix.install =================================================================== --- extra-x86_64/kdemultimedia-kmix.install 2015-10-13 07:45:55 UTC (rev 249109) +++ extra-x86_64/kdemultimedia-kmix.install 2015-10-13 07:46:25 UTC (rev 249110) @@ -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/extra-x86_64/kdemultimedia-kmix.install (from rev 249109, kdemultimedia-kmix/trunk/kdemultimedia-kmix.install) =================================================================== --- extra-x86_64/kdemultimedia-kmix.install (rev 0) +++ extra-x86_64/kdemultimedia-kmix.install 2015-10-13 07:46:25 UTC (rev 249110) @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/use-qdbus-qt4.patch =================================================================== --- extra-x86_64/use-qdbus-qt4.patch 2015-10-13 07:45:55 UTC (rev 249109) +++ extra-x86_64/use-qdbus-qt4.patch 2015-10-13 07:46:25 UTC (rev 249110) @@ -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/extra-x86_64/use-qdbus-qt4.patch (from rev 249109, kdemultimedia-kmix/trunk/use-qdbus-qt4.patch) =================================================================== --- extra-x86_64/use-qdbus-qt4.patch (rev 0) +++ extra-x86_64/use-qdbus-qt4.patch 2015-10-13 07:46:25 UTC (rev 249110) @@ -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