From e60d3a559383e9ab666db569a9badec8768a2971 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 9 Jan 2017 00:09:41 -0500 Subject: gnu: gdk-pixbuf: Eliminate graft. * gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.36.3. [replacement]: Remove field. (gdk-pixbuf/fixed): Remove variable. (package/inherit): Remove macro. (gdk-pixbuf+svg): Remove use of 'package/inherit'. --- gnu/packages/gtk.scm | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b2882b5e98..ca33d4d567 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -425,8 +425,7 @@ (define-public gtksourceview (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.34.0") - (replacement gdk-pixbuf/fixed) + (version "2.36.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -434,7 +433,7 @@ (define-public gdk-pixbuf name "-" version ".tar.xz")) (sha256 (base32 - "0yc8indbl3hf18z6x6kjg59xp9sngm1d8vmz4c7bs6g27qw5npnm")))) + "1v1rssjd8p5s3lymsfhiq5mbs2pc0h1r6jd0asrwdbrign7i68sj")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-x11") @@ -475,35 +474,11 @@ (define-public gdk-pixbuf (license license:lgpl2.0+) (home-page "https://developer.gnome.org/gdk-pixbuf/"))) -(define gdk-pixbuf/fixed - (package (inherit gdk-pixbuf) - (name "gdk-pixbuf") - (version "2.36.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1v1rssjd8p5s3lymsfhiq5mbs2pc0h1r6jd0asrwdbrign7i68sj")))) - (replacement #f))) - -(define-syntax-rule (package/inherit p overrides ...) - "Like (package (inherit P) OVERRIDES ...), except that the same -transformation is done to the package replacement, if any. P must be a bare -identifier, and will be bound to either P or its replacement when evaluating -OVERRIDES." - (let loop ((p p)) - (package (inherit p) - overrides ... - (replacement (and=> (package-replacement p) loop))))) - ;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends ;; on gdk-pixbuf, so this new varibale. Also, librsvg adds 90MiB to the ;; closure size. (define-public gdk-pixbuf+svg - (package/inherit gdk-pixbuf + (package (inherit gdk-pixbuf) (name "gdk-pixbuf+svg") (inputs `(("librsvg" ,librsvg) -- cgit v1.2.3 From f8671271dd22f5f5a658f9fb5652a7ea404eb68c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 9 Jan 2017 00:57:23 -0500 Subject: gnu: harfbuzz: Update to 1.4.1. * gnu/packages/gtk.scm (harfbuzz): Update to 1.4.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ca33d4d567..d052f1e76f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -168,7 +168,7 @@ (define-public cairo-xcb (define-public harfbuzz (package (name "harfbuzz") - (version "1.3.4") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -176,7 +176,7 @@ (define-public harfbuzz version ".tar.bz2")) (sha256 (base32 - "0ava7y24797k5ps3ghq2ccjjds97ri1gx32v6546a6pgmpyad2ki")))) + "1g8mndf0p0fzjfvxrprga84zvqq186gbddnw6wbna7cscfmpz8l5")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From 8c44bd581e3a2610aef285f77a01259154dbfb24 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 9 Jan 2017 00:58:31 -0500 Subject: gnu: pango: Update to 1.40.3. * gnu/packages/gtk.scm (pango): Update to 1.40.3. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d052f1e76f..aeecfba45f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -206,7 +206,7 @@ (define-public harfbuzz (define-public pango (package (name "pango") - (version "1.40.1") + (version "1.40.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -214,7 +214,7 @@ (define-public pango name "-" version ".tar.xz")) (sha256 (base32 - "0h0sbh0b5kh3lvrxrb82bs86rqakf33a9jakpv33lay7f90zayp2")))) + "1lqi4yncw5q0v7g5makzxyp18g5cksqyld8m1wx0qli8wxf8pfmb")))) (build-system gnu-build-system) (propagated-inputs `(("cairo" ,cairo) -- cgit v1.2.3 From 53c18fac01158e69c8fdc29cb6bcf32383cbdce8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 9 Jan 2017 00:08:01 -0500 Subject: gnu: gtksourceview: Update to 3.22.2. * gnu/packages/gtk.scm (gtksourceview): Update to 3.22.2. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index aeecfba45f..a62323a551 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -377,7 +377,7 @@ (define-public gtksourceview-2 (define-public gtksourceview (package (name "gtksourceview") - (version "3.20.4") + (version "3.22.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -385,7 +385,7 @@ (define-public gtksourceview name "-" version ".tar.xz")) (sha256 (base32 - "009xag7df07ngav2wzs0rdrrx4s2m6ahx93pxzc2p1pkbz4nl3ks")))) + "0pmgff3p9q1z500aiqfn5l4mmij4yfi4qhq8fxscqc89vlql5s3c")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 3084d8f4c3b8c1696cc0d13565f614b24eed1598 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 9 Jan 2017 00:03:41 -0500 Subject: gnu: atk: Update to 2.22.0. * gnu/packages/gtk.scm (atk): Update to 2.22.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a62323a551..e5a4a2e3d1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -70,7 +70,7 @@ (define-module (gnu packages gtk) (define-public atk (package (name "atk") - (version "2.20.0") + (version "2.22.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -78,7 +78,7 @@ (define-public atk name "-" version ".tar.xz")) (sha256 (base32 - "1w1q29yfxcq67j7fyqrfm0l0n1vy4zn539c0sf4ga9d0qkv50fj9")))) + "1dj47ndvspa7lghw1jvjhv3v08q5f9ab5rb395mcgjbl975gajfk")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From d8c6438fe377f3d8fd7e0d0cc78dfec2f420d2be Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 9 Jan 2017 00:12:54 -0500 Subject: gnu: at-spi2-core: Update to 2.22.0. * gnu/packages/gtk.scm (at-spi2-core): Update to 2.22.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e5a4a2e3d1..0ae2d38e63 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -506,7 +506,7 @@ (define-public gdk-pixbuf+svg (define-public at-spi2-core (package (name "at-spi2-core") - (version "2.20.2") + (version "2.22.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -514,7 +514,7 @@ (define-public at-spi2-core name "-" version ".tar.xz")) (sha256 (base32 - "0hx12snd9as4cq99ka3bn056xdf13f87pd1ilp6177qk8ffxx948")))) + "02n8ybhg8344mpjwvkhnzvr0qbvvl6ryi2q9irwhi0ri46ps6pj1")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 8d2952e351d497964ce58fe9c983518f7abdf2d9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 9 Jan 2017 00:14:17 -0500 Subject: gnu: at-spi2-atk: Update to 2.22.0. * gnu/packages/gtk.scm (at-spi2-atk): Update to 2.22.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0ae2d38e63..99ada9c3ab 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -551,7 +551,7 @@ (define-public at-spi2-core (define-public at-spi2-atk (package (name "at-spi2-atk") - (version "2.20.1") + (version "2.22.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -559,7 +559,7 @@ (define-public at-spi2-atk name "-" version ".tar.xz")) (sha256 (base32 - "13mzfwra0izmkzn7dsdgy5zj19n8izp0wdy7w1yg9s0qx6aafn13")))) + "1h8k271ad78smm41c9bmw5dc4gki0wfy324cn2g25svkp2zfvgg8")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 44350d23da826731adc187b478e00b2601ab78dc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 9 Jan 2017 00:16:55 -0500 Subject: gnu: gtk+: Update to 3.22.6. * gnu/packages/gtk.scm (gtk+): Update to 3.22.6. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 99ada9c3ab..170d865879 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -649,7 +649,7 @@ (define-public gtk+-2 (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.20.9") + (version "3.22.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -657,7 +657,7 @@ (define-public gtk+ name "-" version ".tar.xz")) (sha256 (base32 - "05xcwvy68p7f4hdhi4bgdm3aycvqqr4pr5kkkr8ba91l5yx0k9l3")) + "0bqpx8825b1fdjmz14wq20zq58gq1yi1p5xjps8l6zqid8hmm9zb")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) -- cgit v1.2.3 From b1d6910e5d452968a25c4a4bd07fdf83c713197c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 9 Jan 2017 00:23:12 -0500 Subject: gnu: gtkmm: Update to 3.22.0. * gnu/packages/gtk.scm (gtkmm): Update to 3.22.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 170d865879..77fa2f0b52 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1006,7 +1006,7 @@ (define-public atkmm (define-public gtkmm (package (name "gtkmm") - (version "3.20.1") + (version "3.22.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1014,7 +1014,7 @@ (define-public gtkmm name "-" version ".tar.xz")) (sha256 (base32 - "04n631a127pyidaz82ypdy9syq1hzj636r32y9hyr9kcfnwf2785")))) + "1x8l0ny6r3ym53z82q9d5fan4m9vi93xy3b3hj1hrclgc95lvnh5")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ;for 'glib-compile-resources' -- cgit v1.2.3 From 124596f29a63d93cf5f09966ef9383bca84ef411 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 9 Jan 2017 00:26:43 -0500 Subject: gnu: gtkmm@2: Update to 2.24.5. * gnu/packages/gtk.scm (gtkmm-2): Update to 2.24.5. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 77fa2f0b52..83e87a1203 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1052,7 +1052,7 @@ (define-public gtkmm (define-public gtkmm-2 (package (inherit gtkmm) (name "gtkmm") - (version "2.24.4") + (version "2.24.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1060,7 +1060,7 @@ (define-public gtkmm-2 name "-" version ".tar.xz")) (sha256 (base32 - "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4")))) + "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006")))) (arguments '(#:configure-flags '("CPPFLAGS=-std=c++11"))) ; required by libsigc++ (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 2d5785adca393dcfb49150673565edbc354adec5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 14 Jan 2017 16:03:06 -0500 Subject: gnu: mate-themes: Update source hash. This is a followup to commit 44350d23da826731adc187b478e00b2601ab78dc. * gnu/packages/mate.scm (mate-themes)[source]: Update hash. * gnu/packages/gtk.scm (gtk+): Add reminder comment. --- gnu/packages/gtk.scm | 2 ++ gnu/packages/mate.scm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 83e87a1203..09675b8a4d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -649,6 +649,8 @@ (define-public gtk+-2 (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") + ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in + ;; mate.scm will also need to be updated. (version "3.22.6") (source (origin (method url-fetch) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index fc4eb84864..8600539adf 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -70,7 +70,7 @@ (define-public mate-themes ".tar.xz")) (sha256 (base32 - "12p6xvqs8smbk9nivi43089fiw1jbb3g9836arr0sksmmziklnvy")))) + "1gsfzrcbwp7835pbilk7cvda8hjsf9g3gl4llbm61y9j7a4x2kn6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3