head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.1.0.8
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.6
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.4
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.2
	pkgsrc-2011Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.03.19.19.44.02;	author markd;	state dead;
branches;
next	1.1;

1.1
date	2011.01.18.10.59.13;	author markd;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to KDE SC 4.8.0

add kactivities
rename kdebase4 -> kde-baseapps4
rename kdebase-runtime4 -> kde-runtime4
rename kdebase-workspace4 -> kde-workspace4
rename kdebindings4-python -> py-kde4
@
text
@$NetBSD: patch-ah,v 1.1 2011/01/18 10:59:13 markd Exp $

Handle location of xkb/rules in NetBSD's intree X11R7
(/usr/X11R7/lib/X11/xkb/rules)

--- kcontrol/keyboard/xkb_rules.cpp.orig	2010-08-27 10:10:21.000000000 +0200
+++ kcontrol/keyboard/xkb_rules.cpp	2011-01-11 21:47:03.000000000 +0100
@@@@ -138,12 +138,18 @@@@
 {
 	QString rulesFile;
 	QString rulesName = Rules::getRulesName();
+	QString xkbRulesSubDir = "xkb/rules";
 
 	if ( ! rulesName.isNull() ) {
 		QString xkbParentDir;
 
 		QString base(XLIBDIR);
 		if( base.count('/') >= 3 ) {
+			// /usr/X11R7/lib/X11 with xkb/rules subdirectory below it
+			QDir xkbRulesDir(base + "/" + xkbRulesSubDir);
+			if( xkbRulesDir.exists() ) {
+				xkbParentDir = base;
+			} else {
 			// .../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);
@@@@ -157,12 +163,13 @@@@
 				}
 			}
 		}
+		}
 
 		if( xkbParentDir.isEmpty() ) {
 			xkbParentDir = "/usr/share/X11";
 		}
 
-		rulesFile = QString("%1/xkb/rules/%2.xml").arg(xkbParentDir, rulesName);
+		rulesFile = QString("%1/%2/%3.xml").arg(xkbParentDir, xkbRulesSubDir, rulesName);
 	}
 
 	return rulesFile;
@


1.1
log
@Fix finding Xkb rules file in intree X11R7 case (PR#44364)
Fix path to iso-codes (PR#44364)
Fix perms on kcheckpass (noted by David Brownlee)
Bump PKGREVISION
@
text
@d1 1
a1 1
$NetBSD$
@