diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-07-06 12:28:14 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-07-06 12:28:14 +0800 |
| commit | 9237c64641f03b3cd2eb662103af17379968c315 (patch) | |
| tree | 8a0da0c58705bacdb7e9ed6a8521125ad503ce82 /sysutils | |
| parent | 2531130671f9be4ddb443165d16caae118fc9cac (diff) | |
| download | marcuscom-ports-9237c64641f03b3cd2eb662103af17379968c315.tar marcuscom-ports-9237c64641f03b3cd2eb662103af17379968c315.tar.gz marcuscom-ports-9237c64641f03b3cd2eb662103af17379968c315.tar.bz2 marcuscom-ports-9237c64641f03b3cd2eb662103af17379968c315.tar.lz marcuscom-ports-9237c64641f03b3cd2eb662103af17379968c315.tar.xz marcuscom-ports-9237c64641f03b3cd2eb662103af17379968c315.tar.zst marcuscom-ports-9237c64641f03b3cd2eb662103af17379968c315.zip | |
Merge a patch from GNOME git to fix the build with libklavier 4.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12418 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gnome-settings-daemon/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/gnome-settings-daemon/files/patch-plugins_keyboard_gsd-keyboard-xkb.c | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index c67d39b9e..f25c39edf 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -3,12 +3,12 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.40 2009/06/15 13:47:54 kwm Exp $ +# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.41 2009/06/16 21:11:50 marcus Exp $ # PORTNAME= gnome-settings-daemon PORTVERSION= 2.27.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_keyboard_gsd-keyboard-xkb.c b/sysutils/gnome-settings-daemon/files/patch-plugins_keyboard_gsd-keyboard-xkb.c new file mode 100644 index 000000000..63ce99445 --- /dev/null +++ b/sysutils/gnome-settings-daemon/files/patch-plugins_keyboard_gsd-keyboard-xkb.c @@ -0,0 +1,11 @@ +--- plugins/keyboard/gsd-keyboard-xkb.c.orig 2009-07-06 00:18:53.000000000 -0400 ++++ plugins/keyboard/gsd-keyboard-xkb.c 2009-07-06 00:19:27.000000000 -0400 +@@ -168,7 +168,7 @@ filter_xkb_config (void) + xkl_debug (100, "Filtering configuration against the registry\n"); + if (!xkl_registry) { + xkl_registry = xkl_config_registry_get_instance (xkl_engine); +- if (!xkl_config_registry_load (xkl_registry)) { ++ if (!xkl_config_registry_load (xkl_registry, TRUE)) { + g_object_unref (xkl_registry); + xkl_registry = NULL; + return FALSE; |