Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump minimum lgi dependency to 0.7.0 

Before commit 1b2826 in lgi, the get_rgba() function on cairo SolidPatterns was
specified like this:

    get_rgba = { ret = cairo.Status,
                 { ti.double, dir = 'out' },
                 { ti.double, dir = 'out' },
                 { ti.double, dir = 'out' } },

The above commit fixed this (without saying so) and the code became:

    get_rgba = { ret = cairo.Status,
                 { ti.double, dir = 'out' },
                 { ti.double, dir = 'out' },
                 { ti.double, dir = 'out' },
                 { ti.double, dir = 'out' } },

The prototype for the corresponding cairo function is:

cairo_public cairo_status_t
cairo_pattern_get_rgba (cairo_pattern_t *pattern,
                        double *red, double *green,
                        double *blue, double *alpha);

As you see, this functions gets four double* as arguments and it will save its
result via those pointers. Old versions of lgi call this function with too few
arguments and this will cause a segmentation fault when cairo dereferences an
invalid pointer.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2014-03-17 17:52:09 +01:00
parent 7c3702e60a
commit 41bc77d64c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build-utils/lgi-check.sh
View File

@ -25,7 +25,8 @@ die()
lua -e 'require("lgi")' || die lua -e 'require("lgi")' || die
# Check the version number # Check the version number
lua -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) <= 0.5 then error("lgi too old, need at least version 0.6.1") end' || die # Keep this in sync with lib/gears/surface.lua.in!
lua -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die
# Check for the needed gi files # Check for the needed gi files
lua -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die lua -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die

7
lib/gears/surface.lua.in
View File

@ -9,11 +9,10 @@ local type = type
local capi = { awesome = awesome } local capi = { awesome = awesome }
local cairo = require("lgi").cairo local cairo = require("lgi").cairo
-- This checks for '<= 0.5' because there are git versions after 0.6 which still -- Keep this in sync with build-utils/lgi-check.sh!
-- identify themselves as 0.6 but already have the needed cairo support
local ver_major, ver_minor = string.match(require('lgi.version'), '(%d)%.(%d)') local ver_major, ver_minor = string.match(require('lgi.version'), '(%d)%.(%d)')
if ( (tonumber(ver_major)<=0) and (tonumber(ver_minor)<=5) ) then if tonumber(ver_major) <= 0 and tonumber(ver_minor) < 7 then
error("lgi too old, need at least version 0.6.1") error("lgi too old, need at least version 0.7.0")
end end
-- gears.surface -- gears.surface