From e21e0affd9d31a0e58d4df7c15b2b851be43279b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 20 Oct 2020 09:34:23 +0200 Subject: gnu: poppler: Always use the same 'cairo-sans-poppler' variant. * gnu/packages/gtk.scm (cairo-sans-poppler): New variable. * gnu/packages/pdf.scm (poppler)[inputs]: Use it instead of locally-created variant. --- gnu/packages/gtk.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8cd2824ce3..4e58c65ead 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -173,6 +173,12 @@ affine transformation (scale, rotation, shear, etc.).") (license license:lgpl2.1) ; or Mozilla Public License 1.1 (home-page "https://cairographics.org/"))) +(define-public cairo-sans-poppler + ;; Variant used to break the dependency cycle between Poppler and Cairo. + (package/inherit cairo + (inputs (alist-delete "poppler" (package-inputs cairo))) + (properties `((hidden? . #t))))) + (define-public cairo-xcb (package (inherit cairo) -- cgit v1.2.3 From 21abfe19352e3a07fefee13180bb63415c5238ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 25 Nov 2020 23:02:51 +0100 Subject: gnu: perl-cairo: Update to 1.108. * gnu/packages/gtk.scm (perl-cairo): Update to 1.108. --- 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 4e58c65ead..7d1a45235b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1509,7 +1509,7 @@ write GNOME applications.") (define-public perl-cairo (package (name "perl-cairo") - (version "1.107") + (version "1.108") (source (origin (method url-fetch) (uri (string-append @@ -1517,7 +1517,7 @@ write GNOME applications.") version ".tar.gz")) (sha256 (base32 - "0sg1gf1f2pjq7pji0zsv4rbi3bzpsx82z98k7yqxafzrvlkf27ay")))) + "1nh5iya63q6j2w0cdi24x2ygpi8k8wwccnbh8cisnx8nqmywnhk0")))) (build-system perl-build-system) (native-inputs `(("perl-extutils-depends" ,perl-extutils-depends) -- cgit v1.2.3