From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCH 3/4] gnu: libcanberra: Add propagated-input.
Date: Mon, 12 Jan 2015 10:22:40 +0100
Message-ID: <87fvbgxsin.fsf@gnu.org>
References: <CAKrPhPM_DjRh_enBH8bNgEB7FVAkvB9C8Exyme+XwxDdGnYYSw@mail.gmail.com>
	<87oaqxqn2h.fsf@gnu.org>
	<CAKrPhPNHtP_xUJUGFvVuBrug5OKB5Td54q-5Jn1LffRPH2vf8Q@mail.gmail.com>
	<87zj9uz6z2.fsf@gnu.org>
	<CAKrPhPP=MJBuEDTYiP8W8aWK=bX3yJ_Aqfmi9ufcJibw0km5Ng@mail.gmail.com>
	<87y4pd57o9.fsf@gnu.org>
	<CAKrPhPPyCyyxpc6ZMWNbXJxdmrrLVq0N1yztKujJ3CW4D4r8wA@mail.gmail.com>
	<87fvbifiej.fsf@gnu.org>
	<CAKrPhPOUKXOBkfOkS5ZcCSeFLm6KDn30nNrtTwyde-cb2Ti51w@mail.gmail.com>
	<87zj9pbn1u.fsf@gnu.org>
	<CAKrPhPOVbNntonUcp+sgXq8h2mwX-9Mgt0oN7V=orgXH=pqxfQ@mail.gmail.com>
	<CAKrPhPMo0TcvQQ9KzR_dCQ_TM+KXfUkb8t7Pva9Vrt1A73mXHg@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43578)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1YAbCv-00052B-RQ
	for guix-devel@gnu.org; Mon, 12 Jan 2015 04:22:46 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1YAbCr-00019C-SV
	for guix-devel@gnu.org; Mon, 12 Jan 2015 04:22:45 -0500
Received: from hera.aquilenet.fr ([2a01:474::1]:36484)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1YAbCr-000192-LI
	for guix-devel@gnu.org; Mon, 12 Jan 2015 04:22:41 -0500
In-Reply-To: <CAKrPhPMo0TcvQQ9KzR_dCQ_TM+KXfUkb8t7Pva9Vrt1A73mXHg@mail.gmail.com>
	(Federico Beffa's message of "Sun, 11 Jan 2015 14:34:09 +0100")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Federico Beffa <beffa@ieee.org>
Cc: Guix-devel <guix-devel@gnu.org>

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.pa=
tch"
>   and related phase 'patch-default-sounds-directory to patch the default
>   sounds directory.

[...]

> diff --git a/gnu/packages/patches/libcanberra-sound-theme-freedesktop.pat=
ch 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;
> +=20
> +         if (!(g =3D getenv("XDG_DATA_DIRS")) || *g =3D=3D 0)
> +-                return "/usr/local/share:/usr/share";
> +-
> +-        return g;
> ++                return "@SOUND_THEME_DIRECTORY@";
> ++        else {
> ++                const char *stp =3D ":@SOUND_THEME_DIRECTORY@";
> ++                size_t len =3D strlen(stp) + strlen(g) + 1;
> ++                char *g2 =3D (char*) malloc(len);
> ++                return strcat(strcpy(g2, g), stp);
> ++        }
> + }
> +=20
> + 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=E2=80=99.