From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35536)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d1d99-0000UZ-8q
	for guix-patches@gnu.org; Fri, 21 Apr 2017 14:19:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d1d94-0003HS-Tj
	for guix-patches@gnu.org; Fri, 21 Apr 2017 14:19:07 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:34673)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1d1d94-0003HO-Pp
	for guix-patches@gnu.org; Fri, 21 Apr 2017 14:19:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d1d94-0000MW-JQ
	for guix-patches@gnu.org; Fri, 21 Apr 2017 14:19:02 -0400
Subject: bug#26593: [PATCH] gnu: icecat: Fix GTK 3 file chooser crash.
Resent-Message-ID: <handler.26593.B26593.14927987171354@debbugs.gnu.org>
References: <20170421175540.19672-1-clement@lassieur.org>
From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur <clement@lassieur.org>
In-reply-to: <20170421175540.19672-1-clement@lassieur.org>
Date: Fri, 21 Apr 2017 20:18:31 +0200
Message-ID: <87o9vpzkso.fsf@lassieur.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: 26593@debbugs.gnu.org


Clément Lassieur <clement@lassieur.org> writes:

> * gnu/packages/gnuzilla.scm (icecat)[arguments]: Add a 'wrap-xdgdatadirs'
> phase to set XDG_DATA_DIRS.
> ---
>  gnu/packages/gnuzilla.scm | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
> index 91bb0a6a7..3b8c80d2c 100644
> --- a/gnu/packages/gnuzilla.scm
> +++ b/gnu/packages/gnuzilla.scm
> @@ -750,7 +750,16 @@ standards.")
>                        (copy-file file (string-append icons "/icecat.png"))))
>                    '("default16.png" "default22.png" "default24.png"
>                      "default32.png" "default48.png" "content/icon64.png"
> -                    "mozicon128.png" "default256.png")))))))))
> +                    "mozicon128.png" "default256.png"))))))
> +         ;; This fixes the file chooser crash that happens with GTK 3.
> +         (add-after 'install 'wrap-xdgdatadirs
                                     ^
I guess I should rename it to 'wrap-program, and update changelog
accordingly.

> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (lib (string-append out "/lib"))
> +                    (gtk (assoc-ref inputs "gtk+"))
> +                    (gtk-share (string-append gtk "/share")))
> +               (wrap-program (car (find-files lib "^icecat$"))
> +                 `("XDG_DATA_DIRS" ":" prefix (,gtk-share)))))))))
>      (home-page "https://www.gnu.org/software/gnuzilla/")
>      (synopsis "Entirely free browser derived from Mozilla Firefox")
>      (description