Revert "Merge #34584: lgi: Fix cairo bindings search path"

In the end I merged different version than I wanted.
This reverts commit f25d21d202, reversing
changes made to af884f5607.
This commit is contained in:
Vladimír Čunát 2018-02-04 11:50:12 +01:00
parent b8dfab93cb
commit 4b3f0d8873
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 0 additions and 49 deletions

View File

@ -1,47 +0,0 @@
Reorder some code so that the cairo-gobject library is used before this tries to
dlopen("libcairo.so.2"). Since cairo-gobject depends (RT_DEPEND) on cairo, this
causes cairo to be used and so the missing search path for the dlopen() call is
not a problem.
diff --git a/lgi/override/cairo.lua b/lgi/override/cairo.lua
index ca8193f..019239b 100644
--- a/lgi/override/cairo.lua
+++ b/lgi/override/cairo.lua
@@ -20,18 +20,8 @@ local record = require 'lgi.record'
local enum = require 'lgi.enum'
local ti = ffi.types
-cairo._module = core.module('cairo', 2)
local module_gobject = core.gi.cairo.resolve
--- Versioning support.
-function cairo.version_encode(major, minor, micro)
- return 10000 * major + 100 * minor + micro
-end
-cairo.version = core.callable.new {
- addr = cairo._module.cairo_version, ret = ti.int } ()
-cairo.version_string = core.callable.new {
- addr = cairo._module.cairo_version_string, ret = ti.utf8 } ()
-
-- Load some constants.
cairo._constant = {
MIME_TYPE_JP2 = 'image/jp2',
@@ -58,6 +48,18 @@ for _, name in pairs {
end
end
+-- Load libcairo.so directly; this has to happen after the typelib was used
+cairo._module = core.module('cairo', 2)
+
+-- Versioning support.
+function cairo.version_encode(major, minor, micro)
+ return 10000 * major + 100 * minor + micro
+end
+cairo.version = core.callable.new {
+ addr = cairo._module.cairo_version, ret = ti.int } ()
+cairo.version_string = core.callable.new {
+ addr = cairo._module.cairo_version_string, ret = ti.utf8 } ()
+
-- Load definitions of all boxed records.
cairo._struct = cairo._struct or {}
for index, struct in pairs {

View File

@ -671,8 +671,6 @@ let
sed -i "s|/usr/local|$out|" lgi/Makefile sed -i "s|/usr/local|$out|" lgi/Makefile
''; '';
patches = [ ./lgi-find-cairo-through-typelib.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; description = "GObject-introspection based dynamic Lua binding to GObject based libraries";
homepage = https://github.com/pavouk/lgi; homepage = https://github.com/pavouk/lgi;