pidgin 2.13.0 [skip-ci]

This commit is contained in:
AlmAck 2018-04-26 22:02:18 +02:00
parent a3bd7fb6fa
commit a593f666ff
2 changed files with 39 additions and 5 deletions

View File

@ -1,5 +1,5 @@
pkgname=('pidgin')
pkgver=2.12.0
pkgver=2.13.0
pkgrel=1
arch=('x86_64')
pkgdesc="Multi-protocol instant messaging client"
@ -12,13 +12,13 @@ makedepends=('nss' 'libsasl' 'libidn' 'python3' 'avahi'
optdepends=('aspell: for spelling correction')
install=pidgin.install
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
'pidgin-2.10.12-py3-fixes.patch')
md5sums=('8287400c4e5663e0e7844e868d5152af'
'83509c89a24a9c675ea6d876ef693bd5')
'purple-remote-python3.patch')
md5sums=('423403494fe1951e47cc75231f743bb0'
'0709677de2cb5bc08b30e6b04ea0d3c5')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i ../pidgin-2.10.12-py3-fixes.patch
patch -Np1 -i ../purple-remote-python3.patch
autoreconf -vi
}

View File

@ -0,0 +1,34 @@
# HG changeset patch
# User Evangelos Foutras <evangelos@foutrelis.com>
# Date 1520583640 -7200
# Fri Mar 09 10:20:40 2018 +0200
# Branch release-2.x.y
# Node ID ac2e05444162f1dc0fd60e4d5c8b4cbe2969b695
# Parent 02df346d26d00cb9a1420c11a59fccb35d92f04e
Adjust purple-remote to work with Python 3
Fixes the following error:
Traceback (most recent call last):
File "./libpurple/purple-remote", line 241, in <module>
print("No existing libpurple instance detected.")
File "/usr/lib/python3.6/codecs.py", line 377, in write
self.stream.write(data)
TypeError: write() argument must be str, not bytes
diff -r 02df346d26d0 -r ac2e05444162 libpurple/purple-remote
--- a/libpurple/purple-remote Thu Mar 08 22:51:37 2018 -0600
+++ b/libpurple/purple-remote Fri Mar 09 10:20:40 2018 +0200
@@ -13,8 +13,10 @@
import xml.dom.minidom
-sys.stdin = codecs.getwriter('utf-8')(sys.stdin);
-sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
+if hasattr(sys.stdout, 'buffer'):
+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer)
+else:
+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout)
xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName