From 1414a2f0b8c1ec47f1f968f32085460b0b26deba Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 6 Aug 2020 11:32:45 -0400
Subject: [PATCH 32/44] gnu: gnome-maps: Update package definition.

* gnu/packages/gnome.scm (gnome-maps) [version]: Update to 3.36.0.
[source]<origin>[sha256]: Modify base32.
[build-system]: Change from gnu to glib-or-gtk.
[arguments]<#:configure-flags>[--disable-static]: New flag.
<#:make-flags>[INTROSPECTION_GIRDIR]: New flag.
[INTROSPECTION_TYPELIBDIR]: New flag.
[native-inputs]: Add gjs and gobject-introspection. Move glib to ...
[propagated-inputs]: ... here.
[synopsis]: Modify.
[license]: Add gpl2+.
---
 gnu/packages/gnome.scm | 53 +++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7cf66e2109..fe5e9934bb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1876,25 +1876,50 @@ project.")
 (define-public gnome-menus
   (package
     (name "gnome-menus")
-    (version "3.32.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/gnome-menus/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0x2blzqrapmbsbfzxjcdcpa3vkw9hq5k96h9kvjmy9kl415wcl68"))))
-    (build-system gnu-build-system)
+    (version "3.36.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/gnome-menus/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r"))))
+    (build-system glib-or-gtk-build-system)
+    (arguments
+     `(#:configure-flags
+       (list
+        "--disable-static")
+       #:make-flags
+       (list
+        (string-append "INTROSPECTION_GIRDIR="
+                       (assoc-ref %outputs "out")
+                       "/share/gir-"
+                       ,(version-major (package-version gobject-introspection))
+                       ".0")
+        (string-append "INTROSPECTION_TYPELIBDIR="
+                       (assoc-ref %outputs "out")
+                       "/lib/girepository-"
+                       ,(version-major (package-version gobject-introspection))
+                       ".0"))))
     (native-inputs
      `(("gettext" ,gettext-minimal)
-       ("glib" ,glib)
+       ("gjs" ,gjs)
+       ("gobject-introspection" ,gobject-introspection)
        ("pkg-config" ,pkg-config)))
-    (synopsis "Menu support for GNOME desktop")
-    (description "GNOME Menus contains the libgnome-menu library, the layout
+    (propagated-inputs
+     `(("glib" ,glib)))
+    (synopsis "GNOME Menu support")
+    (description "GNOME-Menus contains the libgnome-menu library, the layout
 configuration files for the GNOME menu, as well as a simple menu editor.")
     (home-page "https://gitlab.gnome.org/GNOME/gnome-menus")
-    (license license:lgpl2.0+)))
+    (license
+     (list
+      ;; Library
+      license:lgpl2.0+
+      ;; Others
+      license:gpl2+))))
 
 (define-public deja-dup
   (package
-- 
2.28.0