From kde-panel-devel Tue Jun 30 18:21:19 2015 From: "Hrvoje Senjan" Date: Tue, 30 Jun 2015 18:21:19 +0000 To: kde-panel-devel Subject: Re: Review Request 124215: Explicitly look for XKB instead of juggling paths in base of a prefix Message-Id: <20150630182119.7067.52868 () mimi ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-panel-devel&m=143568852307534 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--===============1467596483735717922==" --===============1467596483735717922== Content-Type: multipart/alternative; boundary="===============5879558422247491084==" --===============5879558422247491084== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/124215/#review81912 ----------------------------------------------------------- IMO best would be to use pkg-config to query for xkb_base variable... (if xkeyboard-config is really needed during buildtime) - Hrvoje Senjan On June 30, 2015, 4:53 p.m., Aleix Pol Gonzalez wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/124215/ > ----------------------------------------------------------- > > (Updated June 30, 2015, 4:53 p.m.) > > > Review request for Plasma. > > > Bugs: 349658 > https://bugs.kde.org/show_bug.cgi?id=349658 > > > Repository: plasma-desktop > > > Description > ------- > > Instead of looking for X11 libraries and then looking stuff up, just find the directory we're looking for. > Also drop XBINDIR, as it wasn't being used at all. > > Should give something like this directory: > ``` > $ ls /usr/share/X11/xkb/ > compat geometry keycodes rules symbols types > ``` > > > Diffs > ----- > > kcms/keyboard/xkb_rules.cpp 9fd0324 > ConfigureChecks.cmake 4fc4bce > config-workspace.h.cmake eda8996 > > Diff: https://git.reviewboard.kde.org/r/124215/diff/ > > > Testing > ------- > > re-compiled on my system, everything still works. > > > Thanks, > > Aleix Pol Gonzalez > > --===============5879558422247491084== MIME-Version: 1.0 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: 7bit

This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/124215/

IMO best would be to use pkg-config to query for xkb_base variable... (if xkeyboard-config is really needed during buildtime)

- Hrvoje Senjan

On June 30th, 2015, 4:53 p.m. CEST, Aleix Pol Gonzalez wrote:

Review request for Plasma.

By Aleix Pol Gonzalez.

Updated June 30, 2015, 4:53 p.m.

Bugs: 349658

Repository: plasma-desktop

Description

Instead of looking for X11 libraries and then looking stuff up, just find the directory we're looking for. Also drop XBINDIR, as it wasn't being used at all.

Should give something like this directory:

$ ls /usr/share/X11/xkb/
compat  geometry  keycodes  rules  symbols  types

Testing

re-compiled on my system, everything still works.

Diffs

kcms/keyboard/xkb_rules.cpp (9fd0324)
ConfigureChecks.cmake (4fc4bce)
config-workspace.h.cmake (eda8996)

View Diff

--===============5879558422247491084==-- --===============1467596483735717922== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KUGxhc21hLWRl dmVsIG1haWxpbmcgbGlzdApQbGFzbWEtZGV2ZWxAa2RlLm9yZwpodHRwczovL21haWwua2RlLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL3BsYXNtYS1kZXZlbAo= --===============1467596483735717922==--