From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id DhAPKdfbeGEGbwAAgWs5BA (envelope-from ) for ; Wed, 27 Oct 2021 06:55:51 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 2J9AJNfbeGF1cgAA1q6Kng (envelope-from ) for ; Wed, 27 Oct 2021 04:55:51 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 16F272A857 for ; Wed, 27 Oct 2021 06:55:51 +0200 (CEST) Received: from localhost ([::1]:40438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfayc-0004FZ-78 for larch@yhetil.org; Wed, 27 Oct 2021 00:55:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfawz-0001xX-Jj for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfawz-0003pS-Ab for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfawz-0005AQ-9C for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 19/20] gnu: gtk: Replace gdk-pixbuf+svg by librsvg. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041919687 (code B ref 51428); Wed, 27 Oct 2021 04:54:09 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:39 +0000 Received: from localhost ([127.0.0.1]:48152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawU-00057L-EY for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:39 -0400 Received: from mail-qv1-f50.google.com ([209.85.219.50]:39546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawC-000550-KZ for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:21 -0400 Received: by mail-qv1-f50.google.com with SMTP id k29so1022270qve.6 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1FEwlK+43S15/LGTNdlHU39AybSgI5/IxYvToSOlHFE=; b=HJ4PpS5kkNjCv4yHbWxGBg4lvwNqZUL6U/kvCgM/sHOWiCMRifjF7R0PJMK5grNrE2 8BU+Xb8yrd6ZoEJ8hNY5nwN045l1JF/kHzMLqA5/nrZj1B481ajdWrlTPguqoV7hN0AS DIuOGe1k0vyJFzaSQ8dBrL6tVR9aXmtEEwauHc7Blk7DpOYjzKtWZai4JxDBDqQ6/O4q PAM7FaGHCKAtwGyDY4M/lTG6MJR/DpaHQ9/i+lp30n/t7xH4NQkzWRJrEtFK/0Xd4ZDY DwlGgxNZ47zA5f1ahSGDhfaEMt6enDjgm9YGk05hK5B5MPKbzJknreblRw9h1fy/dRoV hHkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1FEwlK+43S15/LGTNdlHU39AybSgI5/IxYvToSOlHFE=; b=VTTxuu6L25iP1IIY3/kVMhPqTo8VCu+uGYlg+VOtTzCxm4mTMhkyH2r977DtEQ43Gs SfdPofUS+9d9H5VSGhEmu+I3G+LmxR0zMgJW72yLaifZJU/h9qZiuzFDWXpulWzE42K6 337AHjA1eXV2/rXjdp0LTpQwHNHt76B5e37lb3VpZle5R/NmKhckBehJdf5b9aUUz6r0 rbLiaUqrIga+DT+yUiiQFZv1GbFpXk01mYHDZKDUaga4tCA1+8I0VBw1ERGhAOLReLgJ ovXfN8PuNuc37AQFoORqIKcCvHjwqDk5VUEgjYhtXHjduLQQuavsmHni7u0nUnrWcuqk uYsw== X-Gm-Message-State: AOAM533w4V1nOVF7VAzXkcM4MsOUfqZ3HCwGHtxaiXRN7FwsG16wldxN IRLQu0ad22nvrKTsVRhuXT0Vj7eN1S0= X-Google-Smtp-Source: ABdhPJzLRxBlnDPWidbksNEzhzvs24qexvSCDq84Rqb4i00ghXCTjGLx4D4aysklTQJV5WsJWMgR6w== X-Received: by 2002:ad4:5a07:: with SMTP id ei7mr497855qvb.39.1635310394863; Tue, 26 Oct 2021 21:53:14 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:14 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:50 -0400 Message-Id: <20211027045151.9889-19-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635310551; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=1FEwlK+43S15/LGTNdlHU39AybSgI5/IxYvToSOlHFE=; b=U1DpC/wIZ+FcdBcywFBCD2ba+dABKFstvjZ56J/dEbu9BqPXyPRW2scp+P1ojkgVfyr4/L zbFZVRr0MeQdLgWpBbYGBuRQFkSVJn+LQLCDQ2h8BKDT7md+Td1Sen2JysyuMoQvvEMck8 1wo7RGTLSAMp0RoD/LoJzyfZMWnaT9Ez6gqhSoAWmnOmxr8/qYJF73KOlMK5J+G83tW0y6 Zz/ujW7/gEU3Bemm8JxoDOzyQLT+xT5+Y1mS/3sVC9z71VmDpzjFBmm0bKEpKpC35Ld1+B Hu+RoNOTRFflRhl+SW4dp2U/NOWSl983S2Vr4jRpTZ4YqLXbcNrDF2v2Uwqm6g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635310551; a=rsa-sha256; cv=none; b=uvCnOn8H60+WBQk+2GlcRJC4P8LQUETotqz5Iwf3s+as+GHQC3TBdjHE7UjJBAEINGNokh ewKuzEb2eav/pZ5vRsePOegzZ2ImyV5wiXmJDsZiYF5ZBgmGXT4+FBBFXgkX7yN+1lyJK+ FS3IDmejXLEGUoUIQxgZNi4BFznzyYg+CBxPZLFgZDZj48CBw8h1ztXM7BJQtvlVlX0kZS OgfCkYoNEbZPEGRsctsPvQg1N4OZeC7KuOQAUl38M3edfpq8VNmbvu6y2i44ESiUhpNGn/ LgjMfnfTb442LQIjUCpN9d+nLa8RUuyMDg0aRdqDiW7L5jaZXPphS7hqo5NY8Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=HJ4PpS5k; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 4.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=HJ4PpS5k; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 16F272A857 X-Spam-Score: 4.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: ZH2smXJLfrZL With the addition of a profile hook for computing the gdk-pixbuf loaders cache file, there is no longer a need for gdk-pixbuf+svg, and librsvg can propagate gdk-pixbuf without fear, so replace the former for the latter. The replacement was automated with the following command: $ git grep -l ',gdk-pixbuf+svg)' \ | xargs sed 's/(".*" ,gdk-pixbuf+svg)/("librsvg" ,librsvg)/' -i * gnu/packages/gtk.scm (gdk-pixbuf+svg): Delete package. (gtk+-2)[propagated-inputs]: Replace gdk-pixbuf+svg with librsvg. (gtk+)[propagated-inputs]: Likewise. * gnu/packages/gnome.scm (gdk-pixbuf+svg): Add deprecated package. --- gnu/packages/dunst.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/gnome.scm | 14 +++++++------- gnu/packages/graphviz.scm | 2 +- gnu/packages/gstreamer.scm | 4 ++-- gnu/packages/gtk.scm | 35 +++-------------------------------- gnu/packages/image.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/mate.scm | 12 ++++++------ gnu/packages/messaging.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/tryton.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/vnc.scm | 2 +- 14 files changed, 28 insertions(+), 57 deletions(-) diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm index ce2c04bac6..9f3e4c036c 100644 --- a/gnu/packages/dunst.scm +++ b/gnu/packages/dunst.scm @@ -67,7 +67,7 @@ (define-public dunst ("which" ,which))) (inputs `(("dbus" ,dbus) - ("gdk-pixbuf" ,gdk-pixbuf+svg) ; for svg support + ("librsvg" ,librsvg) ; for svg support ("glib" ,glib) ("cairo" ,cairo) ("pango" ,pango) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 938720f928..6cba568119 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -279,7 +279,7 @@ (define-public gnome-maps ("libsoup" ,libsoup) ("libgweather" ,libgweather) ("libxml2" ,libxml2) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib-networking" ,glib-networking) ("geoclue" ,geoclue) ("geocode-glib" ,geocode-glib) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cbdf1d9762..a89cd8e7b4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -602,7 +602,7 @@ (define-public libdmapsharing ("vala" ,vala))) (inputs `(("avahi" ,avahi) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("gee" ,libgee) ("gst-plugins-base" ,gst-plugins-base) ("gtk+" ,gtk+))) @@ -921,7 +921,7 @@ (define-public gnome-photos (inputs `(("babl" ,babl) ("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("gegl" ,gegl) ("geocode-glib" ,geocode-glib) ("gexiv2" ,gexiv2) @@ -2820,7 +2820,7 @@ (define-public gtg ("gtk+:bin" ,gtk+ "bin") ("pkg-config" ,pkg-config))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf+svg) + `(("librsvg" ,librsvg) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) ("pango" ,pango) @@ -4257,7 +4257,7 @@ (define-public drawing ("gtk+:bin" ,gtk+ "bin") ("pkg-config" ,pkg-config))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf+svg) + `(("librsvg" ,librsvg) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) ("pango" ,pango) @@ -6832,7 +6832,7 @@ (define-public epiphany (inputs `(("avahi" ,avahi) ("gcr" ,gcr) - ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) ; for loading SVG files + ("librsvg" ,librsvg) ; for loading SVG files ("glib-networking" ,glib-networking) ("gnome-desktop" ,gnome-desktop) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) @@ -8713,7 +8713,7 @@ (define-public gnome-shell ("evolution-data-server" ,evolution-data-server) ("gcr" ,gcr) ("gdm" ,gdm) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("gjs" ,gjs) ("gtk" ,gtk) ("gnome-autoar" ,gnome-autoar) @@ -8777,7 +8777,7 @@ (define-public gtk-vnc ("vala" ,vala))) (inputs `(("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("gnutls" ,gnutls) ("libgcrypt" ,libgcrypt) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 25ff51194f..16fbfb6842 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -357,7 +357,7 @@ (define-public xdot (,(dirname (search-input-file inputs "bin/dot")))))))))) (inputs `(("atk" ,atk) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("graphviz" ,graphviz) ("gtk+" ,gtk+) ("python-pycairo" ,python-pycairo) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 1ac5cd4b8e..2a7679b490 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -311,7 +311,7 @@ (define-public libvisual-plugins (inputs `(("alsa-lib" ,alsa-lib) ("esound" ,esound) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("gtk+" ,gtk+-2) ("jack" ,jack-2) ("libx11" ,libx11) @@ -668,7 +668,7 @@ (define-public gst-plugins-good ("bzip2" ,bzip2) ("cairo" ,cairo) ("flac" ,flac) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("glib-networking" ,glib-networking) ("glu" ,glu) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0463e26246..5bfc19e19d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -714,35 +714,6 @@ (define-public gdk-pixbuf (home-page "https://wiki.gnome.org/Projects/GdkPixbuf") (license license:lgpl2.1+))) -;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends -;; on gdk-pixbuf, so this new variable. Also, librsvg adds 90MiB to the -;; closure size. -(define-public gdk-pixbuf+svg - (package/inherit gdk-pixbuf - (name "gdk-pixbuf+svg") - (inputs - `(("librsvg" ,librsvg) - ,@(package-inputs gdk-pixbuf))) - (arguments - (substitute-keyword-arguments (package-arguments gdk-pixbuf) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'register-svg-loader - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (librsvg (assoc-ref inputs "librsvg")) - (loaders - (append - (find-files out "^libpixbufloader-.*\\.so$") - (find-files librsvg "^libpixbufloader-.*\\.so$"))) - (gdk-pixbuf-query-loaders - (string-append out "/bin/gdk-pixbuf-query-loaders"))) - (apply invoke - gdk-pixbuf-query-loaders - "--update-cache" - loaders)))))))) - (synopsis "Image loading library, with SVG support"))) - ;;; A minimal variant used to prevent a cycle with Inkscape. (define-public at-spi2-core-minimal (hidden-package @@ -903,7 +874,7 @@ (define-public gtk+-2 ;; Rust is not supported well on every architecture yet. ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-system) (%current-system))) - gdk-pixbuf+svg + librsvg gdk-pixbuf)) ("glib" ,glib) ("pango" ,pango))) @@ -1005,7 +976,7 @@ (define-public gtk+ ;; SVG support is optional and requires librsvg, which pulls in rust. ;; Rust is not supported well on every architecture yet. ("gdk-pixbuf" ,(if (target-x86-64?) - gdk-pixbuf+svg + librsvg gdk-pixbuf)) ("glib" ,glib) ("libcloudproviders" ,libcloudproviders-minimal) @@ -1267,7 +1238,7 @@ (define-public gtk ;; Following dependencies are referenced in .pc files. `(("cairo" ,cairo) ("fontconfig" ,fontconfig) - ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("graphene" ,graphene) ("libepoxy" ,libepoxy) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 99852fc205..87093b14fa 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2345,7 +2345,7 @@ (define-public mypaint ("gettext" ,gettext-minimal))) (inputs `(("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("hicolor-icon-theme" ,hicolor-icon-theme) ("libmypaint" ,libmypaint) ("mypaint-brushes" ,mypaint-brushes) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 23a8710b9b..5c72a2f1e1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1687,7 +1687,7 @@ (define-public claws-mail ("enchant" ,enchant) ("expat" ,expat) ("fontconfig" ,fontconfig) - ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("ghostscript" ,ghostscript) ("glib" ,glib) ("gnupg" ,gnupg) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 08fd3562b3..41165e8de7 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -473,7 +473,7 @@ (define-public libmatekbd ("gobject-introspection" ,gobject-introspection))) (inputs `(("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("gtk+" ,gtk+) ("libx11" ,libx11) @@ -983,7 +983,7 @@ (define-public mate-control-center ("polkit" ,polkit) ("startup-notification" ,startup-notification))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf+svg) ; mate-slab.pc + `(("librsvg" ,librsvg) ; mate-slab.pc ("librsvg" ,librsvg))) ; mate-slab.pc (home-page "https://mate-desktop.org/") (synopsis "MATE Desktop configuration tool") @@ -1219,7 +1219,7 @@ (define-public mate-screensaver ("dbus-glib" ,dbus-glib) ("glib" ,glib) ("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("libcanberra" ,libcanberra) ("libglade" ,libglade) ("libmatekbd" ,libmatekbd) @@ -1271,7 +1271,7 @@ (define-public mate-utils ("cairo" ,cairo) ("glib" ,glib) ("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("libcanberra" ,libcanberra) ("libgtop" ,libgtop) ("libx11" ,libx11) @@ -1324,7 +1324,7 @@ (define-public eom ("exempi" ,exempi) ("glib" ,glib) ("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("libcanberra" ,libcanberra) ("libx11" ,libx11) ("libxext" ,libxext) @@ -1384,7 +1384,7 @@ (define-public engrampa ("file" ,file) ("glib" ,glib) ("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("json-glib" ,json-glib) ("libcanberra" ,libcanberra) ("libx11" ,libx11) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b5f39cc408..ef7b9085e5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1306,7 +1306,7 @@ (define-public dino ;; NOTE: Commented-out lines are to be enabled in v0.3.0. `(("atk" ,atk) ("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("glib-networking" ,glib-networking) ("gpgme" ,gpgme) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4a415e9460..c87dd5440a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -738,7 +738,7 @@ (define-public blueman (inputs `(("bluez" ,bluez) ("dbus" ,dbus) - ("gdkpixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("gtk+" ,gtk+) ("iproute2" ,iproute) diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm index d5cfb63e1b..c1275edd22 100644 --- a/gnu/packages/tryton.scm +++ b/gnu/packages/tryton.scm @@ -113,7 +113,7 @@ (define-public tryton `(("glib-compile-schemas" ,glib "bin") ("gobject-introspection" ,gobject-introspection))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf+svg) + `(("librsvg" ,librsvg) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) ("python-dateutil" ,python-dateutil) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ebee15e296..b9b1ca64be 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4293,7 +4293,7 @@ (define-public pitivi ("gst-libav" ,gst-libav) ("gsound" ,gsound) ("gtk+" ,gtk+) - ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("libpeas" ,libpeas) ("libnotify" ,libnotify) ("pango" ,pango) diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 4c2b13c93c..00ae2be63d 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -120,7 +120,7 @@ (define-public remmina ("ffmpeg" ,ffmpeg) ("freerdp" ,freerdp) ; for rdp plugin ("gcrypt" ,libgcrypt) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("gnome-keyring" ,gnome-keyring) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) -- 2.33.1