[arch-commits] Commit in pidgin/trunk (3 files)

[Evangelos Foutras]

    Date: Friday, June 24, 2016 @ 16:51:56
  Author: foutrelis
Revision: 270596

upgpkg: pidgin 2.11.0-1

New upstream release.

Added:
  pidgin/trunk/pidgin-py3-fixes.patch
    (from rev 270595, pidgin/trunk/pidgin-2.10.12-py3-fixes.patch)
Modified:
  pidgin/trunk/PKGBUILD
Deleted:
  pidgin/trunk/pidgin-2.10.12-py3-fixes.patch

--------------------------------+
 PKGBUILD                       |   10 ++--
 pidgin-2.10.12-py3-fixes.patch |   81 ---------------------------------------
 pidgin-py3-fixes.patch         |   81 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 86 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-24 16:33:15 UTC (rev 270595)
+++ PKGBUILD	2016-06-24 16:51:56 UTC (rev 270596)
@@ -6,8 +6,8 @@
 # Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.12
-pkgrel=4
+pkgver=2.11.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
 license=('GPL')
@@ -15,8 +15,8 @@
              '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'
+        pidgin-py3-fixes.patch)
+sha256sums=('f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333'
             'SKIP'
             'e38bd61e0dcfcc2e5761078ea709b92c5bf8d025d5eb1288aa8a550715babb7e')
 validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032')
@@ -23,7 +23,7 @@
 
 prepare() {
   cd $pkgbase-$pkgver
-  patch -Np1 -i ../pidgin-2.10.12-py3-fixes.patch
+  patch -Np1 -i ../pidgin-py3-fixes.patch
 }
 
 build() {

Deleted: pidgin-2.10.12-py3-fixes.patch
===================================================================
--- pidgin-2.10.12-py3-fixes.patch	2016-06-24 16:33:15 UTC (rev 270595)
+++ pidgin-2.10.12-py3-fixes.patch	2016-06-24 16:51:56 UTC (rev 270596)
@@ -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):

Copied: pidgin/trunk/pidgin-py3-fixes.patch (from rev 270595, pidgin/trunk/pidgin-2.10.12-py3-fixes.patch)
===================================================================
--- pidgin-py3-fixes.patch	                        (rev 0)
+++ pidgin-py3-fixes.patch	2016-06-24 16:51:56 UTC (rev 270596)
@@ -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):