diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2016-09-04 08:19:10 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2016-09-04 08:19:10 +0200 |
| commit | 69913ed0e62692ff149e312434980c2fc2c1ac89 (patch) | |
| tree | f0c704016c323c71571534755b719b72c716f59b /gnu | |
| parent | df9010661004de19f89f777e2941b9fd35d05ed8 (diff) | |
| parent | 234e7980b54ef37e9a24440ec7219c81d6288a71 (diff) | |
| download | patches-69913ed0e62692ff149e312434980c2fc2c1ac89.tar patches-69913ed0e62692ff149e312434980c2fc2c1ac89.tar.gz | |
Merge branch 'gtk-im-modules'
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 2 | ||||
| -rw-r--r-- | gnu/packages/gtk.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch | 15 |
4 files changed, 35 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index efb00b9b07..2b5e5419ad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -552,8 +552,10 @@ dist_patch_DATA = \ %D%/packages/patches/guile-relocatable.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ + %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 8feac11d98..396ff1f1d0 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -563,6 +563,7 @@ is part of the GNOME accessibility project.") (base32 "0l6aqk86aw5w132ygy6hv6nlxvd1h6xg7c85qbm60p6mnv1ww58d")) (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch" + "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" "gtk2-theme-paths.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) @@ -624,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/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch b/gnu/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch new file mode 100644 index 0000000000..f399024f1d --- /dev/null +++ b/gnu/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch @@ -0,0 +1,15 @@ +This patch replaces the environment variable "GTK_IM_MODULE" with +"GUIX_GTK2_IM_MODULE_FILE" to prevent this version of GTK+ from loading input +method modules for other major versions of GTK+. + +--- gtk+-2.24.30/gtk/gtkrc.c 2016-08-21 22:40:22.339660438 +0200 ++++ gtk+-2.24.30/gtk/gtkrc.c 2016-08-23 10:11:11.080822710 +0200 +@@ -439,7 +439,7 @@ + gchar * + gtk_rc_get_im_module_file (void) + { +- const gchar *var = g_getenv ("GTK_IM_MODULE_FILE"); ++ const gchar *var = g_getenv ("GUIX_GTK2_IM_MODULE_FILE"); + gchar *result = NULL; + + if (var) 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) |