Date: Saturday, January 2, 2016 @ 05:32:23 Author: foutrelis Revision: 257443
upgpkg: pidgin 2.10.12-1 New upstream release; switch to Python 3. Added: pidgin/trunk/pidgin-2.10.12-py3-fixes.patch Modified: pidgin/trunk/PKGBUILD --------------------------------+ PKGBUILD | 47 +++++++++------------- pidgin-2.10.12-py3-fixes.patch | 81 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-01-01 23:50:43 UTC (rev 257442) +++ PKGBUILD 2016-01-02 04:32:23 UTC (rev 257443) @@ -6,38 +6,30 @@ # Contributor: Lucien Immink <[email protected]> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.11 -pkgrel=6 -_rev=cbc4db14444c91f4f4b03aa1b228c2d51dacea6b +pkgver=2.10.12 +pkgrel=1 arch=('i686' 'x86_64') url="http://pidgin.im/"; license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'libidn' 'libgadu' 'python2' 'hicolor-icon-theme' 'farstream' - 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager' - 'mercurial') -source=(pidgin::hg+https://bitbucket.org/pidgin/main#revision=$_rev) -sha256sums=('SKIP') + '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-2.10.12-py3-fixes.patch) +sha256sums=('2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd' + 'SKIP' + 'e38bd61e0dcfcc2e5761078ea709b92c5bf8d025d5eb1288aa8a550715babb7e') +validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') prepare() { - cd $pkgbase - - # Revert change that breaks rejoining multi-user chats - # https://developer.pidgin.im/ticket/16724 - { - hg diff -c 136a5e95a1ad - hg diff -c 187b51ce9922 - } | patch -Rp1 - - # Use Python 2 - sed -i 's/env python$/&2/' */plugins/*.py \ - libpurple/purple-{remote,notifications-example,url-handler} + cd $pkgbase-$pkgver + patch -Np1 -i ../pidgin-2.10.12-py3-fixes.patch } build() { - cd $pkgbase + cd $pkgbase-$pkgver - ./autogen.sh \ + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --disable-schemas-install \ @@ -46,7 +38,6 @@ --enable-cyrus-sasl \ --disable-doxygen \ --enable-nm \ - --with-python=/usr/bin/python2 \ --with-system-ssl-certs=/etc/ssl/certs make } @@ -58,7 +49,7 @@ optdepends=('aspell: for spelling correction') install=pidgin.install - cd $pkgbase + cd $pkgbase-$pkgver # For linking make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES @@ -77,10 +68,10 @@ depends=('farstream' 'libsasl' 'libidn' 'libgadu' 'dbus-glib' 'nss') optdepends=('avahi: Bonjour protocol support' 'ca-certificates: SSL CA certificates' - 'python2-dbus: for purple-remote and purple-url-handler' + 'python-dbus: for purple-remote and purple-url-handler' 'tk: Tcl/Tk scripting support') - cd $pkgbase + cd $pkgbase-$pkgver for _dir in libpurple share/sounds share/ca-certs m4macros po; do make -C "$_dir" DESTDIR="$pkgdir" install @@ -89,9 +80,9 @@ package_finch(){ pkgdesc="A ncurses-based messaging client" - depends=('libpurple' 'libx11' 'python2') + depends=('libpurple' 'libx11' 'python') - cd $pkgbase + cd $pkgbase-$pkgver # For linking make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES Added: pidgin-2.10.12-py3-fixes.patch =================================================================== --- pidgin-2.10.12-py3-fixes.patch (rev 0) +++ pidgin-2.10.12-py3-fixes.patch 2016-01-02 04:32:23 UTC (rev 257443) @@ -0,0 +1,81 @@ +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):
