[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/keyboard
From:       Andriy Rysin <arysin () gmail ! com>
Date:       2010-08-19 23:32:18
Message-ID: 20100819233218.49835AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1165688 by rysin:

fix detecting xkb rules directory (BUG 248096)

 M  +9 -1      xkb_rules.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/keyboard/xkb_rules.cpp #1165687:1165688
@@ -144,11 +144,19 @@
 
 		QString base(XLIBDIR);
 		if( base.count('/') >= 3 ) {
-			QDir baseDir(base + "/../../share/X11");
+			// .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb
+			QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11";
+			QDir baseDir(base + delta);
 			if( baseDir.exists() ) {
 				xkbParentDir = baseDir.absolutePath();
 			}
+			else {
+				QDir baseDir(base + "/X11");	// .../usr/X11/lib/X11/xkb (old XFree)
+				if( baseDir.exists() ) {
+					xkbParentDir = baseDir.absolutePath();
 		}
+			}
+		}
 
 		if( xkbParentDir.isEmpty() ) {
 			xkbParentDir = "/usr/share/X11";
[prev in list] [next in list] [prev in thread] [next in thread]