GNU bug report logs -
#63721
[PATCH 0/2] MPD update & fixes
Previous Next
Reported by: Bruno Victal <mirai <at> makinata.eu>
Date: Thu, 25 May 2023 17:21:02 UTC
Severity: normal
Tags: patch
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63721 in the body.
You can then email your comments to 63721 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#63721; Package
guix-patches.
(Thu, 25 May 2023 17:21:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Bruno Victal <mirai <at> makinata.eu>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Thu, 25 May 2023 17:21:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
This patch series updates MPD to the latest available version (0.23.13)
whilst also:
* Properly enabling tests (these weren't being built and the build
system was a giving misleading answer for 'check phase)
* Removing unused inputs (cmake)
* Splitting the HTML manual from the main package since it accounts
for nearly half of its size.
Additionally tested with `make check-system TESTS=mpd`.
Bruno Victal (2):
gnu: mpd: Update to 0.23.13.
gnu: mpd: Split outputs.
gnu/packages/mpd.scm | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
base-commit: 0c662d570eec2fe8879e49bd4ccc31950aeb9ef8
--
2.39.2
Information forwarded
to
guix-patches <at> gnu.org:
bug#63721; Package
guix-patches.
(Thu, 25 May 2023 17:23:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 63721 <at> debbugs.gnu.org (full text, mbox):
Properly enable tests as well since meson misleadingly reported a success when
clearly no tests were performed:
````````````````````````````````````
…
starting phase `check'
ninja: no work to do.
No tests defined.
phase `check' succeeded after 0.2 seconds
starting phase `install'
…
````````````````````````````````````
* gnu/packages/mpd.scm (mpd): Update to 0.23.13.
[arguments]: Set #:configure-flags option to build tests.
[native-inputs]: Add googletest, zip. Remove unused cmake.
---
gnu/packages/mpd.scm | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 5005da4e87..3259217989 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -118,7 +118,7 @@ (define-public libmpdclient
(define-public mpd
(package
(name "mpd")
- (version "0.23.12")
+ (version "0.23.13")
(source (origin
(method url-fetch)
(uri
@@ -127,12 +127,13 @@ (define-public mpd
"/mpd-" version ".tar.xz"))
(sha256
(base32
- "1rq2hyfvwwri3sivab747csza2i096y7m8563rl5mhpchhiadz5p"))))
+ "06fmy68lfrsi5y03l53dnwcynqhwh5f5vhdpbsr8lzmvzgk02sx9"))))
(build-system meson-build-system)
(arguments
(list
#:configure-flags #~(list "-Ddocumentation=enabled"
- "-Dsystemd=enabled")
+ "-Dsystemd=enabled"
+ "-Dtest=true")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'enable-elogind
@@ -182,7 +183,12 @@ (define-public mpd
yajl
zlib
zziplib)))
- (native-inputs (list cmake pkg-config python-sphinx))
+ (native-inputs (list pkg-config python-sphinx googletest
+ ;; See test/meson.build for information about these
+ ;; additional dependencies.
+ ;;
+ ;; Used when zziplib feature is enabled.
+ zip))
;; Missing optional inputs:
;; libcdio_paranoia
;; libmms
base-commit: 0c662d570eec2fe8879e49bd4ccc31950aeb9ef8
--
2.39.2
Information forwarded
to
guix-patches <at> gnu.org:
bug#63721; Package
guix-patches.
(Thu, 25 May 2023 17:23:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 63721 <at> debbugs.gnu.org (full text, mbox):
The HTML manual accounts for more than 40% of the package size.
* gnu/packages/mpd.scm (mpd)[outputs]: Add 'html' output.
[arguments]: Add split-package phase.
---
gnu/packages/mpd.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 3259217989..fa16e60484 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -146,7 +146,16 @@ (define-public mpd
(("systemd_dep = declare_dependency" all)
(string-append "_" all)))
(substitute* "meson.build"
- (("systemd_dep,") "systemd_dep, _systemd_dep,")))))))
+ (("systemd_dep,") "systemd_dep, _systemd_dep,"))))
+ (add-after 'install 'split-package
+ (lambda _
+ ;; The HTML manual accounts for over 40% of the disk
+ ;; space used by the package.
+ (let* ((path "/share/doc/mpd/html")
+ (htmldir (string-append #$output path))
+ (htmldir* (string-append #$output:html path)))
+ (mkdir-p (dirname htmldir*))
+ (rename-file htmldir htmldir*)))))))
(inputs (append
(if (target-linux?) (list liburing) '())
(list ao
@@ -189,6 +198,7 @@ (define-public mpd
;;
;; Used when zziplib feature is enabled.
zip))
+ (outputs (list "out" "html"))
;; Missing optional inputs:
;; libcdio_paranoia
;; libmms
--
2.39.2
Information forwarded
to
guix-patches <at> gnu.org:
bug#63721; Package
guix-patches.
(Thu, 25 May 2023 19:48:02 GMT)
Full text and
rfc822 format available.
Message #14 received at 63721 <at> debbugs.gnu.org (full text, mbox):
Am Donnerstag, dem 25.05.2023 um 18:21 +0100 schrieb Bruno Victal:
> The HTML manual accounts for more than 40% of the package size.
>
> * gnu/packages/mpd.scm (mpd)[outputs]: Add 'html' output.
> [arguments]: Add split-package phase.
Prefer “doc” as a separate output, as the logic for that is mostly
there already. Or use “doc” and “doc-html” if you really must.
Cheers
Information forwarded
to
guix-patches <at> gnu.org:
bug#63721; Package
guix-patches.
(Fri, 26 May 2023 07:07:01 GMT)
Full text and
rfc822 format available.
Message #17 received at 63721 <at> debbugs.gnu.org (full text, mbox):
Properly enable tests as well since meson misleadingly reported a success when
clearly no tests were performed:
````````````````````````````````````
…
starting phase `check'
ninja: no work to do.
No tests defined.
phase `check' succeeded after 0.2 seconds
starting phase `install'
…
````````````````````````````````````
CMake was also removed from native inputs since it's only relevant when
building for Android or Windows.
* gnu/packages/mpd.scm (mpd): Update to 0.23.13.
[arguments]: Set #:configure-flags option to build tests.
[native-inputs]: Add googletest, zip. Remove cmake.
---
gnu/packages/mpd.scm | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 5005da4e87..3259217989 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -118,7 +118,7 @@ (define-public libmpdclient
(define-public mpd
(package
(name "mpd")
- (version "0.23.12")
+ (version "0.23.13")
(source (origin
(method url-fetch)
(uri
@@ -127,12 +127,13 @@ (define-public mpd
"/mpd-" version ".tar.xz"))
(sha256
(base32
- "1rq2hyfvwwri3sivab747csza2i096y7m8563rl5mhpchhiadz5p"))))
+ "06fmy68lfrsi5y03l53dnwcynqhwh5f5vhdpbsr8lzmvzgk02sx9"))))
(build-system meson-build-system)
(arguments
(list
#:configure-flags #~(list "-Ddocumentation=enabled"
- "-Dsystemd=enabled")
+ "-Dsystemd=enabled"
+ "-Dtest=true")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'enable-elogind
@@ -182,7 +183,12 @@ (define-public mpd
yajl
zlib
zziplib)))
- (native-inputs (list cmake pkg-config python-sphinx))
+ (native-inputs (list pkg-config python-sphinx googletest
+ ;; See test/meson.build for information about these
+ ;; additional dependencies.
+ ;;
+ ;; Used when zziplib feature is enabled.
+ zip))
;; Missing optional inputs:
;; libcdio_paranoia
;; libmms
base-commit: 3299b40b3599371890816b52d65a6a5ada1b1131
--
2.39.2
Information forwarded
to
guix-patches <at> gnu.org:
bug#63721; Package
guix-patches.
(Fri, 26 May 2023 07:07:02 GMT)
Full text and
rfc822 format available.
Message #20 received at 63721 <at> debbugs.gnu.org (full text, mbox):
The HTML manual accounts for more than 40% of the package size.
* gnu/packages/mpd.scm (mpd)[outputs]: Add 'doc' output.
[arguments]: Add split-package phase.
---
gnu/packages/mpd.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 3259217989..d4654d4842 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -146,7 +146,16 @@ (define-public mpd
(("systemd_dep = declare_dependency" all)
(string-append "_" all)))
(substitute* "meson.build"
- (("systemd_dep,") "systemd_dep, _systemd_dep,")))))))
+ (("systemd_dep,") "systemd_dep, _systemd_dep,"))))
+ (add-after 'install 'split-package
+ (lambda _
+ ;; The HTML manual accounts for over 40% of the disk
+ ;; space used by the package.
+ (let* ((path "/share/doc/mpd/html")
+ (htmldir (string-append #$output path))
+ (htmldir* (string-append #$output:doc path)))
+ (mkdir-p (dirname htmldir*))
+ (rename-file htmldir htmldir*)))))))
(inputs (append
(if (target-linux?) (list liburing) '())
(list ao
@@ -189,6 +198,7 @@ (define-public mpd
;;
;; Used when zziplib feature is enabled.
zip))
+ (outputs (list "out" "doc"))
;; Missing optional inputs:
;; libcdio_paranoia
;; libmms
--
2.39.2
Reply sent
to
Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
You have taken responsibility.
(Sun, 04 Jun 2023 06:30:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Bruno Victal <mirai <at> makinata.eu>:
bug acknowledged by developer.
(Sun, 04 Jun 2023 06:30:02 GMT)
Full text and
rfc822 format available.
Message #25 received at 63721-done <at> debbugs.gnu.org (full text, mbox):
Am Donnerstag, dem 01.06.2023 um 20:20 +0200 schrieb Liliana Marie
Prikler:
> Am Mittwoch, dem 31.05.2023 um 08:23 +0100 schrieb Bruno Victal:
> > Hi lfam,
> >
> > This is already included in #63721.
> That's fine, because your patch does two things in one. I will
> rebase your changes on top of Leo's and presumably push them on
> Sunday.
Hi folks, it's Sunday :)
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Sun, 02 Jul 2023 11:24:05 GMT)
Full text and
rfc822 format available.
This bug report was last modified 291 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.