[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
128/136: gnu: libsoup: Reverse inheritance relationship with libsoup-min
From: |
guix-commits |
Subject: |
128/136: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal. |
Date: |
Sun, 17 Oct 2021 05:16:25 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit b73726ce2e1d0e927c14b89f5ca492683bb25066
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 5aeea2a..1ae5918 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4827,9 +4827,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)
@@ -4840,23 +4841,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
@@ -4877,22 +4869,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)
@@ -4919,20 +4899,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
- 78/136: gnu: gtk+-2: Fix ‘builder’ test., (continued)
- 78/136: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/10/17
- 81/136: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/10/17
- 84/136: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/17
- 85/136: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/17
- 88/136: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/17
- 108/136: gnu: lsof: Fix indentation., guix-commits, 2021/10/17
- 103/136: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/17
- 117/136: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/17
- 106/136: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/17
- 102/136: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/17
- 128/136: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal.,
guix-commits <=
- 119/136: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/10/17
- 124/136: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/10/17
- 68/136: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/17
- 75/136: gnu: glibc: Remove unneeded nscd patching., guix-commits, 2021/10/17
- 91/136: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/10/17
- 120/136: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/17
- 131/136: gnu: pulseaudio: Add doxygen to fix build., guix-commits, 2021/10/17
- 129/136: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/17
- 135/136: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/10/17