diff options
author | Mark H Weaver <mhw@netris.org> | 2014-12-30 12:23:32 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-12-30 12:23:32 -0500 |
commit | 8cbb67e04509f0854762269e46a65ee4344388f7 (patch) | |
tree | c44693193709650f19ea3ec264d5ed87170508f0 /gnu/packages/gtk.scm | |
parent | 7da473b75721e06237b106c6d186f2729117b1ee (diff) | |
parent | 1c69e4ce3f33242ee8d209b8078fc78a73355446 (diff) | |
download | guix-8cbb67e04509f0854762269e46a65ee4344388f7.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gtk.scm')
-rw-r--r-- | gnu/packages/gtk.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8646397aad..ce1c533df8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -71,14 +71,14 @@ tools have full access to view and control running applications.") (define-public cairo (package (name "cairo") - (version "1.12.16") + (version "1.12.18") (source (origin (method url-fetch) (uri (string-append "http://cairographics.org/releases/cairo-" version ".tar.xz")) (sha256 (base32 - "0inqwsylqkrzcjivdirkjx5nhdgxbdc62fq284c3xppinfg9a195")))) + "1dpmlxmmigpiyv0jchjsn2l1a29655x24g5073hy8p4lmjvz0nfw")))) (build-system gnu-build-system) (propagated-inputs `(("fontconfig" ,fontconfig) @@ -408,6 +408,7 @@ application suites.") ("gdk-pixbuf" ,gdk-pixbuf) ("libxi" ,libxi) ("libxinerama" ,libxinerama) + ("libxdamage" ,libxdamage) ("pango" ,pango))) (inputs `(("libxml2" ,libxml2))) @@ -513,14 +514,14 @@ exceptions, macros, and a dynamic programming environment.") (define-public cairomm (package (name "cairomm") - (version "1.10.0") + (version "1.11.2") (source (origin (method url-fetch) (uri (string-append "http://cairographics.org/releases/cairomm-" version ".tar.gz")) (sha256 (base32 - "13rrp96px95m6xnvmsaqb0wcqsnizg3bz334k0yhlyxf7v29d386")))) + "138052ybc58q5yl92m2p0br0k0a9g1pi9gfhmn4y220yih4pgxnc")))) (build-system gnu-build-system) (arguments ;; The examples lack -lcairo. |