From 54a114db45b37a6664bffd4ec9d4aa0c6bafeb48 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Nov 2019 00:29:05 +0100 Subject: gnu: babl: Update to 0.1.72. * gnu/packages/gimp.scm (babl): Update to 0.1.72. [build-system]: Switch to Meson. [arguments]: Disable GObject introspection. [native-inputs]: Add pkg-config. [propagated-inputs]: Add lcms. --- gnu/packages/gimp.scm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 70bc8db4c1..4fd3cd0167 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -29,6 +29,7 @@ (define-module (gnu packages gimp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) @@ -49,22 +50,30 @@ (define-module (gnu packages gimp) (define-public babl (package (name "babl") - (version "0.1.66") + (version "0.1.72") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" (version-major+minor version) - "/babl-" version ".tar.bz2") + "/babl-" version ".tar.xz") (string-append "https://ftp.gtk.org/pub/babl/" (version-major+minor version) - "/babl-" version ".tar.bz2") + "/babl-" version ".tar.xz") (string-append "ftp://ftp.gtk.org/pub/babl/" (version-major+minor version) - "/babl-" version ".tar.bz2"))) + "/babl-" version ".tar.xz"))) (sha256 (base32 - "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n")))) - (build-system gnu-build-system) + "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags + (list "-Denable-gir=false"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + ;; Propagated to satisfy ‘babl.pc’. + `(("lcms" ,lcms))) (home-page "http://gegl.org/babl/") (synopsis "Image pixel format conversion library") (description -- cgit v1.2.3 From bd70db6ee88838deb319aa54a1e2d8819413be10 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Nov 2019 00:29:57 +0100 Subject: gnu: gegl: Add source URIs. * gnu/packages/gimp.scm (gegl)[source]: Add URIs. --- gnu/packages/gimp.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 4fd3cd0167..6a16a39007 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -94,7 +94,13 @@ (define-public gegl (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" (string-take version 3) - "/gegl-" version ".tar.bz2"))) + "/gegl-" version ".tar.xz") + (string-append "https://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz") + (string-append "ftp://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz"))) (sha256 (base32 "0njydcr6qdmfzh4fxx544681qxdpf7y6b2f47jcypn810dlxy4h1")))) -- cgit v1.2.3 From 5128252493dca8c0da6db2bc22dd88ebcdf5543a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Nov 2019 00:31:43 +0100 Subject: gnu: gegl: Update to 0.4.18. * gnu/packages/gimp.scm (gegl): Update to 0.4.18. [build-system]: Switch to Meson. [arguments]: Disable GObject introspection. Remove LDFLAGS fix. --- gnu/packages/gimp.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 6a16a39007..79ce01ed47 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -89,7 +89,7 @@ (define-public babl (define-public gegl (package (name "gegl") - (version "0.4.16") + (version "0.4.18") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" @@ -103,10 +103,11 @@ (define-public gegl "/gegl-" version ".tar.xz"))) (sha256 (base32 - "0njydcr6qdmfzh4fxx544681qxdpf7y6b2f47jcypn810dlxy4h1")))) - (build-system gnu-build-system) + "0r6akqnrkvxizyhyi8sv40mxm7j4bcwjb6mqjpxy0zzbbfsdyin9")))) + (build-system meson-build-system) (arguments - '(#:configure-flags '("LDFLAGS=-lm"))) + `(#:configure-flags + (list "-Dintrospection=false"))) ;; These are propagated to satisfy 'gegl-0.4.pc'. (propagated-inputs `(("babl" ,babl) -- cgit v1.2.3 From 4c003c5f2d8a2174210f1cb7f0f8b1f5af738952 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Nov 2019 00:31:52 +0100 Subject: gnu: gimp: Update to 2.10.14. * gnu/packages/gimp.scm (gimp): Update to 2.10.14. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gimp.scm') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 79ce01ed47..42a55cff33 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -134,7 +134,7 @@ (define-public gegl (define-public gimp (package (name "gimp") - (version "2.10.12") + (version "2.10.14") (source (origin (method url-fetch) (uri (string-append "https://download.gimp.org/pub/gimp/v" @@ -142,7 +142,7 @@ (define-public gimp "/gimp-" version ".tar.bz2")) (sha256 (base32 - "0wdcr8d2ink4swn5r4v13bsiya6s3xm4ya97sdbhs4l40y7bb03x")))) + "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML -- cgit v1.2.3