diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
| commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
| tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-python/twisted/files | |
| parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) | |
gentoo resync : 15.06.2021
Diffstat (limited to 'dev-python/twisted/files')
| -rw-r--r-- | dev-python/twisted/files/twisted-21.2.0-force-gtk3.patch | 42 | ||||
| -rw-r--r-- | dev-python/twisted/files/twisted-21.2.0-int-from-bytes.patch | 14 |
2 files changed, 56 insertions, 0 deletions
diff --git a/dev-python/twisted/files/twisted-21.2.0-force-gtk3.patch b/dev-python/twisted/files/twisted-21.2.0-force-gtk3.patch new file mode 100644 index 000000000000..bed31bcf611c --- /dev/null +++ b/dev-python/twisted/files/twisted-21.2.0-force-gtk3.patch @@ -0,0 +1,42 @@ +diff --git a/src/twisted/internet/gireactor.py b/src/twisted/internet/gireactor.py +index 92596db1da2..a577825a87e 100644 +--- a/src/twisted/internet/gireactor.py ++++ b/src/twisted/internet/gireactor.py +@@ -24,6 +24,7 @@ + from twisted.internet.error import ReactorAlreadyRunning + from twisted.internet import _glibbase + from twisted.python import runtime ++import gi + import gi.pygtkcompat + from gi.repository import GLib + +@@ -68,6 +69,7 @@ class GIReactor(_glibbase.GlibReactorBase): + def __init__(self, useGtk=False): + _gtk = None + if useGtk is True: ++ gi.require_version("Gtk", "3.0") + from gi.repository import Gtk as _gtk + + _glibbase.GlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk) +@@ -112,6 +114,7 @@ class PortableGIReactor(_glibbase.PortableGlibReactorBase): + def __init__(self, useGtk=False): + _gtk = None + if useGtk is True: ++ gi.require_version("Gtk", "3.0") + from gi.repository import Gtk as _gtk + + _glibbase.PortableGlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk) +diff --git a/src/twisted/internet/test/test_gireactor.py b/src/twisted/internet/test/test_gireactor.py +index d15a9262248..af5092a3614 100644 +--- a/src/twisted/internet/test/test_gireactor.py ++++ b/src/twisted/internet/test/test_gireactor.py +@@ -25,6 +25,9 @@ + gtk3reactor = None + else: + gtk3reactor = _gtk3reactor ++ import gi # type: ignore[import] ++ ++ gi.require_version("Gtk", "3.0") + from gi.repository import Gtk + + from twisted.internet.error import ReactorAlreadyRunning diff --git a/dev-python/twisted/files/twisted-21.2.0-int-from-bytes.patch b/dev-python/twisted/files/twisted-21.2.0-int-from-bytes.patch new file mode 100644 index 000000000000..ef9bd777ac7c --- /dev/null +++ b/dev-python/twisted/files/twisted-21.2.0-int-from-bytes.patch @@ -0,0 +1,14 @@ +diff --git a/src/twisted/conch/ssh/common.py b/src/twisted/conch/ssh/common.py +index 3e4f8cdc7..ee3d63143 100644 +--- a/src/twisted/conch/ssh/common.py ++++ b/src/twisted/conch/ssh/common.py +@@ -11,7 +11,8 @@ Maintainer: Paul Swartz + + import struct + +-from cryptography.utils import int_from_bytes, int_to_bytes ++from cryptography.utils import int_to_bytes ++int_from_bytes = int.from_bytes + + from twisted.python.deprecate import deprecated + from twisted.python.versions import Version |