From 42bbaa2ebe4e8b6391b256e2ee98f726f2269fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 27 Jun 2016 21:56:50 -0300 Subject: pidgin-2.11.0-1.nonprism1: updating version --- nonprism/pidgin/PKGBUILD | 12 ++-- nonprism/pidgin/pidgin-2.10.12-py3-fixes.patch | 81 -------------------------- nonprism/pidgin/pidgin-py3-fixes.patch | 81 ++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 87 deletions(-) delete mode 100644 nonprism/pidgin/pidgin-2.10.12-py3-fixes.patch create mode 100644 nonprism/pidgin/pidgin-py3-fixes.patch diff --git a/nonprism/pidgin/PKGBUILD b/nonprism/pidgin/PKGBUILD index 57f44b6a1..d62a11c87 100644 --- a/nonprism/pidgin/PKGBUILD +++ b/nonprism/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 269423 2016-06-13 05:38:32Z foutrelis $ +# $Id: PKGBUILD 270596 2016-06-24 16:51:56Z foutrelis $ # Maintainer (Arch): Evangelos Foutras # Contributor (Arch): Ionut Biru # Contributor (Arch): Andrea Scarpino @@ -8,8 +8,8 @@ # Contributor: Márcio Silva pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.12 -pkgrel=4.nonprism1 +pkgver=2.11.0 +pkgrel=1.nonprism1 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') @@ -17,9 +17,9 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'libidn' '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 + pidgin-py3-fixes.patch nonprism.patch) -sha256sums=('2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd' +sha256sums=('f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333' 'SKIP' 'e38bd61e0dcfcc2e5761078ea709b92c5bf8d025d5eb1288aa8a550715babb7e' 'f720dc9aca3191b65cd89828ab7266e06d93203b7f0de9ac6b506227b00b0bc0') @@ -27,7 +27,7 @@ validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') prepare() { cd $pkgbase-$pkgver - patch -Np1 -i ../pidgin-2.10.12-py3-fixes.patch + patch -Np1 -i ../pidgin-py3-fixes.patch msg "Remove Google Talk and Facebook protocols" patch -Np1 -i "$srcdir/nonprism.patch" diff --git a/nonprism/pidgin/pidgin-2.10.12-py3-fixes.patch b/nonprism/pidgin/pidgin-2.10.12-py3-fixes.patch deleted file mode 100644 index 1acf25a09..000000000 --- a/nonprism/pidgin/pidgin-2.10.12-py3-fixes.patch +++ /dev/null @@ -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): diff --git a/nonprism/pidgin/pidgin-py3-fixes.patch b/nonprism/pidgin/pidgin-py3-fixes.patch new file mode 100644 index 000000000..1acf25a09 --- /dev/null +++ b/nonprism/pidgin/pidgin-py3-fixes.patch @@ -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): -- cgit v1.1-4-g5e80