GNU bug report logs - #67340
[PATCH gnome-team 1/2] gnu: gnome-music: Update to 44.0.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67340 in the body.
You can then email your comments to 67340 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: guix-patches <at> gnu.org
Cc: rg <at> raghavgururajan.name, liliana.prikler <at> gmail.com,
 maxim.cournoyer <at> gmail.com
Subject: [PATCH gnome-team 1/2] gnu: gnome-music: Update to 44.0.
Date: Tue, 21 Nov 2023 18:51:37 +0100

When wrapping gnome-music, GST_PLUGIN_SYSTEM_PATH should not override the
plugins installed by the user.

* gnu/packages/gnome.scm (gnome-music): Update to 44.0.
[#:phases]<wrap-gnome-music>: Update path wrapping.
[inputs]: Add bash-minimal.  Replace libsoup-minimal-2 with libsoup.

Change-Id: I9b8ac5ee65618baafc760be8f7ab3132f4d53345
---
 gnu/packages/gnome.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ab485cffb1..baeda23492 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -887,7 +887,7 @@ (define-public gnome-photos
 (define-public gnome-music
   (package
     (name "gnome-music")
-    (version "42.1")
+    (version "44.0")
     (source
      (origin
        (method url-fetch)
@@ -897,7 +897,7 @@ (define-public gnome-music
                        name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0w42xnp6xy3sfakb4s0wq7xfg7p507whz5gzss5b2mkbm2k7yx67"))))
+         "0l8xiw1nv8agskrpgiyr7kinna3gms1hv5d64hh4fqifaz4smlcv"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
@@ -920,7 +920,7 @@ (define-public gnome-music
                (wrap-program (string-append out "/bin/gnome-music")
                  `("GI_TYPELIB_PATH" =
                    (,(getenv "GI_TYPELIB_PATH")))
-                 `("GST_PLUGIN_SYSTEM_PATH" =
+                 `("GST_PLUGIN_SYSTEM_PATH" suffix
                    (,(getenv "GST_PLUGIN_SYSTEM_PATH")))
                  `("GRL_PLUGIN_PATH" =
                    (,(getenv "GRL_PLUGIN_PATH")))
@@ -934,7 +934,8 @@ (define-public gnome-music
            itstool
            pkg-config))
     (inputs
-     (list gnome-online-accounts
+     (list bash-minimal
+           gnome-online-accounts
            grilo
            grilo-plugins
            gst-plugins-base
@@ -946,7 +947,7 @@ (define-public gnome-music
            libadwaita
            libdazzle
            libmediaart
-           libsoup-minimal-2
+           libsoup
            python-pycairo
            python-pygobject
            python

base-commit: 1cc3b7e80f60a2a5a6a1400ed0b025efeae7a523
-- 
2.41.0

Message #8 received at 67340 <at> debbugs.gnu.org (full text, mbox):

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: 67340 <at> debbugs.gnu.org
Cc: rg <at> raghavgururajan.name, liliana.prikler <at> gmail.com,
 maxim.cournoyer <at> gmail.com
Subject: [PATCH gnome-team 2/2] gnu: gnome-music: Update style.
Date: Tue, 21 Nov 2023 18:56:29 +0100

* gnu/packages/gnome.scm (gnome-music) [arguments]: Convert to list of G-Expressions.

Change-Id: I5cb724bc66dcfee14958753c0a129add55820db6
---
 gnu/packages/gnome.scm | 53 +++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index baeda23492..3082500b4e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -900,32 +900,33 @@ (define-public gnome-music
          "0l8xiw1nv8agskrpgiyr7kinna3gms1hv5d64hh4fqifaz4smlcv"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'skip-gtk-update-icon-cache
-           ;; Don't create 'icon-theme.cache'.
-           (lambda _
-             (substitute* "meson.build"
-               (("gtk_update_icon_cache: true")
-                "gtk_update_icon_cache: false"))))
-         (add-after 'install 'wrap-gnome-music
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let*
-                 ((out (assoc-ref outputs "out"))
-                  (pylib (string-append out "/lib/python"
-                                        ,(version-major+minor
-                                          (package-version python))
-                                        "/site-packages")))
-               (wrap-program (string-append out "/bin/gnome-music")
-                 `("GI_TYPELIB_PATH" =
-                   (,(getenv "GI_TYPELIB_PATH")))
-                 `("GST_PLUGIN_SYSTEM_PATH" suffix
-                   (,(getenv "GST_PLUGIN_SYSTEM_PATH")))
-                 `("GRL_PLUGIN_PATH" =
-                   (,(getenv "GRL_PLUGIN_PATH")))
-                 `("GUIX_PYTHONPATH" =
-                   (,(getenv "GUIX_PYTHONPATH") ,pylib)))))))))
+     (list
+      #:glib-or-gtk? #t
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'skip-gtk-update-icon-cache
+            ;; Don't create 'icon-theme.cache'.
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))))
+          (add-after 'install 'wrap-gnome-music
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (pylib (string-append out "/lib/python"
+                                           #$(version-major+minor
+                                              (package-version
+                                               (this-package-input "python")))
+                                           "/site-packages")))
+                (wrap-program (string-append out "/bin/gnome-music")
+                  `("GI_TYPELIB_PATH" =
+                    (,(getenv "GI_TYPELIB_PATH")))
+                  `("GST_PLUGIN_SYSTEM_PATH" suffix
+                    (,(getenv "GST_PLUGIN_SYSTEM_PATH")))
+                  `("GRL_PLUGIN_PATH" =
+                    (,(getenv "GRL_PLUGIN_PATH")))
+                  `("GUIX_PYTHONPATH" =
+                    (,(getenv "GUIX_PYTHONPATH") ,pylib)))))))))
     (native-inputs
      (list desktop-file-utils
            gettext-minimal
-- 
2.41.0

Message #13 received at 67340-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Vivien Kraus <vivien <at> planete-kraus.eu>, 67340-done <at> debbugs.gnu.org
Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com
Subject: Re: [PATCH gnome-team 2/2] gnu: gnome-music: Update style.
Date: Mon, 04 Dec 2023 20:36:49 +0100

Am Dienstag, dem 21.11.2023 um 18:56 +0100 schrieb Vivien Kraus:
> * gnu/packages/gnome.scm (gnome-music) [arguments]: Convert to list
> of G-Expressions.
> 
> Change-Id: I5cb724bc66dcfee14958753c0a129add55820db6
> ---
Pushed.

Thanks

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.