From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Wingo Subject: [PATCH] gnu: gtk+: Update to 3.16.0. Date: Sun, 05 Apr 2015 17:42:18 +0200 Message-ID: <87sice37l1.fsf@pobox.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yemgr-0000tc-TF for guix-devel@gnu.org; Sun, 05 Apr 2015 11:42:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yemgn-0004M7-NT for guix-devel@gnu.org; Sun, 05 Apr 2015 11:42:25 -0400 Received: from pb-sasl1.int.icgroup.com ([208.72.237.25]:52717 helo=sasl.smtp.pobox.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yemgn-0004Lv-Ig for guix-devel@gnu.org; Sun, 05 Apr 2015 11:42:21 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-sasl1.pobox.com (Postfix) with ESMTP id 5935442B23 for ; Sun, 5 Apr 2015 11:42:21 -0400 (EDT) Received: from pb-sasl1.int.icgroup.com (unknown [127.0.0.1]) by pb-sasl1.pobox.com (Postfix) with ESMTP id 5274242B22 for ; Sun, 5 Apr 2015 11:42:21 -0400 (EDT) Received: from badger (unknown [88.160.190.192]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by pb-sasl1.pobox.com (Postfix) with ESMTPSA id 9268542B21 for ; Sun, 5 Apr 2015 11:42:20 -0400 (EDT) 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: guix-devel@gnu.org --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0003-gnu-gtk-Update-to-3.16.0.patch >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. --- gnu/packages/gtk.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index de728fb..6eab59c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages ghostscript) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages icu4c) @@ -433,7 +434,7 @@ application suites.") (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.14.7") + (version "3.16.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -441,11 +442,12 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "0vm40n6nf0w3vv54wqy67jcxddka7hplksi093xim3119yq196gv")))) + "1si6ihl1wlvag8qq3166skr9fnm9i33dimbfry1j628qzqc76qff")))) (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) ("atk" ,atk) ("gdk-pixbuf" ,gdk-pixbuf) + ("libepoxy" ,libepoxy) ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("libxdamage" ,libxdamage) @@ -456,6 +458,7 @@ application suites.") (native-inputs `(("perl" ,perl) ("glib" ,glib "bin") + ("gettext" ,gnu-gettext) ("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection) ("python-wrapper" ,python-wrapper) @@ -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")) (apply configure args))) %standard-phases))))) -- 2.2.1 --=-=-= Content-Type: text/plain -- http://wingolog.org/ --=-=-=--