diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2007-02-27 21:02:53 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2007-02-27 21:02:53 +0000 |
| commit | 071c659525284ec225f5672ba384345a831a5bae (patch) | |
| tree | ec3561f730695c28da0b4485b1c723dfc11b6268 /x11 | |
| parent | 9f02d13ad4183447b25374037a2f4f9edd77836e (diff) | |
| download | ports-071c659525284ec225f5672ba384345a831a5bae.tar.gz ports-071c659525284ec225f5672ba384345a831a5bae.zip | |
Fix the crash when navigate in System->Preferences->Keyboard. Bump the
PORTREVISION.
PR: ports/108967
Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=370038
Obtained from: fd.org CVS
Submitted by: Mark Evenson <mark.evenson@gmx.at>
Notes
Notes:
svn path=/head/; revision=186162
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libxklavier/Makefile | 2 | ||||
| -rw-r--r-- | x11/libxklavier/files/patch-libxklavier_xklavier_config.c | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index edd0cce86de7..ea20a7162988 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -8,7 +8,7 @@ PORTNAME= libxklavier PORTVERSION= 2.91 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c index 889c14b89d85..fe26e5ca94ed 100644 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c +++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c @@ -1,5 +1,14 @@ ---- libxklavier/xklavier_config.c 2006-04-15 22:04:38.000000000 -0400 -+++ libxklavier/xklavier_config.c 2006-07-08 10:15:17.000000000 -0400 +--- libxklavier/xklavier_config.c.orig Sat Apr 15 21:04:38 2006 ++++ libxklavier/xklavier_config.c Tue Feb 27 14:57:27 2007 +@@ -243,7 +243,7 @@ + return FALSE; + + nodes = xpath_obj->nodesetval; +- if (nodes != NULL && nodes->nodeTab != NULL) { ++ if (nodes != NULL && nodes->nodeTab != NULL && nodes->nodeNr > 0) { + rv = xkl_read_config_item(*nodes->nodeTab, pitem); + if (pnode != NULL) { + *pnode = *nodes->nodeTab; @@ -275,7 +275,11 @@ gchar * xkl_strings_concat_comma_separated(gchar ** array) |