nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gtk+: Update to 3.16.0. 

* gnu/packages/gtk.scm (gtk+): Update to 3.16.0.  Add libepoxy to
  propagated-inputs.  Add gettext to native-inputs.  Add a 'pre-configure'
  phase instead of modifying the existing 'configure' phase.  Fix references
  to 'gtk-update-icon-cache' in Makefile.in files.

Co-Authored-By: Mark H Weaver <mhw@netris.org>
This commit is contained in:
Andy Wingo 2015-04-04 22:46:47 +02:00 committed by Mark H Weaver
parent 131ddf991f
commit 31b254a324
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/gtk.scm
View File

@ -34,6 +34,7 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
@ -433,7 +434,7 @@ application suites.")
(define-public gtk+ (define-public gtk+
(package (inherit gtk+-2) (package (inherit gtk+-2)
(name "gtk+") (name "gtk+")
(version "3.14.7") (version "3.16.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -441,11 +442,12 @@ application suites.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0vm40n6nf0w3vv54wqy67jcxddka7hplksi093xim3119yq196gv")))) "1si6ihl1wlvag8qq3166skr9fnm9i33dimbfry1j628qzqc76qff"))))
(propagated-inputs (propagated-inputs
`(("at-spi2-atk" ,at-spi2-atk) `(("at-spi2-atk" ,at-spi2-atk)
("atk" ,atk) ("atk" ,atk)
("gdk-pixbuf" ,gdk-pixbuf) ("gdk-pixbuf" ,gdk-pixbuf)
("libepoxy" ,libepoxy)
("libxi" ,libxi) ("libxi" ,libxi)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxdamage" ,libxdamage) ("libxdamage" ,libxdamage)
@ -456,16 +458,16 @@ application suites.")
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("glib" ,glib "bin") ("glib" ,glib "bin")
("gettext" ,gnu-gettext)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(arguments (arguments
`(#:phases `(#:phases
(alist-replace (alist-cons-before
'configure 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys #:rest args) (lambda _
(let ((configure (assoc-ref %standard-phases 'configure)))
;; Disable most tests, failing in the chroot with the message: ;; Disable most tests, failing in the chroot with the message:
;; D-Bus library appears to be incorrectly set up; failed to read ;; D-Bus library appears to be incorrectly set up; failed to read
;; machine uuid: Failed to open "/etc/machine-id": No such file or ;; machine uuid: Failed to open "/etc/machine-id": No such file or
@ -474,7 +476,10 @@ application suites.")
(substitute* "testsuite/Makefile.in" (substitute* "testsuite/Makefile.in"
(("SUBDIRS = gdk gtk a11y css reftests") (("SUBDIRS = gdk gtk a11y css reftests")
"SUBDIRS = gdk")) "SUBDIRS = gdk"))
(apply configure args))) (substitute* '("demos/widget-factory/Makefile.in"
"demos/gtk-demo/Makefile.in")
(("gtk-update-icon-cache") "$(bindir)/gtk-update-icon-cache"))
#t)
%standard-phases))))) %standard-phases)))))
;;; ;;;