[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/27: gnu: Remove librsvg-bootstrap.
From: |
guix-commits |
Subject: |
03/27: gnu: Remove librsvg-bootstrap. |
Date: |
Thu, 11 Aug 2022 18:45:09 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit b4a7f8c917fa9a9f2513a49e00961fd11e09ca31
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Aug 11 21:22:50 2022 +0200
gnu: Remove librsvg-bootstrap.
librsvg is already a staging-level package, and the next version will no
longer bundle its dependencies, so we might as well drop it early.
* gnu/packages/gnome.scm (librsvg-bootstrap): Remove variable.
* gnu/packages/bittorrent.scm (deluge)[native-inputs]: Replace
LIBRSVG-BOOTSTRAP with LIBRSVG.
* gnu/packages/emacs.scm (emacs)[inputs]: Likewise.
* gnu/packages/gtk.scm (gtk+-2)[propagated-inputs]: Likewise.
* gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Likewise.
---
gnu/packages/bittorrent.scm | 2 +-
gnu/packages/emacs.scm | 2 +-
gnu/packages/gnome.scm | 21 ---------------------
gnu/packages/gtk.scm | 4 ++--
4 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 43fc287b95..fcb59368e9 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -525,7 +525,7 @@ features.")
(native-inputs
(list intltool python-wheel
(if (string-prefix? "x86_64-" (%current-system))
- librsvg-bootstrap
+ librsvg
librsvg-2.40)))
;; TODO: Enable tests.
;; After "pytest-twisted" is packaged, HOME is set, and an X server is
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ffd1eda08e..995fbd8dd3 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -289,7 +289,7 @@
libpng
zlib
(if (target-x86-64?)
- librsvg-bootstrap
+ librsvg
librsvg-2.40)
libxpm
libxml2
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 27d2a58e65..491b21d5ca 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3532,27 +3532,6 @@ diagrams.")
(home-page "https://wiki.gnome.org/LibRsvg")
(license license:lgpl2.1+)))
-;; This copy of librsvg uses the bundled rust libraries. It is useful for
-;; packages which have too many dependencies to be rebuilt as frequently
-;; as the rust inputs are updated.
-;; TODO: Remove this package and use packaged rust libraries!
-(define-public librsvg-bootstrap
- (package
- (inherit librsvg)
- (name "librsvg-bootstrap")
- (source (origin
- (inherit (package-source librsvg))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (for-each delete-file (find-files "vendor" "\\.a$"))))))
- (arguments
- (substitute-keyword-arguments (package-arguments librsvg)
- ((#:vendor-dir _ "vendor") "vendor")
- ((#:cargo-inputs _) '())
- ((#:cargo-development-inputs _) '())))
- (properties '((hidden? . #t)))))
-
(define-public librsvg-2.40
;; This is the last version implemented in C.
(package
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 18531ec5f7..c0ea89d406 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -872,7 +872,7 @@ is part of the GNOME accessibility project.")
(propagated-inputs
(list atk cairo
(if (target-x86-64?)
- librsvg-bootstrap
+ librsvg
librsvg-2.40)
glib pango))
(inputs
@@ -971,7 +971,7 @@ application suites.")
fontconfig
freetype
(if (target-x86-64?)
- librsvg-bootstrap
+ librsvg
librsvg-2.40)
glib
libcloudproviders-minimal
- branch core-updates updated (f7e8be2318 -> 307dec8e2d), guix-commits, 2022/08/11
- 06/27: gnu: inkscape: Disable failing tests., guix-commits, 2022/08/11
- 12/27: gnu: fribidi: Update to 1.0.12., guix-commits, 2022/08/11
- 14/27: gnu: pango: Update to 1.50.8., guix-commits, 2022/08/11
- 09/27: gnu: inkscape: Remove input labels., guix-commits, 2022/08/11
- 15/27: gnu: graphviz: Remove input labels., guix-commits, 2022/08/11
- 17/27: gnu: vala: Remove 0.54.2., guix-commits, 2022/08/11
- 20/27: gnu: dconf: Remove input labels., guix-commits, 2022/08/11
- 03/27: gnu: Remove librsvg-bootstrap.,
guix-commits <=
- 10/27: gnu: lib2geom: Remove 1.1., guix-commits, 2022/08/11
- 23/27: gnu: libvisual-plugins: Remove input labels., guix-commits, 2022/08/11
- 24/27: gnu: Remove gnupg/fixed., guix-commits, 2022/08/11
- 01/27: Merge branch 'staging' into core-updates, guix-commits, 2022/08/11
- 02/27: gnu: librsvg: Update to 2.54.4., guix-commits, 2022/08/11
- 05/27: gnu: libsoup-minimal@2: Update to 2.72.4., guix-commits, 2022/08/11
- 04/27: gnu: libsoup-minimal: Update to 3.0.7., guix-commits, 2022/08/11
- 08/27: gnu: inkscape: Remove obsolete input., guix-commits, 2022/08/11
- 07/27: gnu: inkscape/stable: Update to 1.2.1., guix-commits, 2022/08/11
- 11/27: gnu: gtk+@2: Disable failing tests., guix-commits, 2022/08/11