From b23ba4e74475ed08833086b666f27bddbf97fa06 Mon Sep 17 00:00:00 2001
From: rodent <rodent>
Date: Sat, 24 May 2014 02:13:34 +0000
Subject: Updated to latest release, 0.5.4. From CHANGES:

Released on 2014-05-23.

* Stop testing with tox on Python 3.1, start on 3.4
* Start testing pushes and pull requests
  `on Travis-CI <https://travis-ci.org/SimonSapin/cairocffi>`_
* Add more variants of the library names to try with `dlopen()`.
  This seems to be necessary on OpenBSD.
---
 graphics/py-cairocffi/Makefile                     |  4 ++--
 graphics/py-cairocffi/distinfo                     |  9 ++++----
 .../py-cairocffi/patches/patch-cairocffi_pixbuf.py | 24 ----------------------
 3 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 graphics/py-cairocffi/patches/patch-cairocffi_pixbuf.py

(limited to 'graphics/py-cairocffi')

diff --git a/graphics/py-cairocffi/Makefile b/graphics/py-cairocffi/Makefile
index 87ce98a76b5..001c13af28c 100644
--- a/graphics/py-cairocffi/Makefile
+++ b/graphics/py-cairocffi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2014/05/17 13:43:41 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/24 02:13:34 rodent Exp $
 
-DISTNAME=	cairocffi-0.5.3
+DISTNAME=	cairocffi-0.5.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics python
 MASTER_SITES=	https://pypi.python.org/packages/source/c/cairocffi/
diff --git a/graphics/py-cairocffi/distinfo b/graphics/py-cairocffi/distinfo
index a1acc085ec5..63e78585989 100644
--- a/graphics/py-cairocffi/distinfo
+++ b/graphics/py-cairocffi/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1 2014/05/17 13:43:41 rodent Exp $
+$NetBSD: distinfo,v 1.2 2014/05/24 02:13:34 rodent Exp $
 
-SHA1 (cairocffi-0.5.3.tar.gz) = 28549601ae30a4be51f6db28958f65111dbde02a
-RMD160 (cairocffi-0.5.3.tar.gz) = a3159843687fe818f979563baa8db592cde9594b
-Size (cairocffi-0.5.3.tar.gz) = 71140 bytes
-SHA1 (patch-cairocffi_pixbuf.py) = 3cbc591caf75095b7316b0b932890b845e0a3bf4
+SHA1 (cairocffi-0.5.4.tar.gz) = ac4839544b0eea35d70dbbd07a86a0701bf261d2
+RMD160 (cairocffi-0.5.4.tar.gz) = 720265398bfa726c54ceb7be51f468eeb89ea115
+Size (cairocffi-0.5.4.tar.gz) = 71232 bytes
diff --git a/graphics/py-cairocffi/patches/patch-cairocffi_pixbuf.py b/graphics/py-cairocffi/patches/patch-cairocffi_pixbuf.py
deleted file mode 100644
index 6791fb0b9cf..00000000000
--- a/graphics/py-cairocffi/patches/patch-cairocffi_pixbuf.py
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-cairocffi_pixbuf.py,v 1.1 2014/05/17 13:43:41 rodent Exp $
-
-Fix shared library name search for non-{Linux,Windows} OSes.
-
---- cairocffi/pixbuf.py.orig	2013-07-01 18:17:16.000000000 +0000
-+++ cairocffi/pixbuf.py
-@@ -87,11 +87,13 @@ ffi.cdef('''
- 
- ''')
- 
--gdk_pixbuf = dlopen(ffi, 'gdk_pixbuf-2.0', 'libgdk_pixbuf-2.0-0')
--gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0')
--glib = dlopen(ffi, 'glib-2.0', 'libglib-2.0-0')
-+gdk_pixbuf = dlopen(ffi, 'gdk_pixbuf-2.0', 'libgdk_pixbuf-2.0-0', 
-+                    'libgdk_pixbuf-2.0.so')
-+gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so')
-+glib = dlopen(ffi, 'glib-2.0', 'libglib-2.0-0', 'libglib-2.0.so')
- try:
--    gdk = dlopen(ffi, 'gdk-3', 'gdk-x11-2.0', 'libgdk-win32-2.0-0')
-+    gdk = dlopen(ffi, 'gdk-3', 'gdk-x11-2.0', 'libgdk-win32-2.0-0', 
-+                 'libgdk-x11-2.0.so')
- except OSError:
-     gdk = None
- 
-- 
cgit v1.2.3