Katana_mirror/katana
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katana.git synced 2025-02-23 18:32:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

packaging: remove now redundant khotkeys patch

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-04-30 15:30:49 +00:00
parent 461e9ea795
commit bd8e8bd96d
2 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packaging/archlinux/katana-workspace/PKGBUILD
View file

@ -5,8 +5,8 @@
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=katana-workspace
pkgver=4.18.0.34f9060
pkgrel=2
pkgver=4.18.0.0b88124
pkgrel=1
pkgdesc="Katana workspace interface and basic tools"
arch=('i686' 'x86_64')
url='http://fluxer.github.io/katana/'
@ -32,7 +32,7 @@ install="${pkgname}.install"
backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kde' 'etc/pam.d/kde-np' 'etc/pam.d/kscreensaver')
source=("git+https://github.com/fluxer/kde-workspace.git"
'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
'etc-scripts.patch' 'terminate-server.patch' 'khotkeys-qt4.patch')
'etc-scripts.patch' 'terminate-server.patch')
sha1sums=('SKIP'
'660eae40a707d2711d8d7f32a93214865506b795'
'6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@ -40,8 +40,7 @@ sha1sums=('SKIP'
'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
'c079ebd157c836ba996190f0d2bcea1a7828d02c'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
'aa9d2e5a69986c4c3d47829721ea99edb473be12')
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
conflicts=('kdebase-workspace' 'kdebase-runtime')
provides=('kdebase-workspace')
@ -56,8 +55,6 @@ prepare() {
cd kde-workspace
# reads the shell scripts in /etc/kde/
patch -p0 -i "${srcdir}/etc-scripts.patch"
# FS#39188
patch -p1 -i "${srcdir}/khotkeys-qt4.patch"
# KDEBUG#202629
patch -p0 -i "${srcdir}/terminate-server.patch"
}

22
packaging/archlinux/katana-workspace/khotkeys-qt4.patch
View file

@ -1,22 +0,0 @@
--- kde-workspace-4.11.7/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp~ 2014-03-05 18:41:23.126818552 +0000
+++ kde-workspace-4.11.7/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp 2014-03-05 18:42:05.563172036 +0000
@@ -117,7 +117,7 @@
void DbusActionWidget::launchDbusBrowser() const
{
- if( KRun::runCommand( "qdbusviewer", window()) == 0 )
+ if( KRun::runCommand( "qdbusviewer-qt4", window()) == 0 )
{
KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer" ));
}
--- kde-workspace-4.11.7/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp~ 2014-03-05 18:41:29.120107842 +0000
+++ kde-workspace-4.11.7/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp 2014-03-05 18:41:52.349936188 +0000
@@ -133,7 +133,7 @@
}
kDebug() << "D-Bus call:" << _application << ":" << _object << ":" << _function << ":" << args_list;
KProcess proc;
- proc << "qdbus" << _application << _object << _function << args_list;
+ proc << "qdbus-qt4" << _application << _object << _function << args_list;
proc.startDetached();
}