nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'gtk-im-modules'

This commit is contained in:
Ricardo Wurmus 2016-09-04 08:19:10 +02:00
parent df90106610 234e7980b5
commit 69913ed0e6
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
4 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/local.mk
View File

@ -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 \

4
gnu/packages/gtk.scm
View File

@ -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)

15
gnu/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch Normal file
View File

@ -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)

15
gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch Normal file
View File

@ -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)