gdk-pixbuf: rename from gdk_pixbuf
This commit is contained in:
@@ -3,7 +3,7 @@ Author: Alexander V. Nikolaev <avn@avnik.info>
|
||||
Date: Sat Feb 6 08:09:06 2016 +0200
|
||||
|
||||
Patch dlopen() to allow direct paths to all required libs
|
||||
|
||||
|
||||
This patch is NixOS specific
|
||||
|
||||
diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
|
||||
@@ -13,15 +13,15 @@ index 718aa7f..1a1dcff 100644
|
||||
@@ -27,20 +27,22 @@ VERSION = '0.7.2'
|
||||
version = '1.10.0'
|
||||
version_info = (1, 10, 0)
|
||||
|
||||
|
||||
+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
|
||||
+_LIBS = {
|
||||
+ 'cairo': '@cairo@/lib/libcairo@ext@',
|
||||
+ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
|
||||
+ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
|
||||
+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
|
||||
+ 'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
|
||||
+}
|
||||
|
||||
|
||||
-def dlopen(ffi, *names):
|
||||
+def dlopen(ffi, name, *names):
|
||||
"""Try various names for the same library, for different platforms."""
|
||||
@@ -42,6 +42,6 @@ index 718aa7f..1a1dcff 100644
|
||||
+ if lib:
|
||||
+ return lib
|
||||
+ raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
|
||||
|
||||
|
||||
|
||||
|
||||
cairo = dlopen(ffi, 'cairo', 'cairo-2')
|
||||
|
||||
Reference in New Issue
Block a user