[arch-commits] Commit in pidgin/trunk (PKGBUILD purple-remote-python3.patch)

Evangelos Foutras foutrelis at archlinux.org
Fri Mar 9 10:20:31 UTC 2018


    Date: Friday, March 9, 2018 @ 10:20:30
  Author: foutrelis
Revision: 318302

upgpkg: pidgin 2.13.0-1

Fix purple-remote to work with Python 3

Added:
  pidgin/trunk/purple-remote-python3.patch
Modified:
  pidgin/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   13 +++++++++++--
 purple-remote-python3.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-09 09:23:13 UTC (rev 318301)
+++ PKGBUILD	2018-03-09 10:20:30 UTC (rev 318302)
@@ -14,11 +14,20 @@
 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})
+source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc}
+        purple-remote-python3.patch)
 sha256sums=('2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f'
-            'SKIP')
+            'SKIP'
+            '4eb6be9310e4d5d1b906b1d579c395000ee0af6d6f5056307233512151d1f4b1')
 validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') # Gary Kramlich (grim) <grim at reaperworld.com>
 
+prepare() {
+  cd $pkgbase-$pkgver
+
+  # https://developer.pidgin.im/ticket/17065
+  patch -Np1 -i ../purple-remote-python3.patch
+}
+
 build() {
   cd $pkgbase-$pkgver
 

Added: purple-remote-python3.patch
===================================================================
--- purple-remote-python3.patch	                        (rev 0)
+++ purple-remote-python3.patch	2018-03-09 10:20:30 UTC (rev 318302)
@@ -0,0 +1,34 @@
+# HG changeset patch
+# User Evangelos Foutras <evangelos at 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
+ 



More information about the arch-commits mailing list