From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: [PATCH] gnu: gtk+: Update to 3.16.0. Date: Mon, 06 Apr 2015 19:10:11 -0400 Message-ID: <87k2xoyht8.fsf@netris.org> References: <87sice37l1.fsf@pobox.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfG9J-00081W-KW for guix-devel@gnu.org; Mon, 06 Apr 2015 19:09:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfG9G-000151-T7 for guix-devel@gnu.org; Mon, 06 Apr 2015 19:09:45 -0400 Received: from world.peace.net ([50.252.239.5]:60737) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfG9G-00014v-Pi for guix-devel@gnu.org; Mon, 06 Apr 2015 19:09:42 -0400 In-Reply-To: <87sice37l1.fsf@pobox.com> (Andy Wingo's message of "Sun, 05 Apr 2015 17:42:18 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Andy Wingo Cc: guix-devel@gnu.org Andy Wingo writes: > From 2aa825f107d49b371bb8442cf060995d13cf7892 Mon Sep 17 00:00:00 2001 > From: Andy Wingo > 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