--- Begin Message ---
|
Subject: |
[PATCH] gnu: lollypop: Use meson-build-system. |
|
Date: |
Mon, 18 Dec 2017 11:19:16 +0100 (CET) |
Hi Guix,
this patch replaces the “pseudo meson build system” for lollypop by
the real thing ;-) (By the way, the current build doesn't succeed
anymore.)
Thomas
>From fb89164e2983ebb61b0920d52fcce04d6ac9e9da 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.
* gnu/packages/gnome.scm (lollypop) [build-system]: Use meson-build-system.
[arguments]: Remove phases for "pseudo meson build system", enable
glib-or-gtk?
[native-inputs]: Add glib:bin and gtk+:bin, remove ninja.
[inputs]: Remove gtk+ and meson.
---
gnu/packages/gnome.scm | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7b93ddd14..71a675169 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6925,47 +6925,31 @@ views can be printed as PDF or PostScript files, or
exported to HTML.")
(sha256
(base32
"070y6wf1180hbl1ix8al7fmc6y06jb5m14h73g509g4xbwlk62g8"))))
- ;; TODO: Use meson-build-system
- (build-system glib-or-gtk-build-system)
+ (build-system meson-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
- ,@%glib-or-gtk-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"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(wrap-program (string-append out "/bin/lollypop")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
- #t))
- (add-after 'install 'wrap
- (@@ (guix build python-build-system) wrap)))))
+ #t)))))
(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
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#29764] [PATCH] gnu: lollypop: Use meson-build-system. |
|
Date: |
Wed, 27 Dec 2017 16:24:20 +0100 (CET) |
From: Catonano <address@hidden>
Subject: Re: [bug#29764] [PATCH] gnu: lollypop: Use
meson-build-system.
Date: Tue, 26 Dec 2017 14:56:37 +0100
ehm, if you say it works for you, I'll believe you. I'm not ready
to fiddle with mp3 extrraction now
Well I just meant, perhaps you wanted to check if it works on your
system, too (because sometimes certain issues only occur on specific
configurations). Anyway, I'm quite confident it's ok now, and the
patch is definitely an improvement over the status quo, so I pushed
it :)
Thanks for your time!
Thomas
--- End Message ---