diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2016-08-24 23:01:11 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2016-08-28 09:55:36 +0200 |
| commit | 234e7980b54ef37e9a24440ec7219c81d6288a71 (patch) | |
| tree | 38bab37c29092734280221d3a6875b09a37425d8 | |
| parent | 711670c04faec02f1c4cccf78a66c90bc7cdfa6e (diff) | |
| download | guix-234e7980b54ef37e9a24440ec7219c81d6288a71.tar.gz | |
gnu: gtk+: Add patch to support GUIX_GTK3_IM_MODULE_FILE.
* gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch: New file. * gnu/packages/gtk.scm (gtk+)[source]: Add it. * gnu/local.mk (dist_patch_DATA): Add it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/gtk.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch | 15 |
3 files changed, 18 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index a67b00ccdf..a41ade7c4f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -553,6 +553,7 @@ dist_patch_DATA = \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk2-theme-paths.patch \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \ + %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/hdf5-config-date.patch \ %D%/packages/patches/higan-remove-march-native-flag.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e1d9cf9d6d..396ff1f1d0 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -625,7 +625,8 @@ application suites.") (sha256 (base32 "157nh9gg0p2avw765hrnkvr8lsh2w811397yxgjv6q5j4fzz6d1q")) - (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch")))) + (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" + "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) ("atk" ,atk) diff --git a/gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch b/gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch new file mode 100644 index 0000000000..aa63a54402 --- /dev/null +++ b/gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch @@ -0,0 +1,15 @@ +This patch replaces the environment variable "GTK_IM_MODULE" with +"GUIX_GTK3_IM_MODULE_FILE" to prevent this version of GTK+ from loading input +method modules for other major versions of GTK+. + +--- gtk+-3.20.3/gtk/deprecated/gtkrc.c 2016-08-21 22:40:48.168437905 +0200 ++++ gtk+-3.20.3/gtk/deprecated/gtkrc.c 2016-08-23 10:12:09.097070097 +0200 +@@ -768,7 +768,7 @@ + gchar * + gtk_rc_get_im_module_file (void) + { +- const gchar *var = g_getenv ("GTK_IM_MODULE_FILE"); ++ const gchar *var = g_getenv ("GUIX_GTK3_IM_MODULE_FILE"); + gchar *result = NULL; + + if (var) |