From 372049107f416a52a2c76d95004245eb03c6e860 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sun, 9 Apr 2023 11:55:10 -0400
Subject: gnu: gnome-mahjongg: Update to 3.38.3-0.e9e73e5.

* gnu/packages/gnome.scm (gnome-mahjongg): Update to 3.38.3-0.e9e73e5.
[arguments]: Remove #:meson.
[native-inputs]: Replace gtk+:bin with gtk:bin.
[inputs]: Replace gtk+ with gtk and add libadwaita.
---
 gnu/packages/gnome.scm | 67 +++++++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 07a27d4272..2b3bff2b72 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12150,39 +12150,44 @@ library which detects when a file or a directory has been modified.")
     (license license:gpl2+)))
 
 (define-public gnome-mahjongg
-  (package
-    (name "gnome-mahjongg")
-    (version "3.38.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/" name "-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj"))))
-    (build-system meson-build-system)
-    (arguments
-     `(#:meson ,meson-0.59
-       #:glib-or-gtk? #t))
-    (native-inputs
-     `(("appstream-glib" ,appstream-glib)
-       ("gettext" ,gettext-minimal)
-       ("glib:bin" ,glib "bin") ;; For glib-compile-resources
-       ("gtk+" ,gtk+ "bin")     ;; For gtk-update-icon-cache
-       ("itstool" ,itstool)
-       ("pkg-config" ,pkg-config)
-       ("vala" ,vala)))
-    (propagated-inputs
-     (list dconf))
-    (inputs
-     (list glib gtk+))
-    (synopsis "Mahjongg tile-matching game")
-    (description "GNOME Mahjongg is a game based on the classic Chinese
+  ;; There hasn't been a GNOME Mahjongg release in a long time, and the last
+  ;; release doesn't build with a recent Meson, so use the latest commit.
+  (let ((commit "e9e73e5165e5968ff897e568f8eba10fc1eb207b")
+        (revision "0"))
+    (package
+      (name "gnome-mahjongg")
+      (version (git-version "3.38.3" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://gitlab.gnome.org/GNOME/gnome-mahjongg")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1cj0c076h7qfz77wpz8ypli60inj37fgw0cl9cc39b1kjfqcy3mb"))))
+      (build-system meson-build-system)
+      (arguments (list #:glib-or-gtk? #t))
+      (native-inputs
+       (list appstream-glib
+             gettext-minimal
+             `(,glib "bin")             ;for glib-compile-resources
+             `(,gtk "bin")              ;for gtk-update-icon-cache
+             itstool
+             pkg-config
+             vala))
+      (propagated-inputs
+       (list dconf))
+      (inputs
+       (list glib
+             gtk
+             libadwaita))
+      (synopsis "Mahjongg tile-matching game")
+      (description "GNOME Mahjongg is a game based on the classic Chinese
 tile-matching game Mahjongg.  It features multiple board layouts, tile themes,
 and a high score table.")
-    (home-page "https://wiki.gnome.org/Apps/Mahjongg")
-    (license license:gpl2+)))
+      (home-page "https://wiki.gnome.org/Apps/Mahjongg")
+      (license license:gpl2+))))
 
 (define-public gnome-themes-extra
   (package
-- 
cgit v1.2.3