From 6c9f7e2742ba626ccea92874782b2c25f9e292bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 30 Aug 2018 21:52:05 +0200 Subject: [PATCH] python.pkgs.cairocffi: remove superfluous patch --- .../cairocffi-0.8.1-cairo-1.15.12.patch | 24 ------------------- .../python-modules/cairocffi/default.nix | 1 - 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/python-modules/cairocffi/cairocffi-0.8.1-cairo-1.15.12.patch diff --git a/pkgs/development/python-modules/cairocffi/cairocffi-0.8.1-cairo-1.15.12.patch b/pkgs/development/python-modules/cairocffi/cairocffi-0.8.1-cairo-1.15.12.patch deleted file mode 100644 index 4d142275b9e8..000000000000 --- a/pkgs/development/python-modules/cairocffi/cairocffi-0.8.1-cairo-1.15.12.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/cairocffi/test_cairo.py b/cairocffi/test_cairo.py -index 1588349..5452910 100644 ---- a/cairocffi/test_cairo.py -+++ b/cairocffi/test_cairo.py -@@ -292,7 +292,8 @@ def test_pdf_surface(): - pdf_bytes = file_obj.getvalue() - assert pdf_bytes.startswith(b'%PDF') - assert b'/MediaBox [ 0 0 123 432 ]' in pdf_bytes -- assert pdf_bytes.count(b'/Type /Page\n') == 1 -+ assert pdf_bytes.count(b'/Type /Pages') == 1 -+ assert pdf_bytes.count(b'/Type /Page') == 2 - - file_obj = io.BytesIO() - surface = PDFSurface(file_obj, 1, 1) -@@ -306,7 +307,8 @@ def test_pdf_surface(): - assert b'/MediaBox [ 0 0 1 1 ]' not in pdf_bytes - assert b'/MediaBox [ 0 0 12 100 ]' in pdf_bytes - assert b'/MediaBox [ 0 0 42 700 ]' in pdf_bytes -- assert pdf_bytes.count(b'/Type /Page\n') == 2 -+ assert pdf_bytes.count(b'/Type /Pages') == 1 -+ assert pdf_bytes.count(b'/Type /Page') == 3 - - - def test_svg_surface(): diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 39799daca215..bdd11fb3de6f 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -49,7 +49,6 @@ buildPythonPackage rec { gdk_pixbuf = gdk_pixbuf.out; }) ./fix_test_scaled_font.patch - ./cairocffi-0.8.1-cairo-1.15.12.patch ]; meta = with lib; {