Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0e6e140ed406d4ede4d5cc0a8ad8ba45de674f4

commit c0e6e140ed406d4ede4d5cc0a8ad8ba45de674f4
Author: Devil505 <devil505li...@gmail.com>
Date:   Sun Sep 5 15:57:36 2010 +0200

gajim-0.14-1-i686
* version bump
* added a patch from fedora to avoid segfault with python 2.7

diff --git a/source/xapps-extra/gajim/FrugalBuild 
b/source/xapps-extra/gajim/FrugalBuild
index f336cef..833d5c8 100644
--- a/source/xapps-extra/gajim/FrugalBuild
+++ b/source/xapps-extra/gajim/FrugalBuild
@@ -2,21 +2,22 @@
# Maintainer: voroskoi <voros...@frugalware.org>

pkgname=gajim
-pkgver=0.13.4
-pkgrel=2
+pkgver=0.14
+pkgrel=1
pkgdesc="The goal of Gajim is to provide a full featured and easy to use Jabber 
client."
url="http://www.gajim.org/";
-depends=('pygtk>=2.16.0-4' 'libxscrnsaver>=1.1.3-1')
+depends=('pygtk>=2.16.0-5' 'libxscrnsaver>=1.1.3-1')
makedepends=('gtkspell>=2.0.11-3' 'intltool' 'dbus>=1.2.14-1')
rodepends=('pysqlite2')
-options=('nodocs' 'force')
+options=('nodocs')
_F_gnome_iconcache="y"
_F_gnome_desktop="y"
Finclude gnome-scriptlet
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.gajim.org/downloads.php?lang=en |grep tar.bz2 
|sed 's/.*-\(.*\).t.*/\1/'"
-source=(http://www.gajim.org/downloads/0.13/gajim-$pkgver.tar.bz2)
-sha1sums=('87c37ea105543a437cf1d2bb93dd49a4f9be9343')
+source=(http://www.gajim.org/downloads/0.14/gajim-$pkgver.tar.bz2 
$pkgname-0.13.4-pygtk-crash-python2.7-workaround.patch)
+sha1sums=('d48fe8366c5083f7d01e0abd161bbbfb410e36ef' \
+          '82a7775f25bb700e095b2cede0a3bd60a65fee51')

# optimization OK
diff --git 
a/source/xapps-extra/gajim/gajim-0.13.4-pygtk-crash-python2.7-workaround.patch 
b/source/xapps-extra/gajim/gajim-0.13.4-pygtk-crash-python2.7-workaround.patch
new file mode 100644
index 0000000..fe4f80d
--- /dev/null
+++ 
b/source/xapps-extra/gajim/gajim-0.13.4-pygtk-crash-python2.7-workaround.patch
@@ -0,0 +1,18 @@
+Avoid an assertion failure and crash of the python interpreter caused by
+pygtk's usage of the deprecated PyCObject and Python 2.7.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=621887
+
+Index: gajim-0.13.4/src/gajim.py
+===================================================================
+--- gajim-0.13.4.orig/src/gajim.py
++++ gajim-0.13.4/src/gajim.py
+@@ -131,7 +131,7 @@ if os.name == 'nt':
+       sys.stderr = MyStderr()
+
+ # PyGTK2.10+ only throws a warning
+-warnings.filterwarnings('error', module='gtk')
++warnings.filterwarnings('error', module='gtk', append=True)
+ try:
+       import gtk
+ except Warning, msg:
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to