unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#29764] [PATCH] gnu: lollypop: Use meson-build-system.
@ 2017-12-18 10:19 Thomas Danckaert
  2017-12-21 20:54 ` Catonano
  2017-12-22  8:51 ` Ludovic Courtès
  0 siblings, 2 replies; 8+ messages in thread
From: Thomas Danckaert @ 2017-12-18 10:19 UTC (permalink / raw)
  To: 29764

[-- Attachment #1: Type: Text/Plain, Size: 175 bytes --]

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

[-- Attachment #2: 0001-gnu-lollypop-Use-meson-build-system.patch --]
[-- Type: Text/X-Patch, Size: 3069 bytes --]

From fb89164e2983ebb61b0920d52fcce04d6ac9e9da Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@gmail.com>
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


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-12-27 15:25 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-18 10:19 [bug#29764] [PATCH] gnu: lollypop: Use meson-build-system Thomas Danckaert
2017-12-21 20:54 ` Catonano
2017-12-22  8:50   ` Thomas Danckaert
2017-12-22  8:51 ` Ludovic Courtès
2017-12-22 19:02   ` Catonano
2017-12-26 12:13     ` Thomas Danckaert
2017-12-26 13:56       ` Catonano
2017-12-27 15:24         ` bug#29764: " Thomas Danckaert

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).