summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/cairocffi/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/cairocffi/files')
-rw-r--r--dev-python/cairocffi/files/cairocffi-0.7.1-test.patch58
-rw-r--r--dev-python/cairocffi/files/mapping.patch10
2 files changed, 68 insertions, 0 deletions
diff --git a/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch b/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch
new file mode 100644
index 000000000000..b5a2b4530fb8
--- /dev/null
+++ b/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch
@@ -0,0 +1,58 @@
+ cairocffi/test_cairo.py | 3 +--
+ cairocffi/test_xcb.py | 13 +++++++------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/cairocffi/test_cairo.py b/cairocffi/test_cairo.py
+index 6b19ee1..542103d 100644
+--- a/cairocffi/test_cairo.py
++++ b/cairocffi/test_cairo.py
+@@ -1049,7 +1049,7 @@ def test_font_options():
+ options_1.merge(options_2)
+ assert options_2 == options_1
+
+-
++#@pytest.skip("https://github.com/SimonSapin/cairocffi/issues/65")
+ def test_glyphs():
+ surface = ImageSurface(cairocffi.FORMAT_ARGB32, 100, 20)
+ context = Context(surface)
+@@ -1064,7 +1064,6 @@ def test_glyphs():
+ assert 5 == x1 < x2 < x3
+ assert clusters == [(2, 1), (1, 1), (1, 1)]
+ assert is_backwards == 0
+- assert font.glyph_extents(glyphs) == font.text_extents(text)
+ assert font.glyph_extents(glyphs) == context.glyph_extents(glyphs)
+
+ assert context.copy_path() == []
+diff --git a/cairocffi/test_xcb.py b/cairocffi/test_xcb.py
+index c8a6e70..0c6bab9 100644
+--- a/cairocffi/test_xcb.py
++++ b/cairocffi/test_xcb.py
+@@ -118,14 +118,14 @@ def test_xcb_pixmap(xcb_conn):
+ gc = create_gc(xcb_conn)
+
+ # create XCB surface on pixmap
+- root_visual = find_root_visual(xcb_conn)
+- surface = XCBSurface(xcb_conn, pixmap, root_visual, width, height)
+- assert surface
++ # root_visual = find_root_visual(xcb_conn)
++ # surface = XCBSurface(xcb_conn, pixmap, root_visual, width, height)
++ # assert surface
+
+ # use xcb surface to create context, draw white
+- ctx = Context(surface)
+- ctx.set_source_rgb(1, 1, 1)
+- ctx.paint()
++ # ctx = Context(surface)
++ # ctx.set_source_rgb(1, 1, 1)
++ # ctx.paint()
+
+ # map the window and wait for it to appear
+ xcb_conn.core.MapWindow(wid)
+@@ -157,6 +157,7 @@ def test_xcb_pixmap(xcb_conn):
+
+ @pytest.mark.xfail(cairo_version() < 11200,
+ reason="Cairo version too low")
++@pytest.skip("https://github.com/SimonSapin/cairocffi/issues/65")
+ def test_xcb_window(xcb_conn):
+ width = 10
+ height = 10
diff --git a/dev-python/cairocffi/files/mapping.patch b/dev-python/cairocffi/files/mapping.patch
new file mode 100644
index 000000000000..14cae286617c
--- /dev/null
+++ b/dev-python/cairocffi/files/mapping.patch
@@ -0,0 +1,10 @@
+diff -ur cairocffi-0.5.3.orig/docs/conf.py cairocffi-0.5.3/docs/conf.py
+--- docs/conf.py 2013-05-24 10:33:32.000000000 +0800
++++ docs/conf.py 2014-04-08 16:09:39.648229837 +0800
+@@ -14,6 +14,3 @@
+ exclude_patterns = ['_build']
+ autodoc_member_order = 'bysource'
+ autodoc_default_flags = ['members']
+-intersphinx_mapping = {
+- 'http://docs.python.org/': None,
+- 'http://cairographics.org/documentation/pycairo/2/': None}