diff options
| author | aneejit1 <aneejit1@gmail.com> | 2020-07-03 01:39:21 +0000 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-07-29 17:18:20 +0200 |
| commit | f81582deb338e236982cf536d691a80df2111a99 (patch) | |
| tree | 3f8527d41e6810a275866478d10cdcf8bc6827ff /kxkb | |
| parent | 2d68c6e6474bf5c3ee4d0e988822331b1e9aee0d (diff) | |
| download | tdebase-f81582deb338e236982cf536d691a80df2111a99.tar.gz tdebase-f81582deb338e236982cf536d691a80df2111a99.zip | |
Ask pkg-config/find_file where we can find the X11 Xkb rules directory and add some more candidate paths for xkbd to search
Signed-off-by: aneejit1 <aneejit1@gmail.com>
(cherry picked from commit 3abd9e912c4b1ed6abd0ff1f440f2105fcbdf4a2)
Diffstat (limited to 'kxkb')
| -rw-r--r-- | kxkb/x11helper.cpp | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp index aa39845dd..1c8db4a4a 100644 --- a/kxkb/x11helper.cpp +++ b/kxkb/x11helper.cpp @@ -22,20 +22,37 @@ // Compiler will size array automatically. static const char* X11DirList[] = { +#ifdef X11_XKB_RULES_DIR + X11_XKB_RULES_DIR, +#endif XLIBDIR, "/usr/share/X11/", - "/etc/X11/", - "/usr/local/share/X11/", + "/usr/lib/X11/", + "/usr/lib64/X11/", + "/usr/X11/share/X11/", + "/usr/X11/lib/X11/", + "/usr/X11/lib64/X11/", + "/usr/X11R7/share/X11/", + "/usr/X11R7/lib/X11/", + "/usr/X11R7/lib64/X11/", + "/usr/X11R6/share/X11/", "/usr/X11R6/lib/X11/", "/usr/X11R6/lib64/X11/", + "/usr/local/X11/share/X11/", + "/usr/local/X11/lib/X11/", + "/usr/local/X11/lib64/X11/", + "/usr/local/X11R7/share/X11/", + "/usr/local/X11R7/lib/X11/", + "/usr/local/X11R7/lib64/X11/", + "/usr/local/X11R6/share/X11/", "/usr/local/X11R6/lib/X11/", "/usr/local/X11R6/lib64/X11/", - "/usr/lib/X11/", - "/usr/lib64/X11/", + "/usr/local/share/X11/", "/usr/local/lib/X11/", "/usr/local/lib64/X11/", "/usr/pkg/share/X11/", - "/usr/pkg/xorg/lib/X11/" + "/usr/pkg/xorg/lib/X11/", + "/etc/X11/" }; // Compiler will size array automatically. |