Subject: bug#37718: closed (Re: [bug#37718] [PATCH] Add gnome-mahjongg.)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 15 Oct 2019 12:18:03 +0000

Your bug report

#37718: [PATCH] Add gnome-mahjongg.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
37718: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37718
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#37718] [PATCH] Add gnome-mahjongg.
From: Ludovic Courtès <[email-masked]>
To: "David Wilson" <[email-masked]>
Cc: [email-masked]
Date: Tue, 15 Oct 2019 14:17:18 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi David,

"David Wilson" <[email-masked]> skribis:

> From a589ef5124d265b9c0fb646b35e8efe852b74855 Mon Sep 17 00:00:00 2001
> From: David Wilson <[email-masked]>
> Date: Sat, 12 Oct 2019 09:07:11 -0700
> Subject: [PATCH] gnu: Add gnome-mahjongg.
>
> * gnu/packages/gnome.scm (gnome-mahjongg) New variable.

Applied with the following changes, thanks!

Ludo’.

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 81566e6e42..99cd7a7cb6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8406,6 +8406,7 @@ higher level porcelain stuff.")
               (uri (git-reference
                     (url "https://gitlab.gnome.org/GNOME/gnome-mahjongg.git")
                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "019a66a4m5w4kkb0sm6gxj0wi54n06zdxdlmyqw7h8kbakjizv7l"))))
@@ -8427,8 +8428,8 @@ higher level porcelain stuff.")
        ("gtk+" ,gtk+)
        ("librsvg" ,librsvg)))
     (synopsis "Mahjongg tile-matching game")
-    (description "Gnome Mahjongg is a game based on the classic Chinese tile-
-matching game Mahjong.  It features multiple board layouts, tile themes, and a
-high score table.")
+    (description "GNOME Mahjongg is a game based on the classic Chinese
+tile-matching game Mahjong.  It features multiple board layouts, tile themes,
+and a high score table.")
     (home-page "https://wiki.gnome.org/Apps/Mahjongg")
     (license license:gpl2)))

Subject: [PATCH] Add gnome-mahjongg.
From: "David Wilson" <[email-masked]>
To: [email-masked]
Date: Sat, 12 Oct 2019 09:17:41 -0700
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi fellow Guixers,

Here's a patch to add the (highly addictive) game Gnome Mahjongg.  Please let me know if there's any way this package definition can be improved!

Happy hacking,

David
From a589ef5124d265b9c0fb646b35e8efe852b74855 Mon Sep 17 00:00:00 2001
From: David Wilson <[email-masked]>
Date: Sat, 12 Oct 2019 09:07:11 -0700
Subject: [PATCH] gnu: Add gnome-mahjongg.

* gnu/packages/gnome.scm (gnome-mahjongg) New variable.
---
 gnu/packages/gnome.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 91a781bfba..ce58ff4006 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -41,6 +41,7 @@
 ;;; Copyright © 2019 Jonathan Frederickson <[email-masked]>
 ;;; Copyright © 2019 Maxim Cournoyer <[email-masked]>
 ;;; Copyright © 2019 Martin Becze <[email-masked]>
+;;; Copyright © 2019 David Wilson <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -8394,3 +8395,39 @@ access library.  It only implements the core plumbing functions, not really the
 higher level porcelain stuff.")
     (home-page "https://wiki.gnome.org/Projects/Libgit2-glib")
     (license license:gpl2+)))
+
+(define-public gnome-mahjongg
+  (package
+    (name "gnome-mahjongg")
+    (version "3.35.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.gnome.org/GNOME/gnome-mahjongg.git")
+                    (commit version)))
+              (sha256
+               (base32
+                "019a66a4m5w4kkb0sm6gxj0wi54n06zdxdlmyqw7h8kbakjizv7l"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#: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
+     `(("dconf" ,dconf)))
+    (inputs
+     `(("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("librsvg" ,librsvg)))
+    (synopsis "Mahjongg tile-matching game")
+    (description "Gnome Mahjongg is a game based on the classic Chinese tile-
+matching game Mahjong.  It features multiple board layouts, tile themes, and a
+high score table.")
+    (home-page "https://wiki.gnome.org/Apps/Mahjongg")
+    (license license:gpl2)))
-- 
2.23.0