[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
128/149: gnu: libsoup: Reverse inheritance relationship with libsoup-min
From: |
guix-commits |
Subject: |
128/149: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal. |
Date: |
Tue, 26 Oct 2021 23:52:40 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit dd357046c9a14575f6f69d28df4d44b23b23700c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 17 00:18:31 2021 -0400
gnu: libsoup: Reverse inheritance relationship with libsoup-minimal.
Because starting small and adding more on top is easier maintenance-wise
than
the reverse.
* gnu/packages/gnome.scm (libsoup-minimal): New variable, made by stripping
all doc-related output, phases and inputs from libsoup.
[outputs]: Remove doc output.
[configure-flags]: Set gtk_doc option to false.
[phases]{patch-docbook-xml, move-doc}: Remove phases.
[native-inputs]{docbook-xml-4.1.2, gtk-doc}: Remove inputs.
(libsoup): Inherit from the above.
[outputs]: Re-add "doc" output.
[configure-flags]: Set gtk_doc option to true.
[phases]{patch-docbook-xml, move-doc}: Re-add phases.
[native-inputs]{docbook-xml-4.1.2, gtk-doc}: Re-add inputs.
---
gnu/packages/gnome.scm | 68 ++++++++++++++++++++++++--------------------------
1 file changed, 32 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 99b70f2..40345e7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4835,9 +4835,10 @@ claim to be \"RESTful\". It includes convenience
wrappers for libsoup and
libxml to ease remote use of the RESTful API.")
(license license:lgpl2.1+)))
-(define-public libsoup
+;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
+(define-public libsoup-minimal
(package
- (name "libsoup")
+ (name "libsoup-minimal")
(version "2.72.0")
(source (origin
(method url-fetch)
@@ -4848,23 +4849,14 @@ libxml to ease remote use of the RESTful API.")
(base32
"11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"))))
(build-system meson-build-system)
- (outputs '("out" "doc"))
(arguments
`(#:modules ((guix build utils)
(guix build meson-build-system)
(ice-9 popen))
- #:configure-flags '("-Dgtk_doc=true")
+ #:configure-flags '("-Dgtk_doc=false")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-docbook-xml
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook")))
- (substitute* (find-files "docs/reference")
- (("http://.*/docbookx\\.dtd")
- (string-append xmldoc "/docbookx.dtd")))
- #t)))
(add-after 'unpack 'adjust-tests
(lambda _
;; This test fails due to missing /etc/nsswitch.conf
@@ -4885,22 +4877,10 @@ libxml to ease remote use of the RESTful API.")
;; FIXME: ssl-test fails, starting with
;; glib-networking 2.68.x.
(substitute* "tests/meson.build"
- (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))
- #t))
- (add-after 'install 'move-doc
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (doc (assoc-ref outputs "doc")))
- (mkdir-p (string-append doc "/share"))
- (copy-recursively (string-append out "/share/gtk-doc")
- (string-append doc "/share/gtk-doc"))
- (delete-file-recursively (string-append out "/share/gtk-doc"))
- #t))))))
+ (("[ \t]*\\['ssl', true, \\[\\]\\],") "")))))))
(native-inputs
- `(("docbook-xml" ,docbook-xml-4.1.2)
- ("glib:bin" ,glib "bin") ; for glib-mkenums
+ `(("glib:bin" ,glib "bin") ; for glib-mkenums
("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc/stable)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
@@ -4927,20 +4907,36 @@ libxml to ease remote use of the RESTful API.")
and the GLib main loop, to integrate well with GNOME applications.")
(license license:lgpl2.0+)))
-
-;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
-(define-public libsoup-minimal
- (package/inherit libsoup
- (name "libsoup-minimal")
- (outputs (delete "doc" (package-outputs libsoup)))
+(define-public libsoup
+ (package/inherit libsoup-minimal
+ (name "libsoup")
+ (outputs (cons "doc" (package-outputs libsoup-minimal)))
(arguments
- (substitute-keyword-arguments (package-arguments libsoup)
+ (substitute-keyword-arguments (package-arguments libsoup-minimal)
((#:configure-flags configure-flags)
- `(delete "-Dgtk_doc=true" ,configure-flags))
+ `(cons "-Dgtk_doc=true"
+ (delete "-Dgtk_doc=false" ,configure-flags)))
((#:phases phases)
`(modify-phases ,phases
- (delete 'move-doc)))))
- (native-inputs (alist-delete "gtk-doc" (package-native-inputs libsoup)))))
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook")))
+ (substitute* (find-files "docs/reference")
+ (("http://.*/docbookx\\.dtd")
+ (string-append xmldoc "/docbookx.dtd"))))))
+ (add-after 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (copy-recursively (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ (delete-file-recursively
+ (string-append out "/share/gtk-doc")))))))))
+ (native-inputs (append `(("docbook-xml" ,docbook-xml-4.1.2)
+ ("gtk-doc" ,gtk-doc))
+ (package-native-inputs libsoup-minimal)))))
(define-public libsecret
(package
- 122/149: gnu: heimdal: Fix build., (continued)
- 122/149: gnu: heimdal: Fix build., guix-commits, 2021/10/26
- 120/149: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/26
- 129/149: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/26
- 135/149: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/26
- 138/149: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/10/26
- 88/149: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/26
- 100/149: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/26
- 103/149: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/26
- 112/149: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 123/149: gnu: pango: Update to 1.48.10., guix-commits, 2021/10/26
- 128/149: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal.,
guix-commits <=
- 136/149: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/10/26
- 137/149: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/26
- 132/149: gnu: webkitgtk: Add a debug output., guix-commits, 2021/10/26
- 139/149: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/10/26
- 141/149: gnu: librsvg: Preserve the loaders.cache file., guix-commits, 2021/10/26
- 142/149: gnu: gawk: Use regular bash to cope with test suite failures., guix-commits, 2021/10/26
- 144/149: gnu: cdparanoia: Disable parallel build., guix-commits, 2021/10/26
- 148/149: gnu: jsoncpp: Apply patch to regular package., guix-commits, 2021/10/26
- 149/149: nix: libstore: Do not remove unused links when deleting specific items., guix-commits, 2021/10/26
- 69/149: gnu: tensorflow: Enable parallel build (at least partially)., guix-commits, 2021/10/26