Author: glen                         Date: Sat Apr 14 19:15:31 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revert default transport back to x11, dbus transport crashes too randomly

---- Files affected:
packages/python-skype:
   python-skype.spec (1.11 -> 1.12) , default-transport.patch (NONE -> 1.1)  
(NEW)

---- Diffs:

================================================================
Index: packages/python-skype/python-skype.spec
diff -u packages/python-skype/python-skype.spec:1.11 
packages/python-skype/python-skype.spec:1.12
--- packages/python-skype/python-skype.spec:1.11        Thu Dec 22 15:50:29 2011
+++ packages/python-skype/python-skype.spec     Sat Apr 14 21:15:26 2012
@@ -3,7 +3,7 @@
 Summary:       Python wrapper for the Skype API
 Name:          python-%{module}
 Version:       1.0.32.0
-Release:       3
+Release:       4
 License:       BSD
 Group:         Development/Languages/Python
 Source0:       
http://downloads.sourceforge.net/skype4py/Skype4Py-%{version}.tar.gz
@@ -12,6 +12,8 @@
 Source2:       skype.protocol
 Source3:       skype.py
 Source4:       skype.schemas
+# 
http://skype4py.svn.sourceforge.net/viewvc/skype4py/Skype4Py/api/posix.py?view=patch&r1=277&r2=276&pathrev=277
+Patch0:                default-transport.patch
 URL:           http://sourceforge.net/projects/skype4py/
 BuildRequires: python-devel
 BuildRequires: rpm-pythonprov
@@ -49,6 +51,7 @@
 # workaround for stupid tarball lacking execute perms on dirs
 tar xzf %{SOURCE0}; chmod -R u+rwX .; mv Skype4Py-*/* .
 
+%patch -p0 -R
 %undos examples/*.py
 
 mv Skype4Py/LICENSE .
@@ -158,6 +161,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2012/04/14 19:15:26  glen
+- revert default transport back to x11, dbus transport crashes too randomly
+
 Revision 1.11  2011/12/22 14:50:29  glen
 - make languages optional
 

================================================================
Index: packages/python-skype/default-transport.patch
diff -u /dev/null packages/python-skype/default-transport.patch:1.1
--- /dev/null   Sat Apr 14 21:15:32 2012
+++ packages/python-skype/default-transport.patch       Sat Apr 14 21:15:26 2012
@@ -0,0 +1,34 @@
+restore default transport being X11, dbus crashes so randomly
+
+http://stackoverflow.com/questions/7827108/unexplained-segfault-in-python
+
+http://skype4py.svn.sourceforge.net/viewvc/skype4py?view=revision&revision=277
+http://skype4py.svn.sourceforge.net/viewvc/skype4py/Skype4Py/api/posix.py?r1=277&r2=276&pathrev=277
+http://skype4py.svn.sourceforge.net/viewvc/skype4py/Skype4Py/api/posix.py?view=patch&r1=277&r2=276&pathrev=277
+
+it could be also be python 2.6+ related:
+https://github.com/stigkj/Skype4Py/commit/431b3cee9b3ab72138af69f2ccef2aff0002deda.patch
+
+--- Skype4Py/api/posix.py      2009/09/24 14:59:43     276
++++ Skype4Py/api/posix.py      2009/09/26 12:21:04     277
+@@ -28,19 +28,8 @@
+ __all__ = ['SkypeAPI']
+ 
+ 
+-# the posix_x11 module has to be imported as soon as possible so it can 
initialize
+-# the X11 library; without this extra import it would be loaded during first 
Skype
+-# object instantiation; any possible exceptions are ignored because the 
module is
+-# not really needed at this point and the errors will be reported anyway 
during
+-# Skype object instantiation
+-try:
+-    import posix_x11
+-except:
+-    pass
+-
+-
+ def SkypeAPI(opts):
+-    trans = opts.pop('Transport', 'x11')
++    trans = opts.pop('Transport', 'dbus')
+     if trans == 'dbus':
+         from posix_dbus import SkypeAPI
+     elif trans == 'x11':
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/packages/python-skype/python-skype.spec?r1=1.11&r2=1.12

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to