diff --git a/kde-common/PKGBUILD b/kde-common/PKGBUILD index 44fbeaf9e..900b9df14 100644 --- a/kde-common/PKGBUILD +++ b/kde-common/PKGBUILD @@ -67,7 +67,7 @@ source=(http://www.kde-apps.org/CONTENT/content-files/48411-rootactions_servicem md5sums=('2afd86671ad0db31718157aecd46d528' # 48411-rootactions_servicemenu_2.4.10.tar.gz '170a7675d1ee15d9d9d622de3eaa42a3' # servicemenu-copy-path.desktop '630ffe7118eef8608a9e5e393a0b1e12' # 102825-compressattach.desktop.bz2 - '75a91d82f262a2ad4625c55996ec5b82' # servicemenu-rootactions.patch + 'e77e132d6da1a8d897db2ba630915b0f' # servicemenu-rootactions.patch 'd8c49b6344f08ca7b15fa4a1a0ac337f' # Chakra-Bugs.desktop 'fbc9bf83a6fa1fcef218ee3099e0d3d8' # Chakra-ChangeLog.desktop 'b51b1ee5e92d6c427fb5af7a321e16c9' # Chakra-Code.desktop diff --git a/kde-common/servicemenu-rootactions.patch b/kde-common/servicemenu-rootactions.patch index 3140b4acf..f74bdaa68 100644 --- a/kde-common/servicemenu-rootactions.patch +++ b/kde-common/servicemenu-rootactions.patch @@ -1,16 +1,146 @@ ---- rootactions-servicemenu.pl.orig 2010-02-16 16:20:37.000000000 +0100 -+++ rootactions-servicemenu.pl 2010-04-27 23:22:20.842240248 +0200 -@@ -812,13 +812,7 @@ sub get_kde_language { - } - - sub get_kde_path { -- if ( exists $ENV{KDEDIR} ) { -- $KDEBINPATH = "$ENV{KDEDIR}/bin/"; -- } +--- rootactions_servicemenu_2.4.10/Root_Actions_2.4.10/rootactions-servicemenu.pl.orig 2010-12-15 20:51:48.296667211 -0500 ++++ rootactions_servicemenu_2.4.10/Root_Actions_2.4.10/rootactions-servicemenu.pl 2010-12-15 21:37:27.893333878 -0500 +@@ -815,9 +815,8 @@ + if ( exists $ENV{KDEDIR} ) { + $KDEBINPATH = "$ENV{KDEDIR}/bin/"; + } - -- else { + else { - $KDEBINPATH = ""; -- } + $KDEBINPATH = "/usr/bin/"; + } } +@@ -850,7 +849,7 @@ + sub root_konsole_here { + $APPNAME = shift @ARGV ; + $WORKDIR = shift @ARGV ; +- exec "$SUCOMMAND \"\'$EXECNAME\' do_root_konsole \'$APPNAME\' \'$WORKDIR\'\""; ++ exec "$SUCOMMAND \"$EXECNAME\" do_root_konsole \"$APPNAME\" \"$WORKDIR\""; + exit $?; + } + +@@ -881,7 +880,7 @@ + $APPNAME = `$DIALOGCOMMAND --title "$OPENTITLE" --inputbox "$OPENMSG" program` ; + if ( $? eq 0 ) { + chomp $APPNAME ; +- exec "$SUCOMMAND \"\'$EXECNAME\' do_open_with \'$APPNAME\' \'$TARGET\'\""; ++ exec "$SUCOMMAND \"$EXECNAME\" do_open_with \"$APPNAME\" \"$TARGET\""; + exit $?; + } + } +@@ -896,7 +895,7 @@ + $APPNAME = "kwrite"; } + } + +- exec "$SUCOMMAND \"\'$EXECNAME\' do_open_with \'$APPNAME\' \'$TARGET\'\""; ++ exec "$SUCOMMAND \"$EXECNAME\" do_open_with \"$APPNAME\" \"$TARGET\""; + exit $?; + } + +@@ -907,7 +906,7 @@ + &root_reminder_msgs; + #Which program? (first argument) + $APPNAME = shift @ARGV ; +- ++ + if ( -x $KDEBINPATH.$APPNAME ) { + $CPROGRAM = $KDEBINPATH.$APPNAME ; } + else { +@@ -917,7 +916,7 @@ + shift; + #Create Target file string + $TARGET = join("' '", @ARGV) ; +- exec "$CPROGRAM --caption \"$APPNAME $ROOTREMINDER\" \'$TARGET\'" ; ++ exec "$CPROGRAM --caption \"$APPNAME $ROOTREMINDER\" \"$TARGET\"" ; + exit $?; + } + } +@@ -928,10 +927,10 @@ + + ©_dialog_msgs; + $OLDNAME = $ARGV[0]; +- $NEWNAME = `$DIALOGCOMMAND --title "$COPYTITLE" --inputbox "$COPYMSG" \'$OLDNAME\'` ; ++ $NEWNAME = `$DIALOGCOMMAND --title "$COPYTITLE" --inputbox "$COPYMSG" \"$OLDNAME\"` ; + chop $NEWNAME; + if ( $? eq 0 && $OLDNAME ne $NEWNAME ) { +- exec "$SUCOMMAND \"\'$EXECNAME\' do_copy \'$OLDNAME\' \'$NEWNAME\'\""; ++ exec "$SUCOMMAND \"$EXECNAME\" do_copy \"$OLDNAME\" \"$NEWNAME\""; + exit $?; + + } +@@ -943,7 +942,7 @@ + #get the arguments) + $OLDNAME = $ARGV[0] ; + $NEWNAME = $ARGV[1] ; +- `cp -pr \'$OLDNAME\' \'$NEWNAME\'`; ++ `cp -pr \"$OLDNAME\" \"$NEWNAME\"`; + } + } + #---End copy subroutines--- +@@ -955,17 +954,17 @@ + $TARGET = join("' '", @ARGV) ; + chomp($RENAMERPATH = `which $BATCHRENAMER`); + if ( $#ARGV > 0 && -x $RENAMERPATH ) { +- exec "$SUCOMMAND \"\'$EXECNAME\' do_open_with \'$BATCHRENAMER\' \'$TARGET\'\""; ++ exec "$SUCOMMAND \"$EXECNAME\" do_open_with \"$BATCHRENAMER\" \"$TARGET\""; + exit $?; + } + # else we'll use a simple rename script + else { + &rename_dialog_msgs; + $OLDNAME = $ARGV[0]; +- $NEWNAME = `$DIALOGCOMMAND --title "$RENAMETITLE" --inputbox "$RENAMEMSG" \'$OLDNAME\'` ; ++ $NEWNAME = `$DIALOGCOMMAND --title "$RENAMETITLE" --inputbox "$RENAMEMSG" \"$OLDNAME\"` ; + chop $NEWNAME; + if ( $? eq 0 && $OLDNAME ne $NEWNAME ) { +- exec "$SUCOMMAND \"\'$EXECNAME\' do_rename \'$OLDNAME\' \'$NEWNAME\'\""; ++ exec "$SUCOMMAND \"$EXECNAME\" do_rename \"$OLDNAME\" \"$NEWNAME\""; + exit $?; + } + } +@@ -996,7 +995,7 @@ + # kdesu will run the command as regular user if 'Ignore' is chosen from kdesu dialog. + # To prevent unwanted deletion of files, we'll run 'do_delete' instead of 'rm -r', 'do delete' + # will exit if it's run as normal user, therefore the files writable for user are safe when clicking 'Ignore' +- exec "$SUCOMMAND \"\'$EXECNAME\' do_delete \'$TARGET\'\""; ++ exec "$SUCOMMAND \"$EXECNAME\" do_delete \"$TARGET\""; + } + } + +@@ -1024,7 +1023,7 @@ + } + + # Same as with delete, we don't want kdesu to run 'chown' when 'Ignore' is pressed in the kdesu dialog, so we use 'do_ownership' instead +- exec "$SUCOMMAND \"\'$EXECNAME\' do_ownership \'$RECURSIVE\' 0:0 \'$TARGET\'\""; ++ exec "$SUCOMMAND \"$EXECNAME\" do_ownership \"$RECURSIVE\" 0:0 \"$TARGET\""; + exit $?; + } + +@@ -1042,7 +1041,7 @@ + + #Create a list of user GIDs, so we can pick only the primary group + @GROUPS = split ' ', $); +- exec "$SUCOMMAND \"\'$EXECNAME\' do_ownership \'$RECURSIVE\' $>:$GROUPS[0] \'$TARGET\'\""; ++ exec "$SUCOMMAND \"$EXECNAME\" do_ownership \"$RECURSIVE\" $>:$GROUPS[0] \"$TARGET\""; + exit $?; + } + +@@ -1063,7 +1062,7 @@ + + if ( $? eq 0 ) { + chop $UIDGID; +- exec "$SUCOMMAND \"\'$EXECNAME\' do_ownership \'$RECURSIVE\' \'$UIDGID\' \'$TARGET\'\""; ++ exec "$SUCOMMAND \"$EXECNAME\" do_ownership \"$RECURSIVE\" \"$UIDGID\" \"$TARGET\""; + exit $?; + } + } +@@ -1178,7 +1177,7 @@ + system "$DIALOGCOMMAND --title \'$SPCTITLE\' --warningcontinuecancel \'$SPCMSG\'"; + } + if ( $? eq 0 ) { +- exec "$SUCOMMAND \"\'$EXECNAME\' do_permissions \'$RECURSIVE\' \'$CHMOD\' \'$TARGET\'\""; ++ exec "$SUCOMMAND \"$EXECNAME\" do_permissions \"$RECURSIVE\" \"$CHMOD\" \"$TARGET\""; + exit $?; + } + }