Re: [PATCH] gnu: gtk+: Update to 3.16.0.

[Mark H Weaver]

Andy Wingo <address@hidden> writes:

> From 2aa825f107d49b371bb8442cf060995d13cf7892 Mon Sep 17 00:00:00 2001
> From: Andy Wingo <address@hidden>
> Date: Sat, 4 Apr 2015 22:46:47 +0200
> Subject: [PATCH 3/3] gnu: gtk+: Update to 3.16.0.
>
> * gnu/packages/gtk.scm (gtk+): Upgrade to 3.16.0, adding a libepoxy
>   dep and adding gettext.

[...]

> @@ -474,6 +477,10 @@ application suites.")
>             (substitute* "testsuite/Makefile.in"
>               (("SUBDIRS = gdk gtk a11y css reftests")
>                "SUBDIRS = gdk"))
> +           (substitute* "demos/widget-factory/Makefile.in"
> +             (("gtk-update-icon-cache") "$(bindir)/gtk-update-icon-cache"))
> +           (substitute* "demos/gtk-demo/Makefile.in"
> +             (("gtk-update-icon-cache") "$(bindir)/gtk-update-icon-cache"))

These two substitute* forms can be combined into one like this:

           (substitute* '("demos/widget-factory/Makefile.in"
                          "demos/gtk-demo/Makefile.in")
             (("gtk-update-icon-cache") "$(bindir)/gtk-update-icon-cache"))

I pushed this to core-updates with this change and a slightly modified
commit log.  While I was at it, I moved these actions to a
'pre-configure' phase, whereas before the package replaced the existing
'configure' phase with one that ended by calling the standard configure
phase.

      Thanks!
        Mark