Jayson Willson <[email protected]> writes:

> Hello everybody.
> I have tried to apply some commits from "master" git branch to "3.5"
> and I have an error during compilation. Commits:
> d8b73de7397bb3293637acbe64a84d8e0fbf9086
> 996f6785a885349855a1233113ba092816175843
> d9b1d5490cd0ef18578d969153ecab1f9e1f53a5
> 19137a55c3c2c80d77f7d9993292acc3784cbe35
> 372d12ee316e665107b335b850e93e93e9094b33
> e2562227ab8f123a526cf0a1478c2d37d25d1e02
> 7d88aebbf912d449402458d0563497f6f73087fb
> f50ed9a1e8a665868e4c2cfb5cc9b65c36866a14
> 835c13bd8054ce11fcc84b94537b0f9da6726aad
> 594c01dc361d17d88dacae61efaef28c1705e8ef
> After resolving git conflicts (which was easy!), I get the following
> compilation error:
> Linking C executable awesome
> CMakeFiles/awesome.dir/xkb.c.o: In function `event_handle_xkb_notify':
> xkb.c:190: undefined reference to `globalconf_get_lua_State'
> collect2: error: ld returned 1 exit status
>
> Could you please help me to resolve this problem? Thank you.

Dear Jayson.

It seems that you forgot to cherry-pick commit
e5120e1beca98b56b526d3196089dd26259bb3df, where globalconf.L was
replaced by globalconf_get_lua_State(). You may either cherry pick it or
you may replace call of globalconf_get_lua_State for 'globalconf.L' in xkb.c.

-- 
To unsubscribe, send mail to [email protected].

Reply via email to