[gentoo-commits] repo/gentoo:master commit in: dev-python/xcffib/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/xcffib/files/

[David Seifert]

commit:     3c2843d17c1a5d61c459b8a4644755a84920d38c
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 28 17:02:55 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 09:54:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c2843d1

dev-python/xcffib: remove unused patch

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../xcffib/files/xcffib-0.10.0-testing.patch       | 23 ----------------------
 1 file changed, 23 deletions(-)

diff --git a/dev-python/xcffib/files/xcffib-0.10.0-testing.patch b/dev-python/xcffib/files/xcffib-0.10.0-testing.patch
deleted file mode 100644
index 7c075ae9811..00000000000
--- a/dev-python/xcffib/files/xcffib-0.10.0-testing.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/xcffib/testing.py b/xcffib/testing.py
-index ef0268a..0662fcf 100644
---- a/xcffib/testing.py
-+++ b/xcffib/testing.py
-@@ -31,11 +31,14 @@ def lock_path(display):
- def find_display():
-     display = 10
-     while True:
--        f = open(lock_path(display), "w+")
-         try:
--            fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
--        except OSError:
--            f.close()
-+            f = open(lock_path(display), "w+")
-+            try:
-+                fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
-+            except:
-+                f.close()
-+                raise
-+        except OSError:
-             display += 1
-             continue
-         return display, f

[gentoo-commits] repo/gentoo:master commit in: dev-python/xcffib/files/

[Conrad Kostecki]

commit:     adc6046b0ba4feffb99b0479904487c9776d01e5
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Sep 19 16:19:30 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 14:38:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc6046b

dev-python/xcffib: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/17602
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../xcffib/files/xcffib-0.4.2-test-imports.patch   | 35 ----------------------
 1 file changed, 35 deletions(-)

diff --git a/dev-python/xcffib/files/xcffib-0.4.2-test-imports.patch b/dev-python/xcffib/files/xcffib-0.4.2-test-imports.patch
deleted file mode 100644
index da33bf3934c..00000000000
--- a/dev-python/xcffib/files/xcffib-0.4.2-test-imports.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Relative imports don't work because the test dir isn't a proper python module.
-
---- xcffib-0.4.2/test/test_connection.py
-+++ xcffib-0.4.2/test/test_connection.py
-@@ -20,7 +20,7 @@
- 
- from xcffib import ffi
- from xcffib.testing import XvfbTest
--from .testing import XcffibTest
-+from testing import XcffibTest
- 
- from nose.tools import raises
- from nose import SkipTest
---- xcffib-0.4.2/test/test_fakeinput.py
-+++ xcffib-0.4.2/test/test_fakeinput.py
-@@ -2,7 +2,7 @@
- import xcffib.xproto
- import xcffib.xtest
- 
--from .testing import XcffibTest
-+from testing import XcffibTest
- 
- class TestConnection(XcffibTest):
-     def test_fakeinput(self):
---- xcffib-0.4.2/test/test_python_code.py
-+++ xcffib-0.4.2/test/test_python_code.py
-@@ -18,7 +18,7 @@
- import struct
- from xcffib.xproto import EventMask
- 
--from .testing import XcffibTest
-+from testing import XcffibTest
- 
- class TestPythonCode(XcffibTest):
-