diff options
| author | 宋文武 <iyzsong@gmail.com> | 2016-04-27 21:51:32 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@gmail.com> | 2016-05-02 22:06:36 +0800 |
| commit | 6983ba5660eebedef2bd87901b9993c19c985f8b (patch) | |
| tree | 1d9251390932af30200184fcc02472d36cee12ee /gnu/packages/patches/gtk2-theme-paths.patch | |
| parent | 8563258337b240945306fc5577538bcf6408ad26 (diff) | |
| download | guix-6983ba5660eebedef2bd87901b9993c19c985f8b.tar guix-6983ba5660eebedef2bd87901b9993c19c985f8b.tar.gz | |
Revert "Revert "Merge branch 'gnome-updates'""
This reverts commit e969b140a4382fd91514439a57749379cf00f86b.
Diffstat (limited to 'gnu/packages/patches/gtk2-theme-paths.patch')
| -rw-r--r-- | gnu/packages/patches/gtk2-theme-paths.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/gnu/packages/patches/gtk2-theme-paths.patch b/gnu/packages/patches/gtk2-theme-paths.patch new file mode 100644 index 0000000000..6c1351e516 --- /dev/null +++ b/gnu/packages/patches/gtk2-theme-paths.patch @@ -0,0 +1,41 @@ +From: Jookia <166291@gmail.com> +Subject: [PATCHv2] gtk: Patch GTK+ to look for themes in profiles. +To: guix-devel@gnu.org +Date: Sun, 13 Mar 2016 15:17:37 +1100 +Url: https://lists.gnu.org/archive/html/guix-devel/2016-03/msg00492.html + +diff -Naur gtk+-2.24.28.new/gtk/gtkrc.c gtk+-2.24.28/gtk/gtkrc.c +--- gtk+-2.24.28.new/gtk/gtkrc.c 2016-03-13 10:31:14.413644362 +1100 ++++ gtk+-2.24.28/gtk/gtkrc.c 2016-03-13 12:51:34.723398423 +1100 +@@ -808,6 +808,8 @@ + gchar *path = NULL; + const gchar *home_dir; + gchar *subpath; ++ const gchar * const *xdg_data_dirs; ++ gint i; + + if (type) + subpath = g_strconcat ("gtk-2.0-", type, +@@ -830,6 +832,22 @@ + } + + if (!path) ++ { ++ xdg_data_dirs = g_get_system_data_dirs (); ++ for (i = 0; xdg_data_dirs[i]; i++) ++ { ++ path = g_build_filename (xdg_data_dirs[i], "themes", name, subpath, NULL); ++ if (g_file_test (path, G_FILE_TEST_EXISTS)) ++ break; ++ else ++ { ++ g_free (path); ++ path = NULL; ++ } ++ } ++ } ++ ++ if (!path) + { + gchar *theme_dir = gtk_rc_get_theme_dir (); + path = g_build_filename (theme_dir, name, subpath, NULL); |