[arch-commits] Commit in gajim/repos/extra-any (5 files)
Andrea Scarpino
andrea at archlinux.org
Wed Oct 19 09:25:30 UTC 2011
Date: Wednesday, October 19, 2011 @ 05:25:30
Author: andrea
Revision: 140784
archrelease: copy trunk to extra-any
Added:
gajim/repos/extra-any/PKGBUILD
(from rev 140783, gajim/trunk/PKGBUILD)
gajim/repos/extra-any/fix-unicode-characters.patch
(from rev 140783, gajim/trunk/fix-unicode-characters.patch)
gajim/repos/extra-any/gajim.install
(from rev 140783, gajim/trunk/gajim.install)
Deleted:
gajim/repos/extra-any/PKGBUILD
gajim/repos/extra-any/gajim.install
------------------------------+
PKGBUILD | 77 ++++++++++---------
fix-unicode-characters.patch | 162 +++++++++++++++++++++++++++++++++++++++++
gajim.install | 22 ++---
3 files changed, 213 insertions(+), 48 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2011-10-19 09:24:50 UTC (rev 140783)
+++ PKGBUILD 2011-10-19 09:25:30 UTC (rev 140784)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=gajim
-pkgver=0.14.4
-pkgrel=1
-pkgdesc="A full featured and easy to use Jabber client"
-arch=('any')
-url="http://www.gajim.org/"
-license=('GPL3')
-depends=('pygtk' 'python2' 'python2-pyopenssl' 'hicolor-icon-theme' 'dnsutils')
-makedepends=('gettext' 'intltool')
-optdepends=('dbus-python: dbus support'
- 'farsight2: video/voice support'
- 'gstreamer0.10-good: video/voice support'
- 'gstreamer0.10-bad: video/voice support'
- 'gtkspell: spelling support'
- 'libxss: for idle module'
- 'notification-daemon: for desktop notification'
- 'python-gnomekeyring: for GnomeKeyring support'
- 'pycrypto: support for E2E encryption')
-options=('!libtool')
-install=gajim.install
-source=(http://www.gajim.org/downloads/${pkgver%.*}/gajim-${pkgver}.tar.bz2)
-md5sums=('b6b88b084de38d9fb34d39c37d4f185b')
-sha1sums=('0343af3c4bae39aa49e547b641caac197a887bb4')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --enable-site-packages
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: gajim/repos/extra-any/PKGBUILD (from rev 140783, gajim/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2011-10-19 09:25:30 UTC (rev 140784)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=gajim
+pkgver=0.14.4
+pkgrel=2
+pkgdesc="A full featured and easy to use Jabber client"
+arch=('any')
+url="http://www.gajim.org/"
+license=('GPL3')
+depends=('pygtk' 'python2' 'python2-pyopenssl' 'hicolor-icon-theme' 'dnsutils')
+makedepends=('gettext' 'intltool')
+optdepends=('dbus-python: dbus support'
+ 'farsight2: video/voice support'
+ 'gstreamer0.10-good: video/voice support'
+ 'gstreamer0.10-bad: video/voice support'
+ 'gtkspell: spelling support'
+ 'libxss: for idle module'
+ 'notification-daemon: for desktop notification'
+ 'python-gnomekeyring: for GnomeKeyring support'
+ 'pycrypto: support for E2E encryption')
+options=('!libtool')
+install=gajim.install
+source=("http://www.gajim.org/downloads/${pkgver%.*}/gajim-${pkgver}.tar.bz2"
+ 'fix-unicode-characters.patch')
+md5sums=('b6b88b084de38d9fb34d39c37d4f185b'
+ '37faebd9b3d2aca56d6cc17c8e7d7112')
+sha1sums=('0343af3c4bae39aa49e547b641caac197a887bb4'
+ '7650dd14ce16d0d8b73f623083071a7249d27cff')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --enable-site-packages
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: gajim/repos/extra-any/fix-unicode-characters.patch (from rev 140783, gajim/trunk/fix-unicode-characters.patch)
===================================================================
--- fix-unicode-characters.patch (rev 0)
+++ fix-unicode-characters.patch 2011-10-19 09:25:30 UTC (rev 140784)
@@ -0,0 +1,162 @@
+Index: src/common/xmpp/dispatcher_nb.py
+===================================================================
+--- src/common/xmpp/dispatcher_nb.py (revision 13139)
++++ src/common/xmpp/dispatcher_nb.py (revision 13242)
+@@ -22,4 +22,5 @@
+
+ import simplexml, sys, locale
++import re
+ from xml.parsers.expat import ExpatError
+ from plugin import PlugIn
+@@ -93,4 +94,22 @@
+ # Let the dispatcher know if there is support for stream management
+ self.sm = None
++
++ # \ufddo -> \ufdef range
++ c = u'\ufdd0'
++ r = c.encode('utf8')
++ while (c < u'\ufdef'):
++ c = unichr(ord(c) + 1)
++ r += '|' + c.encode('utf8')
++
++ # \ufffe-\uffff, \u1fffe-\u1ffff, ..., \u10fffe-\u10ffff
++ c = u'\ufffe'
++ r += '|' + c.encode('utf8')
++ r += '|' + unichr(ord(c) + 1).encode('utf8')
++ while (c < u'\U0010fffe'):
++ c = unichr(ord(c) + 0x10000)
++ r += '|' + c.encode('utf8')
++ r += '|' + unichr(ord(c) + 1).encode('utf8')
++
++ self.invalid_chars_re = re.compile(r)
+
+ def getAnID(self):
+@@ -194,4 +213,5 @@
+ # Is this intended?
+ # also look at transports start_disconnect()
++ data = re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data)
+ for handler in self._cycleHandlers:
+ handler(self)
+Index: src/common/connection_handlers.py
+===================================================================
+--- src/common/connection_handlers.py (revision 13172)
++++ src/common/connection_handlers.py (revision 13243)
+@@ -978,4 +978,6 @@
+ def decrypt_thread(encmsg, keyID, obj):
+ decmsg = self.gpg.decrypt(encmsg, keyID)
++ decmsg = self.connection.Dispatcher.replace_non_character(
++ decmsg)
+ # \x00 chars are not allowed in C (so in GTK)
+ obj.msgtxt = helpers.decode_string(decmsg.replace('\x00',
+Index: src/common/stanza_session.py
+===================================================================
+--- src/common/stanza_session.py (revision 13172)
++++ src/common/stanza_session.py (revision 13243)
+@@ -493,4 +493,7 @@
+ stanza.addChild(node=child)
+
++ # replace non-character unicode
++ stranza = self.conn.connection.Dispatcher.replace_non_character(stanza)
++
+ return stanza
+
+Index: src/common/xmpp/dispatcher_nb.py
+===================================================================
+--- src/common/xmpp/dispatcher_nb.py (revision 13242)
++++ src/common/xmpp/dispatcher_nb.py (revision 13243)
+@@ -198,4 +198,7 @@
+ % (tag, ns))
+
++ def replace_non_character(self, data):
++ return re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data)
++
+ def ProcessNonBlocking(self, data):
+ """
+@@ -213,5 +216,5 @@
+ # Is this intended?
+ # also look at transports start_disconnect()
+- data = re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data)
++ data = self.replace_non_character(data)
+ for handler in self._cycleHandlers:
+ handler(self)
+Index: src/common/xmpp/dispatcher_nb.py
+===================================================================
+--- src/common/xmpp/dispatcher_nb.py (revision 13139)
++++ src/common/xmpp/dispatcher_nb.py (revision 13242)
+@@ -22,4 +22,5 @@
+
+ import simplexml, sys, locale
++import re
+ from xml.parsers.expat import ExpatError
+ from plugin import PlugIn
+@@ -93,4 +94,22 @@
+ # Let the dispatcher know if there is support for stream management
+ self.sm = None
++
++ # \ufddo -> \ufdef range
++ c = u'\ufdd0'
++ r = c.encode('utf8')
++ while (c < u'\ufdef'):
++ c = unichr(ord(c) + 1)
++ r += '|' + c.encode('utf8')
++
++ # \ufffe-\uffff, \u1fffe-\u1ffff, ..., \u10fffe-\u10ffff
++ c = u'\ufffe'
++ r += '|' + c.encode('utf8')
++ r += '|' + unichr(ord(c) + 1).encode('utf8')
++ while (c < u'\U0010fffe'):
++ c = unichr(ord(c) + 0x10000)
++ r += '|' + c.encode('utf8')
++ r += '|' + unichr(ord(c) + 1).encode('utf8')
++
++ self.invalid_chars_re = re.compile(r)
+
+ def getAnID(self):
+@@ -194,4 +213,5 @@
+ # Is this intended?
+ # also look at transports start_disconnect()
++ data = re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data)
+ for handler in self._cycleHandlers:
+ handler(self)
+Index: src/common/connection_handlers.py
+===================================================================
+--- src/common/connection_handlers.py (revision 13182)
++++ src/common/connection_handlers.py (revision 13251)
+@@ -979,4 +979,6 @@
+ def decrypt_thread(encmsg, keyID, obj):
+ decmsg = self.gpg.decrypt(encmsg, keyID)
++ decmsg = self.connection.Dispatcher.replace_non_character(
++ decmsg)
+ # \x00 chars are not allowed in C (so in GTK)
+ obj.msgtxt = helpers.decode_string(decmsg.replace('\x00',
+Index: src/common/stanza_session.py
+===================================================================
+--- src/common/stanza_session.py (revision 13172)
++++ src/common/stanza_session.py (revision 13243)
+@@ -493,4 +493,7 @@
+ stanza.addChild(node=child)
+
++ # replace non-character unicode
++ stranza = self.conn.connection.Dispatcher.replace_non_character(stanza)
++
+ return stanza
+
+Index: src/common/xmpp/dispatcher_nb.py
+===================================================================
+--- src/common/xmpp/dispatcher_nb.py (revision 13242)
++++ src/common/xmpp/dispatcher_nb.py (revision 13243)
+@@ -198,4 +198,7 @@
+ % (tag, ns))
+
++ def replace_non_character(self, data):
++ return re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data)
++
+ def ProcessNonBlocking(self, data):
+ """
+@@ -213,5 +216,5 @@
+ # Is this intended?
+ # also look at transports start_disconnect()
+- data = re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data)
++ data = self.replace_non_character(data)
+ for handler in self._cycleHandlers:
+ handler(self)
Deleted: gajim.install
===================================================================
--- gajim.install 2011-10-19 09:24:50 UTC (rev 140783)
+++ gajim.install 2011-10-19 09:25:30 UTC (rev 140784)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: gajim/repos/extra-any/gajim.install (from rev 140783, gajim/trunk/gajim.install)
===================================================================
--- gajim.install (rev 0)
+++ gajim.install 2011-10-19 09:25:30 UTC (rev 140784)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list