aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2005-12-10 05:08:59 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2005-12-10 05:08:59 +0000
commit1d8370170deca4984177bad93ba8274083d7966f (patch)
tree9abf3b140867b51fffbc675fb5bb1f2e274affb9
parent98b5b02a7284fb2a1cd190e165f5ed55d7599e18 (diff)
downloadports-1d8370170deca4984177bad93ba8274083d7966f.tar.gz
ports-1d8370170deca4984177bad93ba8274083d7966f.zip
Correct a problem setting GNOME keyboard layout options at login time.
Obtained from: http://bugzilla.gnome.org/show_bug.cgi?id=322955 Reported by: many
Notes
Notes: svn path=/head/; revision=150773
-rw-r--r--x11/libxklavier/Makefile2
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_config_xkb.c11
2 files changed, 12 insertions, 1 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index ac259d070eeb..4ca2826e3529 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libxklavier
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_xkb.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_xkb.c
new file mode 100644
index 000000000000..718086305784
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config_xkb.c
@@ -0,0 +1,11 @@
+--- libxklavier/xklavier_config_xkb.c.orig Sat Dec 10 00:04:07 2005
++++ libxklavier/xklavier_config_xkb.c Sat Dec 10 00:04:41 2005
+@@ -223,7 +223,7 @@ static XkbDescPtr _XklConfigGetKeyboard(
+ exit( 1 );
+ default:
+ /* parent */
+- pid = wait( &status );
++ pid = waitpid( cpid, &status, 0 );
+ XklDebug( 150, "Return status of %d (well, started %d): %d\n", pid, cpid, status );
+ memset( (char *)&result, 0, sizeof(result) );
+ result.xkb = XkbAllocKeyboard();