Date: Friday, March 10, 2017 @ 02:57:44 Author: foutrelis Revision: 290451
archrelease: copy trunk to extra-i686, extra-x86_64 Added: pidgin/repos/extra-i686/PKGBUILD (from rev 290450, pidgin/trunk/PKGBUILD) pidgin/repos/extra-i686/pidgin-py3-fixes.patch (from rev 290450, pidgin/trunk/pidgin-py3-fixes.patch) pidgin/repos/extra-x86_64/PKGBUILD (from rev 290450, pidgin/trunk/PKGBUILD) pidgin/repos/extra-x86_64/pidgin-py3-fixes.patch (from rev 290450, pidgin/trunk/pidgin-py3-fixes.patch) Deleted: pidgin/repos/extra-i686/PKGBUILD pidgin/repos/extra-i686/pidgin-py3-fixes.patch pidgin/repos/extra-x86_64/PKGBUILD pidgin/repos/extra-x86_64/pidgin-py3-fixes.patch -------------------------------------+ /PKGBUILD | 196 ++++++++++++++++++++++++++++++++++ /pidgin-py3-fixes.patch | 138 +++++++++++++++++++++++ extra-i686/PKGBUILD | 98 ----------------- extra-i686/pidgin-py3-fixes.patch | 81 -------------- extra-x86_64/PKGBUILD | 98 ----------------- extra-x86_64/pidgin-py3-fixes.patch | 81 -------------- 6 files changed, 334 insertions(+), 358 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-03-10 02:57:28 UTC (rev 290450) +++ extra-i686/PKGBUILD 2017-03-10 02:57:44 UTC (rev 290451) @@ -1,98 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> -# Contributor: Ionut Biru <ib...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> - -pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.11.0 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://pidgin.im/" -license=('GPL') -makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'libidn' 'libgadu' 'python' 'hicolor-icon-theme' 'farstream' - 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') -source=(https://downloads.sourceforge.net/project/$pkgname/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc} - pidgin-py3-fixes.patch) -sha256sums=('f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333' - 'SKIP' - 'e38bd61e0dcfcc2e5761078ea709b92c5bf8d025d5eb1288aa8a550715babb7e') -validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') - -prepare() { - cd $pkgbase-$pkgver - patch -Np1 -i ../pidgin-py3-fixes.patch -} - -build() { - cd $pkgbase-$pkgver - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-schemas-install \ - --disable-meanwhile \ - --disable-gnutls \ - --enable-cyrus-sasl \ - --disable-doxygen \ - --enable-nm \ - --with-system-ssl-certs=/etc/ssl/certs - make -} - -package_pidgin(){ - pkgdesc="Multi-protocol instant messaging client" - depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' - 'gst-plugins-base' 'gst-plugins-good' 'hicolor-icon-theme') - optdepends=('aspell: for spelling correction') - - cd $pkgbase-$pkgver - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C pidgin DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - rm "$pkgdir/usr/share/man/man1/finch.1" -} - -package_libpurple(){ - pkgdesc="IM library extracted from Pidgin" - depends=('farstream' 'libsasl' 'libidn' 'libgadu' 'dbus-glib' 'nss') - optdepends=('avahi: Bonjour protocol support' - 'ca-certificates: SSL CA certificates' - 'python-dbus: for purple-remote and purple-url-handler' - 'tk: Tcl/Tk scripting support') - - cd $pkgbase-$pkgver - - for _dir in libpurple share/sounds share/ca-certs m4macros po; do - make -C "$_dir" DESTDIR="$pkgdir" install - done -} - -package_finch(){ - pkgdesc="A ncurses-based messaging client" - depends=('libpurple' 'libx11' 'python') - - cd $pkgbase-$pkgver - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C finch DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - rm "$pkgdir"/usr/share/man/man1/pidgin.1 -} - -# vim:set ts=2 sw=2 et: Copied: pidgin/repos/extra-i686/PKGBUILD (from rev 290450, pidgin/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-03-10 02:57:44 UTC (rev 290451) @@ -0,0 +1,98 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> + +pkgname=('pidgin' 'libpurple' 'finch') +pkgver=2.12.0 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://pidgin.im/" +license=('GPL') +makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' + 'libidn' 'libgadu' 'python' 'hicolor-icon-theme' 'farstream' + 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') +source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc} + pidgin-py3-fixes.patch) +sha256sums=('8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8' + 'SKIP' + '2ae003adc19c2012186a2efc68163843d2037bdaf7540347185bb872424e18da') +validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') + +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../pidgin-py3-fixes.patch +} + +build() { + cd $pkgbase-$pkgver + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-schemas-install \ + --disable-meanwhile \ + --disable-gnutls \ + --enable-cyrus-sasl \ + --disable-doxygen \ + --enable-nm \ + --with-system-ssl-certs=/etc/ssl/certs + make +} + +package_pidgin(){ + pkgdesc="Multi-protocol instant messaging client" + depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' + 'gst-plugins-base' 'gst-plugins-good' 'hicolor-icon-theme') + optdepends=('aspell: for spelling correction') + + cd $pkgbase-$pkgver + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C pidgin DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + rm "$pkgdir/usr/share/man/man1/finch.1" +} + +package_libpurple(){ + pkgdesc="IM library extracted from Pidgin" + depends=('farstream' 'libsasl' 'libidn' 'libgadu' 'dbus-glib' 'nss') + optdepends=('avahi: Bonjour protocol support' + 'ca-certificates: SSL CA certificates' + 'python-dbus: for purple-remote and purple-url-handler' + 'tk: Tcl/Tk scripting support') + + cd $pkgbase-$pkgver + + for _dir in libpurple share/sounds share/ca-certs m4macros po; do + make -C "$_dir" DESTDIR="$pkgdir" install + done +} + +package_finch(){ + pkgdesc="A ncurses-based messaging client" + depends=('libpurple' 'libx11' 'python') + + cd $pkgbase-$pkgver + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C finch DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + rm "$pkgdir"/usr/share/man/man1/pidgin.1 +} + +# vim:set ts=2 sw=2 et: Deleted: extra-i686/pidgin-py3-fixes.patch =================================================================== --- extra-i686/pidgin-py3-fixes.patch 2017-03-10 02:57:28 UTC (rev 290450) +++ extra-i686/pidgin-py3-fixes.patch 2017-03-10 02:57:44 UTC (rev 290451) @@ -1,81 +0,0 @@ -diff -uprb pidgin-2.10.12.orig/libpurple/purple-remote pidgin-2.10.12/libpurple/purple-remote ---- pidgin-2.10.12.orig/libpurple/purple-remote 2016-01-01 01:19:41.000000000 +0200 -+++ pidgin-2.10.12/libpurple/purple-remote 2016-01-02 06:23:14.082831498 +0200 -@@ -3,13 +3,20 @@ - import codecs - import dbus - import re --import urllib - import sys -+try: -+ from urllib.parse import unquote -+except ImportError: -+ from urllib import unquote - - import xml.dom.minidom - --sys.stdin = codecs.getwriter('utf-8')(sys.stdin); --sys.stdout = codecs.getwriter('utf-8')(sys.stdout); -+if sys.version_info[0] >= 3: -+ sys.stdin = codecs.getwriter('utf-8')(sys.stdin.buffer) -+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer) -+else: -+ sys.stdin = codecs.getwriter('utf-8')(sys.stdin) -+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout) - - xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName - -@@ -41,7 +48,7 @@ class CheckedAttribute: - return result - - def show_help(requested=False): -- print """This program uses D-Bus to communicate with purple. -+ print("""This program uses D-Bus to communicate with purple. - - Usage: - -@@ -72,7 +79,7 @@ Examples of commands: - - PurpleAccountsFindConnected?name=&protocol=prpl-jabber - PurpleAccountsFindConnected(,prpl-jabber) --""" % sys.argv[0] -+""" % sys.argv[0]) - if (requested): - sys.exit(0) - else: -@@ -120,7 +127,7 @@ def execute(uri): - if paramstring is not None: - for param in paramstring.split("&"): - key, value = extendlist(param.split("=",1), 2, "") -- params[key] = urllib.unquote(value) -+ params[key] = unquote(value) - - accountname = params.get("account", "") - -@@ -233,12 +240,11 @@ if len(sys.argv) == 1: - elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"): - show_help(True) - elif (obj == None): -- print "No existing libpurple instance detected." -+ print("No existing libpurple instance detected.") - sys.exit(1); - - for arg in sys.argv[1:]: - output = execute(arg) - - if (output != None): -- print output -- -+ print(output) -diff -uprb pidgin-2.10.12.orig/libpurple/purple-url-handler pidgin-2.10.12/libpurple/purple-url-handler ---- pidgin-2.10.12.orig/libpurple/purple-url-handler 2016-01-01 01:19:41.000000000 +0200 -+++ pidgin-2.10.12/libpurple/purple-url-handler 2016-01-02 05:39:43.084532314 +0200 -@@ -249,7 +249,7 @@ def msnim(uri): - - def myim(uri): - protocol = "prpl-myspace" -- print "TODO: send uri: ", uri -+ print("TODO: send uri: %s" % uri) - assert False, "Not implemented" - - def sip(uri): Copied: pidgin/repos/extra-i686/pidgin-py3-fixes.patch (from rev 290450, pidgin/trunk/pidgin-py3-fixes.patch) =================================================================== --- extra-i686/pidgin-py3-fixes.patch (rev 0) +++ extra-i686/pidgin-py3-fixes.patch 2017-03-10 02:57:44 UTC (rev 290451) @@ -0,0 +1,69 @@ +diff -uprb pidgin-2.10.12.orig/libpurple/purple-remote pidgin-2.10.12/libpurple/purple-remote +--- pidgin-2.10.12.orig/libpurple/purple-remote 2016-01-01 01:19:41.000000000 +0200 ++++ pidgin-2.10.12/libpurple/purple-remote 2016-01-02 06:23:14.082831498 +0200 +@@ -3,13 +3,20 @@ + import codecs + import dbus + import re +-import urllib + import sys ++try: ++ from urllib.parse import unquote ++except ImportError: ++ from urllib import unquote + + import xml.dom.minidom + +-sys.stdin = codecs.getwriter('utf-8')(sys.stdin); +-sys.stdout = codecs.getwriter('utf-8')(sys.stdout); ++if sys.version_info[0] >= 3: ++ sys.stdin = codecs.getwriter('utf-8')(sys.stdin.buffer) ++ sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer) ++else: ++ sys.stdin = codecs.getwriter('utf-8')(sys.stdin) ++ sys.stdout = codecs.getwriter('utf-8')(sys.stdout) + + xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName + +@@ -41,7 +48,7 @@ class CheckedAttribute: + return result + + def show_help(requested=False): +- print """This program uses D-Bus to communicate with purple. ++ print("""This program uses D-Bus to communicate with purple. + + Usage: + +@@ -72,7 +79,7 @@ Examples of commands: + + PurpleAccountsFindConnected?name=&protocol=prpl-jabber + PurpleAccountsFindConnected(,prpl-jabber) +-""" % sys.argv[0] ++""" % sys.argv[0]) + if (requested): + sys.exit(0) + else: +@@ -120,7 +127,7 @@ def execute(uri): + if paramstring is not None: + for param in paramstring.split("&"): + key, value = extendlist(param.split("=",1), 2, "") +- params[key] = urllib.unquote(value) ++ params[key] = unquote(value) + + accountname = params.get("account", "") + +@@ -233,12 +240,11 @@ if len(sys.argv) == 1: + elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"): + show_help(True) + elif (obj == None): +- print "No existing libpurple instance detected." ++ print("No existing libpurple instance detected.") + sys.exit(1); + + for arg in sys.argv[1:]: + output = execute(arg) + + if (output != None): +- print output +- ++ print(output) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-03-10 02:57:28 UTC (rev 290450) +++ extra-x86_64/PKGBUILD 2017-03-10 02:57:44 UTC (rev 290451) @@ -1,98 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> -# Contributor: Ionut Biru <ib...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> - -pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.11.0 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://pidgin.im/" -license=('GPL') -makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'libidn' 'libgadu' 'python' 'hicolor-icon-theme' 'farstream' - 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') -source=(https://downloads.sourceforge.net/project/$pkgname/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc} - pidgin-py3-fixes.patch) -sha256sums=('f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333' - 'SKIP' - 'e38bd61e0dcfcc2e5761078ea709b92c5bf8d025d5eb1288aa8a550715babb7e') -validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') - -prepare() { - cd $pkgbase-$pkgver - patch -Np1 -i ../pidgin-py3-fixes.patch -} - -build() { - cd $pkgbase-$pkgver - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-schemas-install \ - --disable-meanwhile \ - --disable-gnutls \ - --enable-cyrus-sasl \ - --disable-doxygen \ - --enable-nm \ - --with-system-ssl-certs=/etc/ssl/certs - make -} - -package_pidgin(){ - pkgdesc="Multi-protocol instant messaging client" - depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' - 'gst-plugins-base' 'gst-plugins-good' 'hicolor-icon-theme') - optdepends=('aspell: for spelling correction') - - cd $pkgbase-$pkgver - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C pidgin DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - rm "$pkgdir/usr/share/man/man1/finch.1" -} - -package_libpurple(){ - pkgdesc="IM library extracted from Pidgin" - depends=('farstream' 'libsasl' 'libidn' 'libgadu' 'dbus-glib' 'nss') - optdepends=('avahi: Bonjour protocol support' - 'ca-certificates: SSL CA certificates' - 'python-dbus: for purple-remote and purple-url-handler' - 'tk: Tcl/Tk scripting support') - - cd $pkgbase-$pkgver - - for _dir in libpurple share/sounds share/ca-certs m4macros po; do - make -C "$_dir" DESTDIR="$pkgdir" install - done -} - -package_finch(){ - pkgdesc="A ncurses-based messaging client" - depends=('libpurple' 'libx11' 'python') - - cd $pkgbase-$pkgver - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C finch DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - rm "$pkgdir"/usr/share/man/man1/pidgin.1 -} - -# vim:set ts=2 sw=2 et: Copied: pidgin/repos/extra-x86_64/PKGBUILD (from rev 290450, pidgin/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-03-10 02:57:44 UTC (rev 290451) @@ -0,0 +1,98 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> + +pkgname=('pidgin' 'libpurple' 'finch') +pkgver=2.12.0 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://pidgin.im/" +license=('GPL') +makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' + 'libidn' 'libgadu' 'python' 'hicolor-icon-theme' 'farstream' + 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') +source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc} + pidgin-py3-fixes.patch) +sha256sums=('8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8' + 'SKIP' + '2ae003adc19c2012186a2efc68163843d2037bdaf7540347185bb872424e18da') +validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') + +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../pidgin-py3-fixes.patch +} + +build() { + cd $pkgbase-$pkgver + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-schemas-install \ + --disable-meanwhile \ + --disable-gnutls \ + --enable-cyrus-sasl \ + --disable-doxygen \ + --enable-nm \ + --with-system-ssl-certs=/etc/ssl/certs + make +} + +package_pidgin(){ + pkgdesc="Multi-protocol instant messaging client" + depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' + 'gst-plugins-base' 'gst-plugins-good' 'hicolor-icon-theme') + optdepends=('aspell: for spelling correction') + + cd $pkgbase-$pkgver + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C pidgin DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + rm "$pkgdir/usr/share/man/man1/finch.1" +} + +package_libpurple(){ + pkgdesc="IM library extracted from Pidgin" + depends=('farstream' 'libsasl' 'libidn' 'libgadu' 'dbus-glib' 'nss') + optdepends=('avahi: Bonjour protocol support' + 'ca-certificates: SSL CA certificates' + 'python-dbus: for purple-remote and purple-url-handler' + 'tk: Tcl/Tk scripting support') + + cd $pkgbase-$pkgver + + for _dir in libpurple share/sounds share/ca-certs m4macros po; do + make -C "$_dir" DESTDIR="$pkgdir" install + done +} + +package_finch(){ + pkgdesc="A ncurses-based messaging client" + depends=('libpurple' 'libx11' 'python') + + cd $pkgbase-$pkgver + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C finch DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + rm "$pkgdir"/usr/share/man/man1/pidgin.1 +} + +# vim:set ts=2 sw=2 et: Deleted: extra-x86_64/pidgin-py3-fixes.patch =================================================================== --- extra-x86_64/pidgin-py3-fixes.patch 2017-03-10 02:57:28 UTC (rev 290450) +++ extra-x86_64/pidgin-py3-fixes.patch 2017-03-10 02:57:44 UTC (rev 290451) @@ -1,81 +0,0 @@ -diff -uprb pidgin-2.10.12.orig/libpurple/purple-remote pidgin-2.10.12/libpurple/purple-remote ---- pidgin-2.10.12.orig/libpurple/purple-remote 2016-01-01 01:19:41.000000000 +0200 -+++ pidgin-2.10.12/libpurple/purple-remote 2016-01-02 06:23:14.082831498 +0200 -@@ -3,13 +3,20 @@ - import codecs - import dbus - import re --import urllib - import sys -+try: -+ from urllib.parse import unquote -+except ImportError: -+ from urllib import unquote - - import xml.dom.minidom - --sys.stdin = codecs.getwriter('utf-8')(sys.stdin); --sys.stdout = codecs.getwriter('utf-8')(sys.stdout); -+if sys.version_info[0] >= 3: -+ sys.stdin = codecs.getwriter('utf-8')(sys.stdin.buffer) -+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer) -+else: -+ sys.stdin = codecs.getwriter('utf-8')(sys.stdin) -+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout) - - xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName - -@@ -41,7 +48,7 @@ class CheckedAttribute: - return result - - def show_help(requested=False): -- print """This program uses D-Bus to communicate with purple. -+ print("""This program uses D-Bus to communicate with purple. - - Usage: - -@@ -72,7 +79,7 @@ Examples of commands: - - PurpleAccountsFindConnected?name=&protocol=prpl-jabber - PurpleAccountsFindConnected(,prpl-jabber) --""" % sys.argv[0] -+""" % sys.argv[0]) - if (requested): - sys.exit(0) - else: -@@ -120,7 +127,7 @@ def execute(uri): - if paramstring is not None: - for param in paramstring.split("&"): - key, value = extendlist(param.split("=",1), 2, "") -- params[key] = urllib.unquote(value) -+ params[key] = unquote(value) - - accountname = params.get("account", "") - -@@ -233,12 +240,11 @@ if len(sys.argv) == 1: - elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"): - show_help(True) - elif (obj == None): -- print "No existing libpurple instance detected." -+ print("No existing libpurple instance detected.") - sys.exit(1); - - for arg in sys.argv[1:]: - output = execute(arg) - - if (output != None): -- print output -- -+ print(output) -diff -uprb pidgin-2.10.12.orig/libpurple/purple-url-handler pidgin-2.10.12/libpurple/purple-url-handler ---- pidgin-2.10.12.orig/libpurple/purple-url-handler 2016-01-01 01:19:41.000000000 +0200 -+++ pidgin-2.10.12/libpurple/purple-url-handler 2016-01-02 05:39:43.084532314 +0200 -@@ -249,7 +249,7 @@ def msnim(uri): - - def myim(uri): - protocol = "prpl-myspace" -- print "TODO: send uri: ", uri -+ print("TODO: send uri: %s" % uri) - assert False, "Not implemented" - - def sip(uri): Copied: pidgin/repos/extra-x86_64/pidgin-py3-fixes.patch (from rev 290450, pidgin/trunk/pidgin-py3-fixes.patch) =================================================================== --- extra-x86_64/pidgin-py3-fixes.patch (rev 0) +++ extra-x86_64/pidgin-py3-fixes.patch 2017-03-10 02:57:44 UTC (rev 290451) @@ -0,0 +1,69 @@ +diff -uprb pidgin-2.10.12.orig/libpurple/purple-remote pidgin-2.10.12/libpurple/purple-remote +--- pidgin-2.10.12.orig/libpurple/purple-remote 2016-01-01 01:19:41.000000000 +0200 ++++ pidgin-2.10.12/libpurple/purple-remote 2016-01-02 06:23:14.082831498 +0200 +@@ -3,13 +3,20 @@ + import codecs + import dbus + import re +-import urllib + import sys ++try: ++ from urllib.parse import unquote ++except ImportError: ++ from urllib import unquote + + import xml.dom.minidom + +-sys.stdin = codecs.getwriter('utf-8')(sys.stdin); +-sys.stdout = codecs.getwriter('utf-8')(sys.stdout); ++if sys.version_info[0] >= 3: ++ sys.stdin = codecs.getwriter('utf-8')(sys.stdin.buffer) ++ sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer) ++else: ++ sys.stdin = codecs.getwriter('utf-8')(sys.stdin) ++ sys.stdout = codecs.getwriter('utf-8')(sys.stdout) + + xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName + +@@ -41,7 +48,7 @@ class CheckedAttribute: + return result + + def show_help(requested=False): +- print """This program uses D-Bus to communicate with purple. ++ print("""This program uses D-Bus to communicate with purple. + + Usage: + +@@ -72,7 +79,7 @@ Examples of commands: + + PurpleAccountsFindConnected?name=&protocol=prpl-jabber + PurpleAccountsFindConnected(,prpl-jabber) +-""" % sys.argv[0] ++""" % sys.argv[0]) + if (requested): + sys.exit(0) + else: +@@ -120,7 +127,7 @@ def execute(uri): + if paramstring is not None: + for param in paramstring.split("&"): + key, value = extendlist(param.split("=",1), 2, "") +- params[key] = urllib.unquote(value) ++ params[key] = unquote(value) + + accountname = params.get("account", "") + +@@ -233,12 +240,11 @@ if len(sys.argv) == 1: + elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"): + show_help(True) + elif (obj == None): +- print "No existing libpurple instance detected." ++ print("No existing libpurple instance detected.") + sys.exit(1); + + for arg in sys.argv[1:]: + output = execute(arg) + + if (output != None): +- print output +- ++ print(output)