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

Ionut Biru ibiru at archlinux.org
Sat Jan 16 12:39:28 EST 2010


    Date: Saturday, January 16, 2010 @ 12:39:28
  Author: ibiru
Revision: 63231

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

........
  r63229 | ibiru | 2010-01-16 19:37:38 +0200 (Sat, 16 Jan 2010) | 2 lines
  
  upgpkg: gajim 0.13.2-1
      update to 0.13.2 and remove patch merged upstream
........

Modified:
  gajim/repos/extra-x86_64/	(properties)
  gajim/repos/extra-x86_64/PKGBUILD
Deleted:
  gajim/repos/extra-x86_64/gnome-keyring-password-fix.patch

----------------------------------+
 PKGBUILD                         |   12 ++++--------
 gnome-keyring-password-fix.patch |   12 ------------
 2 files changed, 4 insertions(+), 20 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-01-16 17:38:22 UTC (rev 63230)
+++ extra-x86_64/PKGBUILD	2010-01-16 17:39:28 UTC (rev 63231)
@@ -4,8 +4,8 @@
 # Contributor: Nikos Kouremenos <kourem at gmail.com>
 
 pkgname=gajim
-pkgver=0.13.1
-pkgrel=2
+pkgver=0.13.2
+pkgrel=1
 pkgdesc="Jabber client written in PyGTK"
 arch=(i686 x86_64)
 url="http://www.gajim.org/"
@@ -14,18 +14,14 @@
 makedepends=('gettext' 'intltool' 'dbus')
 optdepends=('dbus-python' 'pyopenssl')
 options=(!libtool)
-source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz
-	gnome-keyring-password-fix.patch)
+source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz)
 
 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
 }
-md5sums=('844752ab1b368b709b05572ad76fdc2d'
-         '55c6191e78bbe5f224cd7f941f4d1cf1')
+md5sums=('1e41999c40e2986d5f5dba1b1faaeb85')

Deleted: extra-x86_64/gnome-keyring-password-fix.patch
===================================================================
--- extra-x86_64/gnome-keyring-password-fix.patch	2010-01-16 17:38:22 UTC (rev 63230)
+++ extra-x86_64/gnome-keyring-password-fix.patch	2010-01-16 17:39:28 UTC (rev 63231)
@@ -1,12 +0,0 @@
-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,



More information about the arch-commits mailing list