Re: [PATCH 3/4] gnu: libcanberra: Add propagated-input.

[ludo@gnu.org (Ludovic Courtès)]

Federico Beffa <beffa@ieee.org> skribis:

> From 14abfc26e7b45aa5644104fa661f34f3a70323ae Mon Sep 17 00:00:00 2001
> From: Federico Beffa <beffa@fbengineering.ch>
> Date: Thu, 18 Dec 2014 21:32:34 +0100
> Subject: [PATCH 3/4] gnu: libcanberra: Add default sounds support.
>
> * gnu/packages/libcanberra.scm (libcanberra): Add input
>   'sound-theme-freedesktop'.  Add "libcanberra-sound-theme-freedesktop.patch"
>   and related phase 'patch-default-sounds-directory to patch the default
>   sounds directory.

[...]

> 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 0000000..10bfbdf
> --- /dev/null
> +++ b/gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch
> @@ -0,0 +1,19 @@
> +--- 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) {

Nice, much more readable IMO.  :-)

Before committing, could you just add a short description at the top of
the patch?

Thanks!

Ludo’.