diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-01-13 12:14:08 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-13 12:14:08 -0500 |
| commit | a813710a5fb0822e9d95088462d70f6522fe8457 (patch) | |
| tree | 35299db4712eda92c809635716d530d085223e81 /gnu/packages/patches | |
| parent | d8cd15949092b7cd90ee1dcc4aefe87b3ba4a6fb (diff) | |
| parent | 765f0ac8f9f67f775a667a4276faf85ddde6d7ea (diff) | |
| download | guix-a813710a5fb0822e9d95088462d70f6522fe8457.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch b/gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch new file mode 100644 index 0000000000..ff998cbf76 --- /dev/null +++ b/gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch @@ -0,0 +1,22 @@ +# We insert a hook called "@SOUND_THEME_DIRECTORY@" where, at build time, we +# insert the directory of the package "sound-theme-freedesktop" in the store. + +--- src/sound-theme-spec.c.orig 2015-01-11 13:13:29.520527358 +0100 ++++ src/sound-theme-spec.c 2015-01-11 14:27:23.035046849 +0100 +@@ -321,9 +321,13 @@ + const char *g; + + if (!(g = getenv("XDG_DATA_DIRS")) || *g == 0) +- return "/usr/local/share:/usr/share"; +- +- return g; ++ return "@SOUND_THEME_DIRECTORY@"; ++ else { ++ const char *stp = ":@SOUND_THEME_DIRECTORY@"; ++ size_t len = strlen(stp) + strlen(g) + 1; ++ char *g2 = (char*) malloc(len); ++ return strcat(strcpy(g2, g), stp); ++ } + } + + static int load_theme_dir(ca_theme_data *t, const char *name) { |