Date: Friday, March 9, 2018 @ 07:59:18 Author: foutrelis Revision: 318293
upgpkg: pidgin 2.13.0-1 New upstream release. Modified: pidgin/trunk/PKGBUILD Deleted: pidgin/trunk/pidgin-py3-fixes.patch ------------------------+ PKGBUILD | 19 ++++-------- pidgin-py3-fixes.patch | 69 ----------------------------------------------- 2 files changed, 6 insertions(+), 82 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-03-09 07:36:04 UTC (rev 318292) +++ PKGBUILD 2018-03-09 07:59:18 UTC (rev 318293) @@ -6,8 +6,8 @@ # Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.12.0 -pkgrel=4 +pkgver=2.13.0 +pkgrel=1 arch=('x86_64') url="http://pidgin.im/" license=('GPL') @@ -14,18 +14,11 @@ 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') +source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc}) +sha256sums=('2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f' + 'SKIP') +validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') # Gary Kramlich (grim) <g...@reaperworld.com> -prepare() { - cd $pkgbase-$pkgver - patch -Np1 -i ../pidgin-py3-fixes.patch -} - build() { cd $pkgbase-$pkgver Deleted: pidgin-py3-fixes.patch =================================================================== --- pidgin-py3-fixes.patch 2018-03-09 07:36:04 UTC (rev 318292) +++ pidgin-py3-fixes.patch 2018-03-09 07:59:18 UTC (rev 318293) @@ -1,69 +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)