[arch-commits] Commit in kdemultimedia-kmix/trunk (PKGBUILD kmixui_rc.patch)

[Antonio Rojas]

    Date: Saturday, August 22, 2015 @ 01:20:47
  Author: arojas
Revision: 244480

Fix files installed in root dir

Added:
  kdemultimedia-kmix/trunk/kmixui_rc.patch
Modified:
  kdemultimedia-kmix/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   14 ++++++++++----
 kmixui_rc.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-21 20:09:37 UTC (rev 244479)
+++ PKGBUILD	2015-08-21 23:20:47 UTC (rev 244480)
@@ -5,7 +5,7 @@
 pkgbase=kdemultimedia-kmix
 pkgname=('kdemultimedia-kmix' 'kmix')
 pkgver=15.08.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE volume control program"
 url='http://kde.org/applications/multimedia/kmix/'
 arch=('i686' 'x86_64')
@@ -12,12 +12,18 @@
 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')
+        'use-qdbus-qt4.patch' 'kmixui_rc.patch')
 sha1sums=('941bed772963cffca401662a1ad58bc75f3724bc'
-          'f89a076c5a29c51d213864e27d07baf5400ece03')
+          'f89a076c5a29c51d213864e27d07baf5400ece03'
+          '4f5dc15ed8cb0499a1522dfa4c7b9f88eef631f5')
 
 prepare() {
-  mkdir build{,-kf5}
+  mkdir -p build{,-kf5}
+
+# Fix kmixui_rc install path
+  pushd kmix-$pkgver
+  patch -p1 -i ../kmixui_rc.patch
+  popd
   
   cp -r kmix-$pkgver kmix-kf5-$pkgver
   # FS#40786

Added: kmixui_rc.patch
===================================================================
--- kmixui_rc.patch	                        (rev 0)
+++ kmixui_rc.patch	2015-08-21 23:20:47 UTC (rev 244480)
@@ -0,0 +1,27 @@
+From: Michael Pyne <mpyne at kde.org>
+Date: Sun, 09 Aug 2015 03:17:00 +0000
+Subject: Refix the kmixui_rc install path.
+X-Git-Url: http://quickgit.kde.org/?p=kmix.git&a=commitdiff&h=30054aabbf94f526a3162e12bee0bcd9dc41d204
+---
+Refix the kmixui_rc install path.
+
+I suppose this might break KF5 but it looks like that's still broken
+anyways.
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -387,9 +387,9 @@
+ install( FILES restore_kmix_volumes.desktop  DESTINATION ${AUTOSTART_INSTALL_DIR})
+ install( FILES kmix_autostart.desktop  DESTINATION ${AUTOSTART_INSTALL_DIR})
+ if (KMIX_KF5_BUILD)
++   install( FILES kmixui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/kmix)
++else()
+    install( FILES kmixui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kmix )
+-else()
+-   install( FILES kmixui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/kmix)
+ endif()
+ install( FILES kmixctrl_restore.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+ install( FILES dbus/org.kde.kmix.control.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
+