diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-07-24 04:33:23 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-07-24 04:33:23 +0800 |
| commit | b15f1d149b199101455906db8d5eb893bdc2b733 (patch) | |
| tree | 6ff16c3e95a020135b0ada31be1e767abaf8f00a /x11 | |
| parent | b41f21b0518f5e38496d3939f399a4be14961e38 (diff) | |
| download | marcuscom-ports-b15f1d149b199101455906db8d5eb893bdc2b733.tar marcuscom-ports-b15f1d149b199101455906db8d5eb893bdc2b733.tar.gz marcuscom-ports-b15f1d149b199101455906db8d5eb893bdc2b733.tar.bz2 marcuscom-ports-b15f1d149b199101455906db8d5eb893bdc2b733.tar.lz marcuscom-ports-b15f1d149b199101455906db8d5eb893bdc2b733.tar.xz marcuscom-ports-b15f1d149b199101455906db8d5eb893bdc2b733.tar.zst marcuscom-ports-b15f1d149b199101455906db8d5eb893bdc2b733.zip | |
Fix a crash that can occur when starting GNOME out of VNC.
Obtained from: http://bugzilla.gnome.org/show_bug.cgi?id=346980
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6721 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libxklavier/Makefile | 5 | ||||
| -rw-r--r-- | x11/libxklavier/files/patch-libxklavier_xklavier_config.c | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index c567559b0..3f1a3ca23 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -3,13 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libxklavier/Makefile,v 1.23 2006/06/17 17:09:23 marcus Exp $ +# $MCom: ports/x11/libxklavier/Makefile,v 1.24 2006/07/18 11:55:11 ahze Exp $ # PORTNAME= libxklavier PORTVERSION= 2.91 -PORTREVISION= 1 -PORTREVISION= 1 +PORTREVISION= 2 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 new file mode 100644 index 000000000..889c14b89 --- /dev/null +++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c @@ -0,0 +1,15 @@ +--- libxklavier/xklavier_config.c 2006-04-15 22:04:38.000000000 -0400 ++++ libxklavier/xklavier_config.c 2006-07-08 10:15:17.000000000 -0400 +@@ -275,7 +275,11 @@ + gchar * + xkl_strings_concat_comma_separated(gchar ** array) + { +- return g_strjoinv(",", array); ++ if (array) { ++ return g_strjoinv(",", array); ++ } else { ++ return g_strdup(""); ++ } + } + + void |