cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with patch that was just committed upstream...

Browse Source
This commit is contained in:
ajacoutot 2012-05-09 08:34:42 +00:00
parent 86cce23279
commit 19bba04a24
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/gajim/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.53 2012/05/09 08:29:37 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.54 2012/05/09 08:34:42 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= jabber client written in pygtk
DISTNAME= gajim-0.15
REVISION= 1
REVISION= 2
CATEGORIES= net x11
MASTER_SITES= ${HOMEPAGE}/downloads/0.15/

11
net/gajim/patches/patch-src_gajim_py
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_gajim_py,v 1.1 2012/05/09 08:29:37 ajacoutot Exp $
$OpenBSD: patch-src_gajim_py,v 1.2 2012/05/09 08:34:42 ajacoutot Exp $
https://trac.gajim.org/ticket/7155
From upstream: https://trac.gajim.org/changeset/1a3dc2a7f03d
--- src/gajim.py.orig Sun May 6 09:46:01 2012
+++ src/gajim.py Sun May 6 09:46:52 2012
@@ -453,6 +453,10 @@ if __name__ == '__main__':
--- src/gajim.py.orig Sun Mar 18 12:25:59 2012
+++ src/gajim.py Wed May 9 10:34:05 2012
@@ -453,6 +453,9 @@ if __name__ == '__main__':
# This makes Gajim unusable under windows, and threads are used only
# for GPG, so not under windows
gtk.gdk.threads_init()
@ -12,6 +12,5 @@ https://trac.gajim.org/ticket/7155
gtk.main()
+ if os.name != 'nt':
+ gtk.gdk.threads_leave()
+
except KeyboardInterrupt:
print >> sys.stderr, 'KeyboardInterrupt'