aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormezz <mezz@FreeBSD.org>2007-02-28 05:02:53 +0800
committermezz <mezz@FreeBSD.org>2007-02-28 05:02:53 +0800
commit2c2efd88ae28319d2b2dc622c0cf60aab9acd603 (patch)
tree3b226ef1e573256ad6f9b1978bf1cd252c236ce1
parente7df2df2b3bf9f5fa8da42b1e55e3495146c8207 (diff)
downloadfreebsd-ports-gnome-2c2efd88ae28319d2b2dc622c0cf60aab9acd603.tar.gz
freebsd-ports-gnome-2c2efd88ae28319d2b2dc622c0cf60aab9acd603.tar.zst
freebsd-ports-gnome-2c2efd88ae28319d2b2dc622c0cf60aab9acd603.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>
-rw-r--r--x11/libxklavier/Makefile2
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_config.c13
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)