Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package cairocffi * it drops all the depencencies on xcffib as that pkg FTBFS * it updates the VCS url, pointing to the HTTPS version (I consider this information begin updated and a valuable fix for stretch lifetime) * if fixes a random FTBFS in the test_xcb.py tests. Now, test_xcb.py is disabled because we removed xcffib from b-d (so for this upload is a no-op) but once we'll be able to add it back, it's a valuable contribution (and also it was already in git so i was somewhat lazy and left it in the upload) Source debdiff is attached unblock cairocffi/0.7.2-2 -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.2.0-1-amd64 (SMP w/8 CPU cores) Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -Nru cairocffi-0.7.2/debian/changelog cairocffi-0.7.2/debian/changelog --- cairocffi-0.7.2/debian/changelog 2015-12-10 13:02:02.000000000 -0500 +++ cairocffi-0.7.2/debian/changelog 2017-04-30 20:32:16.000000000 -0400 @@ -1,3 +1,20 @@ +cairocffi (0.7.2-2) unstable; urgency=medium + + [ Ondřej Nový ] + * Fixed VCS URL (https) + + [ Stefano Rivera ] + * Fix XCB tests (Closes: #828929) + + [ Christoph Reiter ] + * Drop Build-Depends and Recommends on xcffib and skip xcb tests + (Closes: #861175) + + [ Sandro Tosi ] + * Team upload. + + -- Sandro Tosi <[email protected]> Sun, 30 Apr 2017 20:32:16 -0400 + cairocffi (0.7.2-1) unstable; urgency=medium * New upstream release diff -Nru cairocffi-0.7.2/debian/control cairocffi-0.7.2/debian/control --- cairocffi-0.7.2/debian/control 2015-12-10 13:02:02.000000000 -0500 +++ cairocffi-0.7.2/debian/control 2017-04-30 20:32:16.000000000 -0400 @@ -10,7 +10,6 @@ python3-all, python3-setuptools, python-cffi (>= 1.1.0), python3-cffi (>= 1.1.0), - python-xcffib (>= 0.3.2), python3-xcffib (>= 0.3.2), python-sphinx | python3-sphinx, python-pytest, python3-pytest, xvfb, xauth, @@ -22,13 +21,12 @@ X-Python3-Version: >= 3.2 Standards-Version: 3.9.6 Homepage: https://pythonhosted.org/cairocffi/ -Vcs-Git: git://anonscm.debian.org/python-modules/packages/cairocffi.git +Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/cairocffi.git Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/cairocffi.git Package: python-cairocffi Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-cffi, libcairo2, libgdk-pixbuf2.0-0 -Recommends: python-xcffib (>= 0.3.2) Suggests: python-cairocffi-doc Description: cffi-based cairo bindings for Python cairocffi is a CFFI-based drop-in replacement for Pycairo, @@ -39,7 +37,6 @@ Package: python3-cairocffi Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, python3-cffi, libcairo2, libgdk-pixbuf2.0-0 -Recommends: python3-xcffib (>= 0.3.2) Suggests: python-cairocffi-doc Description: cffi-based cairo bindings for Python (Python3) cairocffi is a CFFI-based drop-in replacement for Pycairo, diff -Nru cairocffi-0.7.2/debian/.git-dpm cairocffi-0.7.2/debian/.git-dpm --- cairocffi-0.7.2/debian/.git-dpm 2015-12-10 13:02:02.000000000 -0500 +++ cairocffi-0.7.2/debian/.git-dpm 2017-04-30 20:32:16.000000000 -0400 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -c60e548d413fe20495a53d6e5059d3805cb8f00b -c60e548d413fe20495a53d6e5059d3805cb8f00b +72067bb5a6d92564284f5a6a94369f24cd4405bb +72067bb5a6d92564284f5a6a94369f24cd4405bb 442c25e12a2070d915ac16d4daba19575babe9fa 442c25e12a2070d915ac16d4daba19575babe9fa cairocffi_0.7.2.orig.tar.gz diff -Nru cairocffi-0.7.2/debian/patches/fix-xcb-tests.patch cairocffi-0.7.2/debian/patches/fix-xcb-tests.patch --- cairocffi-0.7.2/debian/patches/fix-xcb-tests.patch 1969-12-31 19:00:00.000000000 -0500 +++ cairocffi-0.7.2/debian/patches/fix-xcb-tests.patch 2017-04-30 20:32:16.000000000 -0400 @@ -0,0 +1,66 @@ +From 72067bb5a6d92564284f5a6a94369f24cd4405bb Mon Sep 17 00:00:00 2001 +From: Sean Vig <[email protected]> +Date: Tue, 6 Sep 2016 22:38:14 -0700 +Subject: Fix XCB tests + +Make sure XCB objects are free'd, and cffi objects set to None so they +are gc'd and destroyed before the connection is disconnected. + +Origin: https://github.com/Kozea/cairocffi/pull/68 +Bug-Debian: https://bugs.debian.org/828929 + +Patch-Name: fix-xcb-tests.patch +--- + cairocffi/test_xcb.py | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/cairocffi/test_xcb.py b/cairocffi/test_xcb.py +index c8a6e70..1aa5123 100644 +--- a/cairocffi/test_xcb.py ++++ b/cairocffi/test_xcb.py +@@ -87,6 +87,10 @@ def create_pixmap(conn, wid, width, height): + return pixmap + + ++def remove_pixmap(conn, pixmap): ++ conn.core.FreePixmap(pixmap) ++ ++ + def create_gc(conn): + """Creates a simple graphics context""" + gc = conn.generate_id() +@@ -104,8 +108,10 @@ def create_gc(conn): + return gc + + [email protected](cairo_version() < 11200, +- reason="Cairo version too low") ++def remove_gc(conn, gc): ++ conn.core.FreeGC(gc) ++ ++ + def test_xcb_pixmap(xcb_conn): + width = 10 + height = 10 +@@ -149,6 +155,11 @@ def test_xcb_pixmap(xcb_conn): + width, height + ) + ++ ctx = None ++ surface = None ++ remove_gc(xcb_conn, gc) ++ remove_pixmap(xcb_conn, pixmap) ++ + # flush the connection, make sure no errors were thrown + xcb_conn.flush() + while event: +@@ -220,6 +231,9 @@ def test_xcb_window(xcb_conn): + ctx.set_source_rgb(1, 1, 1) + ctx.paint() + ++ ctx = None ++ surface = None ++ + # flush the connection, make sure no errors were thrown + xcb_conn.flush() + while event: diff -Nru cairocffi-0.7.2/debian/patches/series cairocffi-0.7.2/debian/patches/series --- cairocffi-0.7.2/debian/patches/series 2015-12-10 13:02:02.000000000 -0500 +++ cairocffi-0.7.2/debian/patches/series 2017-04-30 20:32:16.000000000 -0400 @@ -1,2 +1,3 @@ fix_import_sphinxdoc.patch use_local_objects.inv.patch +fix-xcb-tests.patch diff -Nru cairocffi-0.7.2/debian/rules cairocffi-0.7.2/debian/rules --- cairocffi-0.7.2/debian/rules 2015-12-10 13:02:02.000000000 -0500 +++ cairocffi-0.7.2/debian/rules 2017-04-30 20:32:16.000000000 -0400 @@ -5,6 +5,7 @@ export PYBUILD_NAME=cairocffi export PYBUILD_TEST_PYTEST=1 +export PYBUILD_TEST_ARGS=-k "not test_xcb.py" export PYBUILD_AFTER_TEST=rm -rf {build_dir}/*/__pycache__ %:
