[arch-commits] Commit in gajim/repos (4 files)

[Ionut Biru]

    Date: Monday, December 7, 2009 @ 07:22:13
  Author: ibiru
Revision: 60844

Merged revisions 60842 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gajim/trunk

........
  r60842 | ibiru | 2009-12-07 14:20:46 +0200 (Mon, 07 Dec 2009) | 2 lines
  
  upgpkg: gajim 0.13.1-2
      FS#17403 fix when using gnome-keyring
........

Added:
  gajim/repos/extra-x86_64/gnome-keyring-password-fix.patch
    (from rev 60842, gajim/trunk/gnome-keyring-password-fix.patch)
Modified:
  gajim/repos/extra-x86_64/	(properties)
  gajim/repos/extra-x86_64/PKGBUILD
Deleted:
  gajim/repos/extra-x86_64/9283.diff

----------------------------------+
 9283.diff                        |   11 -----------
 PKGBUILD                         |   10 +++++++---
 gnome-keyring-password-fix.patch |   12 ++++++++++++
 3 files changed, 19 insertions(+), 14 deletions(-)


Property changes on: gajim/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gajim/trunk:1-59907
   + /gajim/trunk:1-60843

Deleted: extra-x86_64/9283.diff
===================================================================
--- extra-x86_64/9283.diff	2009-12-07 12:21:22 UTC (rev 60843)
+++ extra-x86_64/9283.diff	2009-12-07 12:22:13 UTC (rev 60844)
@@ -1,11 +0,0 @@
-Index: trunk/src/common/helpers.py
-===================================================================
---- trunk/src/common/helpers.py (revision 9282)
-+++ trunk/src/common/helpers.py (revision 9283)
-@@ -794,5 +794,5 @@
- 
- 		# our last chance, ask uname and strip it
--		uname_output = get_output_of_command('uname -a | cut -d" " -f1,3')
-+		uname_output = get_output_of_command('uname -sr')
- 		if uname_output is not None:
- 			return uname_output[0] # only first line

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-12-07 12:21:22 UTC (rev 60843)
+++ extra-x86_64/PKGBUILD	2009-12-07 12:22:13 UTC (rev 60844)
@@ -5,7 +5,7 @@
 
 pkgname=gajim
 pkgver=0.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Jabber client written in PyGTK"
 arch=(i686 x86_64)
 url="http://www.gajim.org/"
@@ -14,14 +14,18 @@
 makedepends=('gettext' 'intltool' 'dbus')
 optdepends=('dbus-python' 'pyopenssl')
 options=(!libtool)
-source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz)
+source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz
+	gnome-keyring-password-fix.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/gnome-keyring-password-fix.patch" || return 1
+
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
   find "${pkgdir}/usr/share/gajim/" -name "*.pyo" | xargs rm -rf
 }
-sha256sums=('a2ed0383609a8423d65ab9f60e5e29bf5bf5eb9daeb69c70ba9d47f97a6cedbb')
+md5sums=('844752ab1b368b709b05572ad76fdc2d'
+         '55c6191e78bbe5f224cd7f941f4d1cf1')

Copied: gajim/repos/extra-x86_64/gnome-keyring-password-fix.patch (from rev 60842, gajim/trunk/gnome-keyring-password-fix.patch)
===================================================================
--- extra-x86_64/gnome-keyring-password-fix.patch	                        (rev 0)
+++ extra-x86_64/gnome-keyring-password-fix.patch	2009-12-07 12:22:13 UTC (rev 60844)
@@ -0,0 +1,12 @@
+diff -Nur gajim-0.13.1.old/src/common/passwords.py gajim-0.13.1/src/common/passwords.py
+--- gajim-0.13.1.old/src/common/passwords.py	2009-10-29 12:15:17.000000000 +0200
++++ gajim-0.13.1/src/common/passwords.py	2009-12-07 13:59:42.179454769 +0200
+@@ -122,6 +122,8 @@
+ 		user = gajim.config.get_per('accounts', account_name, 'name')
+ 		display_name = _('XMPP account %s@%s') % (user, server)
+ 		attributes1 = dict(server=str(server), user=str(user), protocol='xmpp')
++		if password is None:
++			password = str()
+ 		try:
+ 			auth_token = gnomekeyring.item_create_sync(
+ 				self.keyring, gnomekeyring.ITEM_NETWORK_PASSWORD,