diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-07-22 06:14:28 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-07-22 06:14:28 +0800 |
| commit | d06e076bbd250cea5887e7a06dbd6b1b19abaa4d (patch) | |
| tree | fa2af9c458b8a1e5f91105eb93ba7bb21d958c67 | |
| parent | d75330536b73da83facbc8c09540ddc90d682fbb (diff) | |
| download | marcuscom-ports-d06e076bbd250cea5887e7a06dbd6b1b19abaa4d.tar marcuscom-ports-d06e076bbd250cea5887e7a06dbd6b1b19abaa4d.tar.gz marcuscom-ports-d06e076bbd250cea5887e7a06dbd6b1b19abaa4d.tar.bz2 marcuscom-ports-d06e076bbd250cea5887e7a06dbd6b1b19abaa4d.tar.lz marcuscom-ports-d06e076bbd250cea5887e7a06dbd6b1b19abaa4d.tar.xz marcuscom-ports-d06e076bbd250cea5887e7a06dbd6b1b19abaa4d.tar.zst marcuscom-ports-d06e076bbd250cea5887e7a06dbd6b1b19abaa4d.zip | |
It seems to me that XklEngineFeatures should be a G_FLAGS_CLASS instead of
a G_ENUM_CLASS. Doing so fixes an assertion crash in gdm.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12495 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/libxklavier/Makefile | 3 | ||||
| -rw-r--r-- | x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c | 27 |
2 files changed, 29 insertions, 1 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index e5726c215..eaae88780 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -3,11 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libxklavier/Makefile,v 1.49 2009/07/04 15:04:16 kwm Exp $ +# $MCom: ports/x11/libxklavier/Makefile,v 1.50 2009/07/19 19:46:48 marcus Exp $ # PORTNAME= libxklavier PORTVERSION= 4.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME diff --git a/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c b/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c new file mode 100644 index 000000000..f74930317 --- /dev/null +++ b/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c @@ -0,0 +1,27 @@ +--- libxklavier/xkl-enum-types.c.orig 2009-07-21 18:10:01.000000000 -0400 ++++ libxklavier/xkl-enum-types.c 2009-07-21 18:10:04.000000000 -0400 +@@ -21,9 +21,9 @@ xkl_engine_state_change_get_type (void) + GType + xkl_engine_features_get_type (void) + { +- static GType etype = 0; +- if (etype == 0) { +- static const GEnumValue values[] = { ++ static GType ftype = 0; ++ if (ftype == 0) { ++ static const GFlagsValue values[] = { + { XKLF_CAN_TOGGLE_INDICATORS, "XKLF_CAN_TOGGLE_INDICATORS", "can-toggle-indicators" }, + { XKLF_CAN_OUTPUT_CONFIG_AS_ASCII, "XKLF_CAN_OUTPUT_CONFIG_AS_ASCII", "can-output-config-as-ascii" }, + { XKLF_CAN_OUTPUT_CONFIG_AS_BINARY, "XKLF_CAN_OUTPUT_CONFIG_AS_BINARY", "can-output-config-as-binary" }, +@@ -32,9 +32,9 @@ xkl_engine_features_get_type (void) + { XKLF_DEVICE_DISCOVERY, "XKLF_DEVICE_DISCOVERY", "device-discovery" }, + { 0, NULL, NULL } + }; +- etype = g_enum_register_static ("XklEngineFeatures", values); ++ ftype = g_flags_register_static ("XklEngineFeatures", values); + } +- return etype; ++ return ftype; + } + GType + xkl_engine_listen_modes_get_type (void) |