Hello community, here is the log from the commit of package python-Twisted for openSUSE:Factory checked in at 2018-11-14 14:40:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Twisted (Old) and /work/SRC/openSUSE:Factory/.python-Twisted.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Twisted" Wed Nov 14 14:40:58 2018 rev:32 rq:647311 version:18.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Twisted/python-Twisted.changes 2018-11-06 14:00:54.727724327 +0100 +++ /work/SRC/openSUSE:Factory/.python-Twisted.new/python-Twisted.changes 2018-11-14 14:41:11.674838589 +0100 @@ -1,0 +2,5 @@ +Thu Nov 8 10:28:09 CET 2018 - [email protected] + +- Add no-pygtkcompat.patch to avoid dependency on Gtk (boo#1110669) + +------------------------------------------------------------------- New: ---- no-pygtkcompat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Twisted.spec ++++++ --- /var/tmp/diff_new_pack.eDvw0b/_old 2018-11-14 14:41:12.482837633 +0100 +++ /var/tmp/diff_new_pack.eDvw0b/_new 2018-11-14 14:41:12.486837628 +0100 @@ -29,6 +29,7 @@ Source: https://files.pythonhosted.org/packages/source/T/Twisted/%{modname}-%{version}.tar.bz2 Patch1: skip_MultiCast.patch Patch2: openssl111.patch +Patch3: no-pygtkcompat.patch BuildRequires: %{python_module Automat >= 0.3.0} BuildRequires: %{python_module PyHamcrest >= 1.9.0} BuildRequires: %{python_module appdirs >= 1.4.0} ++++++ no-pygtkcompat.patch ++++++ diff -ur Twisted-18.7.0.orig/src/twisted/internet/gireactor.py Twisted-18.7.0/src/twisted/internet/gireactor.py --- Twisted-18.7.0.orig/src/twisted/internet/gireactor.py 2018-03-26 10:19:31.000000000 +0200 +++ Twisted-18.7.0/src/twisted/internet/gireactor.py 2018-10-04 01:41:32.547220235 +0200 @@ -75,8 +75,12 @@ # Newer version of gi, so we can try to initialize compatibility layer; if # real pygtk was already imported we'll get ImportError at this point # rather than segfault, so unconditional import is fine. - import gi.pygtkcompat - gi.pygtkcompat.enable() + try: + import gi.pygtkcompat + except ImportError: + pass # This is probably Python 3, with pygtkcompat removed + else: + gi.pygtkcompat.enable() # At this point importing gobject will get you gi version, and importing # e.g. gtk will either fail in non-segfaulty way or use gi version if user # does gi.pygtkcompat.enable_gtk(). So, no need to prevent imports of
