Date: Wednesday, April 8, 2015 @ 08:31:08 Author: arojas Revision: 235605
archrelease: copy trunk to extra-i686, extra-x86_64 Added: konversation/kde-unstable/ konversation/repos/extra-i686/PKGBUILD (from rev 235604, konversation/trunk/PKGBUILD) konversation/repos/extra-i686/konversation.install (from rev 235604, konversation/trunk/konversation.install) konversation/repos/extra-x86_64/PKGBUILD (from rev 235604, konversation/trunk/PKGBUILD) konversation/repos/extra-x86_64/konversation.install (from rev 235604, konversation/trunk/konversation.install) Modified: konversation/kde-unstable/PKGBUILD Deleted: konversation/repos/extra-i686/PKGBUILD konversation/repos/extra-i686/konversation.install konversation/repos/extra-i686/use-qdbus-qt4.patch konversation/repos/extra-x86_64/PKGBUILD konversation/repos/extra-x86_64/konversation.install konversation/repos/extra-x86_64/use-qdbus-qt4.patch -----------------------------------------+ /extra-i686/PKGBUILD | 39 ++++++ /extra-i686/konversation.install | 12 ++ /extra-x86_64/PKGBUILD | 39 ++++++ /extra-x86_64/konversation.install | 12 ++ kde-unstable/PKGBUILD | 2 repos/extra-i686/PKGBUILD | 50 -------- repos/extra-i686/konversation.install | 12 -- repos/extra-i686/use-qdbus-qt4.patch | 174 ------------------------------ repos/extra-x86_64/PKGBUILD | 50 -------- repos/extra-x86_64/konversation.install | 12 -- repos/extra-x86_64/use-qdbus-qt4.patch | 174 ------------------------------ 11 files changed, 103 insertions(+), 473 deletions(-) Modified: kde-unstable/PKGBUILD =================================================================== --- kde-unstable/PKGBUILD 2015-03-16 22:23:28 UTC (rev 233960) +++ kde-unstable/PKGBUILD 2015-04-08 06:31:08 UTC (rev 235605) @@ -14,7 +14,7 @@ url="http://konversation.kde.org" depends=('knotifyconfig' 'kemoticons' 'kparts' 'kidletime' 'qca-qt5' 'hicolor-icon-theme') optdepends=('python: python scripting support') -makedepends=('git' 'extra-cmake-modules' 'kdoctools' 'python') +makedepends=('extra-cmake-modules' 'kdoctools' 'python') license=('GPL2' 'FDL') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgname}/${_pkgver}/src/${pkgname}-${_pkgver}.tar.xz" 'qca-qt5.patch') Deleted: repos/extra-i686/PKGBUILD =================================================================== --- repos/extra-i686/PKGBUILD 2015-04-08 06:28:48 UTC (rev 235604) +++ repos/extra-i686/PKGBUILD 2015-04-08 06:31:08 UTC (rev 235605) @@ -1,50 +0,0 @@ -# $Id$ -# Maintainer: Tom Gundersen <t...@jklm.no> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: James Rayner <iphi...@gmail.com> -# Contributor: Sergio Jovani Guzman <mo...@paretux.org> - -pkgname=konversation -pkgver=1.5.1 -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 -source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'use-qdbus-qt4.patch') -sha1sums=('1b69db93d2c0a38b631dd92065fa6e7490ffbfbe' - '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 it fr es ca; do - rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common - done -} Copied: konversation/repos/extra-i686/PKGBUILD (from rev 235604, konversation/trunk/PKGBUILD) =================================================================== --- repos/extra-i686/PKGBUILD (rev 0) +++ repos/extra-i686/PKGBUILD 2015-04-08 06:31:08 UTC (rev 235605) @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 225717 2014-11-07 02:03:06Z foutrelis $ +# Maintainer: Tom Gundersen <t...@jklm.no> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: James Rayner <iphi...@gmail.com> +# Contributor: Sergio Jovani Guzman <mo...@paretux.org> + +pkgname=konversation +pkgver=1.6 +pkgrel=1 +pkgdesc="A user friendly IRC client for KDE" +arch=('i686' 'x86_64') +url="http://konversation.kde.org" +depends=('knotifyconfig' 'kemoticons' 'kparts' 'kidletime' 'qca-qt5' 'hicolor-icon-theme') +optdepends=('python: python scripting support') +makedepends=('git' 'extra-cmake-modules' 'kdoctools' 'python') +license=('GPL2' 'FDL') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('16e8c1969b04c0946b48a436e8825654b0029bb9') + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} Deleted: repos/extra-i686/konversation.install =================================================================== --- repos/extra-i686/konversation.install 2015-04-08 06:28:48 UTC (rev 235604) +++ repos/extra-i686/konversation.install 2015-04-08 06:31:08 UTC (rev 235605) @@ -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 235604, konversation/trunk/konversation.install) =================================================================== --- repos/extra-i686/konversation.install (rev 0) +++ repos/extra-i686/konversation.install 2015-04-08 06:31:08 UTC (rev 235605) @@ -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 +} Deleted: repos/extra-i686/use-qdbus-qt4.patch =================================================================== --- repos/extra-i686/use-qdbus-qt4.patch 2015-04-08 06:28:48 UTC (rev 235604) +++ repos/extra-i686/use-qdbus-qt4.patch 2015-04-08 06:31:08 UTC (rev 235605) @@ -1,174 +0,0 @@ ---- 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: repos/extra-x86_64/PKGBUILD =================================================================== --- repos/extra-x86_64/PKGBUILD 2015-04-08 06:28:48 UTC (rev 235604) +++ repos/extra-x86_64/PKGBUILD 2015-04-08 06:31:08 UTC (rev 235605) @@ -1,50 +0,0 @@ -# $Id$ -# Maintainer: Tom Gundersen <t...@jklm.no> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: James Rayner <iphi...@gmail.com> -# Contributor: Sergio Jovani Guzman <mo...@paretux.org> - -pkgname=konversation -pkgver=1.5.1 -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 -source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'use-qdbus-qt4.patch') -sha1sums=('1b69db93d2c0a38b631dd92065fa6e7490ffbfbe' - '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 it fr es ca; do - rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common - done -} Copied: konversation/repos/extra-x86_64/PKGBUILD (from rev 235604, konversation/trunk/PKGBUILD) =================================================================== --- repos/extra-x86_64/PKGBUILD (rev 0) +++ repos/extra-x86_64/PKGBUILD 2015-04-08 06:31:08 UTC (rev 235605) @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 225717 2014-11-07 02:03:06Z foutrelis $ +# Maintainer: Tom Gundersen <t...@jklm.no> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: James Rayner <iphi...@gmail.com> +# Contributor: Sergio Jovani Guzman <mo...@paretux.org> + +pkgname=konversation +pkgver=1.6 +pkgrel=1 +pkgdesc="A user friendly IRC client for KDE" +arch=('i686' 'x86_64') +url="http://konversation.kde.org" +depends=('knotifyconfig' 'kemoticons' 'kparts' 'kidletime' 'qca-qt5' 'hicolor-icon-theme') +optdepends=('python: python scripting support') +makedepends=('git' 'extra-cmake-modules' 'kdoctools' 'python') +license=('GPL2' 'FDL') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('16e8c1969b04c0946b48a436e8825654b0029bb9') + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} Deleted: repos/extra-x86_64/konversation.install =================================================================== --- repos/extra-x86_64/konversation.install 2015-04-08 06:28:48 UTC (rev 235604) +++ repos/extra-x86_64/konversation.install 2015-04-08 06:31:08 UTC (rev 235605) @@ -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 235604, konversation/trunk/konversation.install) =================================================================== --- repos/extra-x86_64/konversation.install (rev 0) +++ repos/extra-x86_64/konversation.install 2015-04-08 06:31:08 UTC (rev 235605) @@ -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 +} Deleted: repos/extra-x86_64/use-qdbus-qt4.patch =================================================================== --- repos/extra-x86_64/use-qdbus-qt4.patch 2015-04-08 06:28:48 UTC (rev 235604) +++ repos/extra-x86_64/use-qdbus-qt4.patch 2015-04-08 06:31:08 UTC (rev 235605) @@ -1,174 +0,0 @@ ---- 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')