Date: Friday, April 25, 2014 @ 14:16:34
Author: andrea
Revision: 211744
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
konversation/repos/extra-i686/PKGBUILD
(from rev 211743, konversation/trunk/PKGBUILD)
konversation/repos/extra-i686/konversation.install
(from rev 211743, konversation/trunk/konversation.install)
konversation/repos/extra-i686/use-qdbus-qt4.patch
(from rev 211743, konversation/trunk/use-qdbus-qt4.patch)
konversation/repos/extra-x86_64/PKGBUILD
(from rev 211743, konversation/trunk/PKGBUILD)
konversation/repos/extra-x86_64/konversation.install
(from rev 211743, konversation/trunk/konversation.install)
konversation/repos/extra-x86_64/use-qdbus-qt4.patch
(from rev 211743, konversation/trunk/use-qdbus-qt4.patch)
Deleted:
konversation/repos/extra-i686/PKGBUILD
konversation/repos/extra-i686/konversation.install
konversation/repos/extra-x86_64/PKGBUILD
konversation/repos/extra-x86_64/konversation.install
-----------------------------------+
/PKGBUILD | 100 ++++++++++++++++++++
/konversation.install | 24 ++++
extra-i686/PKGBUILD | 45 ---------
extra-i686/konversation.install | 12 --
extra-i686/use-qdbus-qt4.patch | 174 ++++++++++++++++++++++++++++++++++++
extra-x86_64/PKGBUILD | 45 ---------
extra-x86_64/konversation.install | 12 --
extra-x86_64/use-qdbus-qt4.patch | 174 ++++++++++++++++++++++++++++++++++++
8 files changed, 472 insertions(+), 114 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-04-25 12:16:23 UTC (rev 211743)
+++ extra-i686/PKGBUILD 2014-04-25 12:16:34 UTC (rev 211744)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <[email protected]>
-# Contributor: Stéphane Gaudreault <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-# Contributor: James Rayner <[email protected]>
-# Contributor: Sergio Jovani Guzman <[email protected]>
-
-pkgname=konversation
-pkgver=1.5
-pkgrel=1
-pkgdesc="A user friendly IRC client for KDE"
-arch=('i686' 'x86_64')
-url="http://konversation.kde.org";
-depends=('kdebase-runtime' 'kdepimlibs')
-makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml' 'optipng')
-optdepends=('python: python scripting support'
- 'kdebase-konsole: open a terminal in konversation'
- 'qca-ossl: Diffie-Hellman key exchange and Blowfish ECB/CBC
support')
-license=('GPL2' 'FDL')
-install=${pkgname}.install
-options=('!makeflags')
-source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz";)
-sha1sums=('3955a43758750b63d84299a9d9a5933b73e5492b')
-
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # Remove a bunch of symlinks pointing to non-existant files
- for _lang in pt_BR uk sv et de en nl; do
- rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common
- done
-}
Copied: konversation/repos/extra-i686/PKGBUILD (from rev 211743,
konversation/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-04-25 12:16:34 UTC (rev 211744)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Tom Gundersen <[email protected]>
+# Contributor: Stéphane Gaudreault <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: James Rayner <[email protected]>
+# Contributor: Sergio Jovani Guzman <[email protected]>
+
+pkgname=konversation
+pkgver=1.5
+pkgrel=2
+pkgdesc="A user friendly IRC client for KDE"
+arch=('i686' 'x86_64')
+url="http://konversation.kde.org";
+depends=('kdebase-runtime' 'kdepimlibs')
+makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml' 'optipng')
+optdepends=('python: python scripting support'
+ 'kdebase-konsole: open a terminal in konversation'
+ 'qca-ossl: Diffie-Hellman key exchange and Blowfish ECB/CBC
support')
+license=('GPL2' 'FDL')
+install=${pkgname}.install
+source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz";
+ 'use-qdbus-qt4.patch')
+sha1sums=('3955a43758750b63d84299a9d9a5933b73e5492b'
+ 'a21aed6079de7693e67abe13798807920de01f6a')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/use-qdbus-qt4.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ # Remove a bunch of symlinks pointing to non-existant files
+ for _lang in pt_BR uk sv et de en nl; do
+ rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common
+ done
+}
Deleted: extra-i686/konversation.install
===================================================================
--- extra-i686/konversation.install 2014-04-25 12:16:23 UTC (rev 211743)
+++ extra-i686/konversation.install 2014-04-25 12:16:34 UTC (rev 211744)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: konversation/repos/extra-i686/konversation.install (from rev 211743,
konversation/trunk/konversation.install)
===================================================================
--- extra-i686/konversation.install (rev 0)
+++ extra-i686/konversation.install 2014-04-25 12:16:34 UTC (rev 211744)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: konversation/repos/extra-i686/use-qdbus-qt4.patch (from rev 211743,
konversation/trunk/use-qdbus-qt4.patch)
===================================================================
--- extra-i686/use-qdbus-qt4.patch (rev 0)
+++ extra-i686/use-qdbus-qt4.patch 2014-04-25 12:16:34 UTC (rev 211744)
@@ -0,0 +1,174 @@
+--- konversation-1.5/data/scripts/sayclip~ 2014-04-24 14:41:03.332179998
+0000
++++ konversation-1.5/data/scripts/sayclip 2014-04-24 14:41:24.752057066
+0000
+@@ -35,7 +35,7 @@
+ sys.exit("This script is intended to be run from within Konversation.")
+
+ try:
+- clipboard = subprocess.check_output(('qdbus', 'org.kde.klipper',
'/klipper', 'getClipboardContents'))
++ clipboard = subprocess.check_output(('qdbus-qt4', 'org.kde.klipper',
'/klipper', 'getClipboardContents'))
+ except subprocess.CalledProcessError:
+ konversation.dbus.error(i18n("Unable to retrieve clipboard contents from
Klipper."), exit=True)
+
+--- konversation-1.5/data/scripts/uptime~ 2014-04-24 14:41:33.182008693
+0000
++++ konversation-1.5/data/scripts/uptime 2014-04-24 14:42:06.111819793
+0000
+@@ -19,7 +19,7 @@
+ } else {
+ $UPTIME = `cat /proc/uptime`;
+ if (not $UPTIME) {
+- exec 'qdbus', 'org.kde.konversation', '/irc', 'info', 'Could
not read uptime. Check that /proc/uptime exists.';
++ exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'info',
'Could not read uptime. Check that /proc/uptime exists.';
+ }
+ @uparray = split(/\./, $UPTIME);
+ $seconds = $uparray[0];
+@@ -40,15 +40,15 @@
+ $minutes = int($seconds/60);
+ }
+ if( $days && $hours ) {
+- exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
"Uptime: $days days, $hours hours and $minutes minutes";
++ exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'say', $SERVER,
$TARGET, "Uptime: $days days, $hours hours and $minutes minutes";
+ }
+ elsif( !$days && $hours ) {
+- exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
"Uptime: $hours hours and $minutes minutes";
++ exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'say', $SERVER,
$TARGET, "Uptime: $hours hours and $minutes minutes";
+ }
+ elsif( $days && !$hours ) {
+- exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
"Uptime: $days days and $minutes minutes";
++ exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'say', $SERVER,
$TARGET, "Uptime: $days days and $minutes minutes";
+ }
+ elsif( !$days && !$hours ) {
+- exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
"Uptime: $minutes minutes";
++ exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'say', $SERVER,
$TARGET, "Uptime: $minutes minutes";
+ }
+
+--- konversation-1.5/data/scripts/mail~ 2014-04-24 14:42:12.458450062
+0000
++++ konversation-1.5/data/scripts/mail 2014-04-24 14:43:15.954752752 +0000
+@@ -18,18 +18,18 @@
+ getmails()
+ {
+
+- qdbus org.kde.kmail > /dev/null || {
+- qdbus org.kde.konversation /irc info "Sorry kmail is not running"
++ qdbus-qt4 org.kde.kmail > /dev/null || {
++ qdbus-qt4 org.kde.konversation /irc info "Sorry kmail is not running"
+ exit
+ }
+
+- for f in $(qdbus org.kde.kmail /KMail folderList) ; do
+- qdbus org.kde.kmail /KMail getFolder $f > /dev/null
+- MAILFOLDER=$(qdbus org.kde.kmail /Folder "displayPath" | grep -i $FOLDER)
++ for f in $(qdbus-qt4 org.kde.kmail /KMail folderList) ; do
++ qdbus-qt4 org.kde.kmail /KMail getFolder $f > /dev/null
++ MAILFOLDER=$(qdbus-qt4 org.kde.kmail /Folder "displayPath" | grep -i
$FOLDER)
+ if [ "$MAILFOLDER" != "" ] ; then
+ FOUNDFOLDER=1
+- MAILCOUNT=$(qdbus org.kde.kmail /Folder unreadMessages )
+- MAILTOTALCOUNT=$(qdbus org.kde.kmail /Folder messages )
++ MAILCOUNT=$(qdbus-qt4 org.kde.kmail /Folder unreadMessages )
++ MAILTOTALCOUNT=$(qdbus-qt4 org.kde.kmail /Folder messages )
+ MAILTOTALCOUNT=$(($MAILCOUNT + $MAILTOTALCOUNT))
+ if [[ -z "$MAILCOUNT" ]] ; then MAILCOUNT = "0" ; fi
+ if [ "$MAILCOUNT" != 0 ] ; then
+@@ -41,7 +41,7 @@
+
+ if [[ -z "$FOUNDEMAIL" ]] ; then
+ if [[ -z "$FOUNDFOLDER" ]] ; then
+- qdbus org.kde.konversation /irc info "No email folders were found that
had a name containing '$FOLDER'"
++ qdbus-qt4 org.kde.konversation /irc info "No email folders were found
that had a name containing '$FOLDER'"
+ exit
+ else
+ echo "No new emails in any folders matching '$FOLDER'"
+@@ -66,5 +66,5 @@
+ # exit
+ #fi
+
+-getmails | head -n 3 | while read line; do qdbus org.kde.konversation /irc
say $SERVER "$TARGET" "$line"; done
++getmails | head -n 3 | while read line; do qdbus-qt4 org.kde.konversation
/irc say $SERVER "$TARGET" "$line"; done
+
+--- konversation-1.5/data/scripts/media~ 2014-04-24 14:43:22.754713792
+0000
++++ konversation-1.5/data/scripts/media 2014-04-24 14:43:30.764667903
+0000
+@@ -76,7 +76,7 @@
+ # 'qdbus' command installed by Qt. If you need to you can change this here,
+ # but beware that the output format of the alternate command has to match that
+ # of 'qdbus'.
+-dbus_command = 'qdbus'
++dbus_command = 'qdbus-qt4'
+
+ # If one of the title, album or artist metadata fields contains a character
+ # listed in FIXUP_CHARS, or if a string matching the regular expression given
+--- konversation-1.5/data/scripts/fortune~ 2014-04-24 14:43:37.497962666
+0000
++++ konversation-1.5/data/scripts/fortune 2014-04-24 14:43:45.934581009
+0000
+@@ -49,4 +49,4 @@
+ }
+ }
+ close(FORTUNES);
+-exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
$MESSAGE;
++exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
$MESSAGE;
+--- konversation-1.5/data/scripts/tinyurl~ 2014-04-24 14:43:50.867886087
+0000
++++ konversation-1.5/data/scripts/tinyurl 2014-04-24 14:44:22.844369658
+0000
+@@ -15,16 +15,16 @@
+ else
+ TINYURL="$(wget -T10 -t2 -qO-
http://tinyurl.com/api-create.php?url=$URL|tail -1)"
+ fi
+-else qdbus org.kde.konversation /irc error "No url given: usage is \"/tinyurl
URL [NickName]\""
++else qdbus-qt4 org.kde.konversation /irc error "No url given: usage is
\"/tinyurl URL [NickName]\""
+ exit 1
+ fi
+
+ if test -z $TINYURL; then
+- qdbus org.kde.konversation /irc error "Unable run tinyurl script, please
make sure you have curl or wget installed"
++ qdbus-qt4 org.kde.konversation /irc error "Unable run tinyurl script,
please make sure you have curl or wget installed"
+ else
+ if test ! -z $NICK; then
+- qdbus org.kde.konversation /irc say $SERVER "$TARGET" "${NICK}:
$TINYURL"
++ qdbus-qt4 org.kde.konversation /irc say $SERVER "$TARGET" "${NICK}:
$TINYURL"
+ else
+- qdbus org.kde.konversation /irc say $SERVER "$TARGET" "$TINYURL"
++ qdbus-qt4 org.kde.konversation /irc say $SERVER "$TARGET" "$TINYURL"
+ fi
+ fi
+--- konversation-1.5/data/scripts/gauge~ 2014-04-24 14:44:32.460981276
+0000
++++ konversation-1.5/data/scripts/gauge 2014-04-24 14:45:00.634153375
+0000
+@@ -10,23 +10,23 @@
+
+ if [ ! $TARGET ]
+ then
+- qdbus org.kde.konversation /irc error "Can't write into status view."
++ qdbus-qt4 org.kde.konversation /irc error "Can't write into status view."
+ else
+ if [ ! $PERCENTAGE ]
+ then
+- qdbus org.kde.konversation /irc error "USAGE: $0 <percentage>"
++ qdbus-qt4 org.kde.konversation /irc error "USAGE: $0 <percentage>"
+ else
+ PERCENTAGE=`echo $PERCENTAGE | sed 's/^0\+//'`
+ LEFT=$(($PERCENTAGE/5))
+ RIGHT=$((20-$LEFT))
+
+ if [[ $PERCENTAGE -lt 0 ]]; then
+- qdbus org.kde.konversation /irc error "Percentage has to be bigger than
0"
++ qdbus-qt4 org.kde.konversation /irc error "Percentage has to be bigger
than 0"
+ exit
+ fi
+
+ if [[ $PERCENTAGE -gt 100 ]]; then
+- qdbus org.kde.konversation /irc error "Percentage has to be smaller
than 100"
++ qdbus-qt4 org.kde.konversation /irc error "Percentage has to be smaller
than 100"
+ exit
+ fi
+
+@@ -64,6 +64,6 @@
+ OUTPUT="$OUTPUT *ding*"
+ fi
+
+- qdbus org.kde.konversation /irc say $SERVER "$TARGET" "Beer load $OUTPUT"
++ qdbus-qt4 org.kde.konversation /irc say $SERVER "$TARGET" "Beer load
$OUTPUT"
+ fi
+ fi
+--- konversation-1.5/data/scripting_support/python/konversation/dbus.py~
2014-04-24 14:48:10.343069193 +0000
++++ konversation-1.5/data/scripting_support/python/konversation/dbus.py
2014-04-24 14:45:29.863986156 +0000
+@@ -98,4 +98,4 @@
+
+ default_message_prefix = ''
+
+-_dbus_command = ('qdbus', 'org.kde.konversation', '/irc')
++_dbus_command = ('qdbus-qt4', 'org.kde.konversation', '/irc')
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-04-25 12:16:23 UTC (rev 211743)
+++ extra-x86_64/PKGBUILD 2014-04-25 12:16:34 UTC (rev 211744)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <[email protected]>
-# Contributor: Stéphane Gaudreault <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-# Contributor: James Rayner <[email protected]>
-# Contributor: Sergio Jovani Guzman <[email protected]>
-
-pkgname=konversation
-pkgver=1.5
-pkgrel=1
-pkgdesc="A user friendly IRC client for KDE"
-arch=('i686' 'x86_64')
-url="http://konversation.kde.org";
-depends=('kdebase-runtime' 'kdepimlibs')
-makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml' 'optipng')
-optdepends=('python: python scripting support'
- 'kdebase-konsole: open a terminal in konversation'
- 'qca-ossl: Diffie-Hellman key exchange and Blowfish ECB/CBC
support')
-license=('GPL2' 'FDL')
-install=${pkgname}.install
-options=('!makeflags')
-source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz";)
-sha1sums=('3955a43758750b63d84299a9d9a5933b73e5492b')
-
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # Remove a bunch of symlinks pointing to non-existant files
- for _lang in pt_BR uk sv et de en nl; do
- rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common
- done
-}
Copied: konversation/repos/extra-x86_64/PKGBUILD (from rev 211743,
konversation/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-04-25 12:16:34 UTC (rev 211744)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Tom Gundersen <[email protected]>
+# Contributor: Stéphane Gaudreault <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: James Rayner <[email protected]>
+# Contributor: Sergio Jovani Guzman <[email protected]>
+
+pkgname=konversation
+pkgver=1.5
+pkgrel=2
+pkgdesc="A user friendly IRC client for KDE"
+arch=('i686' 'x86_64')
+url="http://konversation.kde.org";
+depends=('kdebase-runtime' 'kdepimlibs')
+makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml' 'optipng')
+optdepends=('python: python scripting support'
+ 'kdebase-konsole: open a terminal in konversation'
+ 'qca-ossl: Diffie-Hellman key exchange and Blowfish ECB/CBC
support')
+license=('GPL2' 'FDL')
+install=${pkgname}.install
+source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz";
+ 'use-qdbus-qt4.patch')
+sha1sums=('3955a43758750b63d84299a9d9a5933b73e5492b'
+ 'a21aed6079de7693e67abe13798807920de01f6a')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/use-qdbus-qt4.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ # Remove a bunch of symlinks pointing to non-existant files
+ for _lang in pt_BR uk sv et de en nl; do
+ rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common
+ done
+}
Deleted: extra-x86_64/konversation.install
===================================================================
--- extra-x86_64/konversation.install 2014-04-25 12:16:23 UTC (rev 211743)
+++ extra-x86_64/konversation.install 2014-04-25 12:16:34 UTC (rev 211744)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: konversation/repos/extra-x86_64/konversation.install (from rev 211743,
konversation/trunk/konversation.install)
===================================================================
--- extra-x86_64/konversation.install (rev 0)
+++ extra-x86_64/konversation.install 2014-04-25 12:16:34 UTC (rev 211744)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: konversation/repos/extra-x86_64/use-qdbus-qt4.patch (from rev 211743,
konversation/trunk/use-qdbus-qt4.patch)
===================================================================
--- extra-x86_64/use-qdbus-qt4.patch (rev 0)
+++ extra-x86_64/use-qdbus-qt4.patch 2014-04-25 12:16:34 UTC (rev 211744)
@@ -0,0 +1,174 @@
+--- konversation-1.5/data/scripts/sayclip~ 2014-04-24 14:41:03.332179998
+0000
++++ konversation-1.5/data/scripts/sayclip 2014-04-24 14:41:24.752057066
+0000
+@@ -35,7 +35,7 @@
+ sys.exit("This script is intended to be run from within Konversation.")
+
+ try:
+- clipboard = subprocess.check_output(('qdbus', 'org.kde.klipper',
'/klipper', 'getClipboardContents'))
++ clipboard = subprocess.check_output(('qdbus-qt4', 'org.kde.klipper',
'/klipper', 'getClipboardContents'))
+ except subprocess.CalledProcessError:
+ konversation.dbus.error(i18n("Unable to retrieve clipboard contents from
Klipper."), exit=True)
+
+--- konversation-1.5/data/scripts/uptime~ 2014-04-24 14:41:33.182008693
+0000
++++ konversation-1.5/data/scripts/uptime 2014-04-24 14:42:06.111819793
+0000
+@@ -19,7 +19,7 @@
+ } else {
+ $UPTIME = `cat /proc/uptime`;
+ if (not $UPTIME) {
+- exec 'qdbus', 'org.kde.konversation', '/irc', 'info', 'Could
not read uptime. Check that /proc/uptime exists.';
++ exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'info',
'Could not read uptime. Check that /proc/uptime exists.';
+ }
+ @uparray = split(/\./, $UPTIME);
+ $seconds = $uparray[0];
+@@ -40,15 +40,15 @@
+ $minutes = int($seconds/60);
+ }
+ if( $days && $hours ) {
+- exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
"Uptime: $days days, $hours hours and $minutes minutes";
++ exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'say', $SERVER,
$TARGET, "Uptime: $days days, $hours hours and $minutes minutes";
+ }
+ elsif( !$days && $hours ) {
+- exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
"Uptime: $hours hours and $minutes minutes";
++ exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'say', $SERVER,
$TARGET, "Uptime: $hours hours and $minutes minutes";
+ }
+ elsif( $days && !$hours ) {
+- exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
"Uptime: $days days and $minutes minutes";
++ exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'say', $SERVER,
$TARGET, "Uptime: $days days and $minutes minutes";
+ }
+ elsif( !$days && !$hours ) {
+- exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
"Uptime: $minutes minutes";
++ exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'say', $SERVER,
$TARGET, "Uptime: $minutes minutes";
+ }
+
+--- konversation-1.5/data/scripts/mail~ 2014-04-24 14:42:12.458450062
+0000
++++ konversation-1.5/data/scripts/mail 2014-04-24 14:43:15.954752752 +0000
+@@ -18,18 +18,18 @@
+ getmails()
+ {
+
+- qdbus org.kde.kmail > /dev/null || {
+- qdbus org.kde.konversation /irc info "Sorry kmail is not running"
++ qdbus-qt4 org.kde.kmail > /dev/null || {
++ qdbus-qt4 org.kde.konversation /irc info "Sorry kmail is not running"
+ exit
+ }
+
+- for f in $(qdbus org.kde.kmail /KMail folderList) ; do
+- qdbus org.kde.kmail /KMail getFolder $f > /dev/null
+- MAILFOLDER=$(qdbus org.kde.kmail /Folder "displayPath" | grep -i $FOLDER)
++ for f in $(qdbus-qt4 org.kde.kmail /KMail folderList) ; do
++ qdbus-qt4 org.kde.kmail /KMail getFolder $f > /dev/null
++ MAILFOLDER=$(qdbus-qt4 org.kde.kmail /Folder "displayPath" | grep -i
$FOLDER)
+ if [ "$MAILFOLDER" != "" ] ; then
+ FOUNDFOLDER=1
+- MAILCOUNT=$(qdbus org.kde.kmail /Folder unreadMessages )
+- MAILTOTALCOUNT=$(qdbus org.kde.kmail /Folder messages )
++ MAILCOUNT=$(qdbus-qt4 org.kde.kmail /Folder unreadMessages )
++ MAILTOTALCOUNT=$(qdbus-qt4 org.kde.kmail /Folder messages )
+ MAILTOTALCOUNT=$(($MAILCOUNT + $MAILTOTALCOUNT))
+ if [[ -z "$MAILCOUNT" ]] ; then MAILCOUNT = "0" ; fi
+ if [ "$MAILCOUNT" != 0 ] ; then
+@@ -41,7 +41,7 @@
+
+ if [[ -z "$FOUNDEMAIL" ]] ; then
+ if [[ -z "$FOUNDFOLDER" ]] ; then
+- qdbus org.kde.konversation /irc info "No email folders were found that
had a name containing '$FOLDER'"
++ qdbus-qt4 org.kde.konversation /irc info "No email folders were found
that had a name containing '$FOLDER'"
+ exit
+ else
+ echo "No new emails in any folders matching '$FOLDER'"
+@@ -66,5 +66,5 @@
+ # exit
+ #fi
+
+-getmails | head -n 3 | while read line; do qdbus org.kde.konversation /irc
say $SERVER "$TARGET" "$line"; done
++getmails | head -n 3 | while read line; do qdbus-qt4 org.kde.konversation
/irc say $SERVER "$TARGET" "$line"; done
+
+--- konversation-1.5/data/scripts/media~ 2014-04-24 14:43:22.754713792
+0000
++++ konversation-1.5/data/scripts/media 2014-04-24 14:43:30.764667903
+0000
+@@ -76,7 +76,7 @@
+ # 'qdbus' command installed by Qt. If you need to you can change this here,
+ # but beware that the output format of the alternate command has to match that
+ # of 'qdbus'.
+-dbus_command = 'qdbus'
++dbus_command = 'qdbus-qt4'
+
+ # If one of the title, album or artist metadata fields contains a character
+ # listed in FIXUP_CHARS, or if a string matching the regular expression given
+--- konversation-1.5/data/scripts/fortune~ 2014-04-24 14:43:37.497962666
+0000
++++ konversation-1.5/data/scripts/fortune 2014-04-24 14:43:45.934581009
+0000
+@@ -49,4 +49,4 @@
+ }
+ }
+ close(FORTUNES);
+-exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
$MESSAGE;
++exec 'qdbus-qt4', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET,
$MESSAGE;
+--- konversation-1.5/data/scripts/tinyurl~ 2014-04-24 14:43:50.867886087
+0000
++++ konversation-1.5/data/scripts/tinyurl 2014-04-24 14:44:22.844369658
+0000
+@@ -15,16 +15,16 @@
+ else
+ TINYURL="$(wget -T10 -t2 -qO-
http://tinyurl.com/api-create.php?url=$URL|tail -1)"
+ fi
+-else qdbus org.kde.konversation /irc error "No url given: usage is \"/tinyurl
URL [NickName]\""
++else qdbus-qt4 org.kde.konversation /irc error "No url given: usage is
\"/tinyurl URL [NickName]\""
+ exit 1
+ fi
+
+ if test -z $TINYURL; then
+- qdbus org.kde.konversation /irc error "Unable run tinyurl script, please
make sure you have curl or wget installed"
++ qdbus-qt4 org.kde.konversation /irc error "Unable run tinyurl script,
please make sure you have curl or wget installed"
+ else
+ if test ! -z $NICK; then
+- qdbus org.kde.konversation /irc say $SERVER "$TARGET" "${NICK}:
$TINYURL"
++ qdbus-qt4 org.kde.konversation /irc say $SERVER "$TARGET" "${NICK}:
$TINYURL"
+ else
+- qdbus org.kde.konversation /irc say $SERVER "$TARGET" "$TINYURL"
++ qdbus-qt4 org.kde.konversation /irc say $SERVER "$TARGET" "$TINYURL"
+ fi
+ fi
+--- konversation-1.5/data/scripts/gauge~ 2014-04-24 14:44:32.460981276
+0000
++++ konversation-1.5/data/scripts/gauge 2014-04-24 14:45:00.634153375
+0000
+@@ -10,23 +10,23 @@
+
+ if [ ! $TARGET ]
+ then
+- qdbus org.kde.konversation /irc error "Can't write into status view."
++ qdbus-qt4 org.kde.konversation /irc error "Can't write into status view."
+ else
+ if [ ! $PERCENTAGE ]
+ then
+- qdbus org.kde.konversation /irc error "USAGE: $0 <percentage>"
++ qdbus-qt4 org.kde.konversation /irc error "USAGE: $0 <percentage>"
+ else
+ PERCENTAGE=`echo $PERCENTAGE | sed 's/^0\+//'`
+ LEFT=$(($PERCENTAGE/5))
+ RIGHT=$((20-$LEFT))
+
+ if [[ $PERCENTAGE -lt 0 ]]; then
+- qdbus org.kde.konversation /irc error "Percentage has to be bigger than
0"
++ qdbus-qt4 org.kde.konversation /irc error "Percentage has to be bigger
than 0"
+ exit
+ fi
+
+ if [[ $PERCENTAGE -gt 100 ]]; then
+- qdbus org.kde.konversation /irc error "Percentage has to be smaller
than 100"
++ qdbus-qt4 org.kde.konversation /irc error "Percentage has to be smaller
than 100"
+ exit
+ fi
+
+@@ -64,6 +64,6 @@
+ OUTPUT="$OUTPUT *ding*"
+ fi
+
+- qdbus org.kde.konversation /irc say $SERVER "$TARGET" "Beer load $OUTPUT"
++ qdbus-qt4 org.kde.konversation /irc say $SERVER "$TARGET" "Beer load
$OUTPUT"
+ fi
+ fi
+--- konversation-1.5/data/scripting_support/python/konversation/dbus.py~
2014-04-24 14:48:10.343069193 +0000
++++ konversation-1.5/data/scripting_support/python/konversation/dbus.py
2014-04-24 14:45:29.863986156 +0000
+@@ -98,4 +98,4 @@
+
+ default_message_prefix = ''
+
+-_dbus_command = ('qdbus', 'org.kde.konversation', '/irc')
++_dbus_command = ('qdbus-qt4', 'org.kde.konversation', '/irc')
