[bug#29764] [PATCH] gnu: lollypop: Use meson-build-system.

[Thomas Danckaert]

From: Catonano <address@hidden>
Subject: Re: [bug#29764] [PATCH] gnu: lollypop: Use 
meson-build-system.
Date: Fri, 22 Dec 2017 20:02:38 +0100

> This is what happened in the terminal (is this phisiological or
> pathological ?)
>
> ~$ lollypop
> cannot import name 'BadAuthenticationError'
>     - Scrobbler disabled
>     - Auto cover download disabled
>     - Artist information disabled
> $ sudo pip3 install pylast
> /gnu/store/ci1r0vymm49jlxhwv394aqk4shjmd6gh-python-pygobject-3.24.1/
> lib/python3.5/site-packages/gi/module.py:178: Warning:
> g_array_append_vals: assertion 'array' failed
>   g_type = info.get_g_type()
> /gnu/store/ci1r0vymm49jlxhwv394aqk4shjmd6gh-python-pygobject-3.24.1/
> lib/python3.5/site-packages/gi/module.py:178: Warning:
> g_hash_table_lookup: assertion 'hash_table != NULL' failed
>   g_type = info.get_g_type()
> /gnu/store/ci1r0vymm49jlxhwv394aqk4shjmd6gh-python-pygobject-3.24.1/
> lib/python3.5/site-packages/gi/module.py:178: Warning:
> g_hash_table_insert_internal: assertion 'hash_table != NULL' failed
>   g_type = info.get_g_type()
>
> As you can see there's a
>
> $ sudo pip3 install pylast
>
> line in the output
>
> I don't really understand how that's possible, but I checked this 2
> times

Hi,

thanks for testing again.  I think the line about pylast is meant as 
an advice to install pylast, because there was an error interacting 
with that library.  This is fixed in version 0.9.306, so I included 
an update to this version in the patch.

I think the other warnings are “harmless”.

> Where can I download some mp3s legally ?
> I would test it with some real music

I can confirm it works here.  If you want to try it yourself: I don't 
have an example of an mp3 sample ready, but you could always extract 
the audio from an online video (youtube, vimeo, ...) using 
youtube-dl? (Or, if you still have cd's and such: extract one of your 
cd's to ogg or mp3)

cheers,

Thomas

>From 4943ad1cd088f7d4328971cc0f5742d315612073 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <address@hidden>
Date: Mon, 18 Dec 2017 11:10:27 +0100
Subject: [PATCH] gnu: lollypop: Use meson-build-system, update to 0.9.306.

* gnu/packages/gnome.scm (lollypop) [origin]: Update version to 0.9.306,
download tarball from gitlab.
[build-system]: Use meson-build-system.
[arguments]: Remove phases for "pseudo meson build system".
[native-inputs]: Add glib:bin and gtk+:bin, remove ninja.
[inputs]: Remove gtk+ and meson.
---
 gnu/packages/gnome.scm | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7b93ddd14..6c1f41fd4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6915,35 +6915,24 @@ views can be printed as PDF or PostScript files, or 
exported to HTML.")
 (define-public lollypop
   (package
     (name "lollypop")
-    (version "0.9.304")
+    (version "0.9.306")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "https://github.com/gnumdk/lollypop/";
-                           "releases/download/" version "/"
+       (uri (string-append "https://gitlab.gnome.org/gnumdk/lollypop/uploads/";
+                           "b769805b7063ef9807e4e832e7e87ad2/"
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "070y6wf1180hbl1ix8al7fmc6y06jb5m14h73g509g4xbwlk62g8"))))
-    ;; TODO: Use meson-build-system
-    (build-system glib-or-gtk-build-system)
+         "0c49v6793bywvh295xbii9yq21hh3qpmxwbgp9i71kj6r9grvhan"))))
+    (build-system meson-build-system)
     (arguments
      `(#:imported-modules ((guix build python-build-system)
-                           ,@%glib-or-gtk-build-system-modules)
+                           ,@%meson-build-system-modules)
+       #:glib-or-gtk? #t
        #:tests? #f ; no test suite
        #:phases
        (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               ;; remove post-install script, we update the caches later
-               (substitute* "meson.build"
-                 (("meson.add_install_script\\('meson_post_install.py'\\)") 
""))
-               (zero?
-                 (system* "meson" "builddir" (string-append "--prefix=" 
out))))))
-         (replace 'install
-           (lambda _ (zero? (system* "ninja" "-C" "builddir" "install"))))
          (add-after 'install 'wrap-program
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out               (assoc-ref outputs "out"))
@@ -6956,16 +6945,15 @@ views can be printed as PDF or PostScript files, or 
exported to HTML.")
     (native-inputs
      `(("intltool" ,intltool)
        ("itstool" ,itstool)
-       ("ninja" ,ninja)
+       ("glib:bin" ,glib "bin")         ; For glib-compile-resources
+       ("gtk+:bin" ,gtk+ "bin")         ; For gtk-update-icon-cache
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("gobject-introspection" ,gobject-introspection)
        ("gst-plugins-base" ,gst-plugins-base)
-       ("gtk+" ,gtk+)
        ("libnotify" ,libnotify)
        ("libsecret" ,libsecret)
        ("libsoup" ,libsoup)
-       ("meson" ,meson)
        ("python" ,python)
        ("python-beautifulsoup4" ,python-beautifulsoup4)
        ("python-gst" ,python-gst)
-- 
2.15.1