[bug#47887] [PATCH 1/2] gnu: Add gnome-2048

[bug#47887] [PATCH 1/2] gnu: Add gnome-2048

[jgart via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 421 bytes --]

Hi Guix,

Here is gnome-2048 co-authored with Carla Cao for review.

Carla wrote the description for the game.

I had to upgrade libgnome-games-support which now uses the meson-build-system instead of a Makefile.

We tested this with ./pre-inst-env guix environment --ad-hoc gnome-2048 -- gnome-2048

A word of caution: the above command will launch you into a very addictive game ;)

all the best,

jgart

[-- Attachment #2: 0001-gnu-libgnome-games-support-Update-to-1.7.1.patch --]
[-- Type: application/octet-stream, Size: 1881 bytes --]

From 9b0c462b1a8522c740cdef8f6afda45ad94a4dff Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Mon, 19 Apr 2021 01:33:30 -0400
Subject: [PATCH 1/2] gnu: libgnome-games-support: Update to 1.7.1.

* gnu/packages/gnome.scm (libgnome-games-support): Update to 1.7.1.
---
 gnu/packages/gnome.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 34f5078581..ccb0814de7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6002,7 +6002,7 @@ queries upon that data.")
 (define-public libgnome-games-support
   (package
     (name "libgnome-games-support")
-    (version "1.4.4")
+    (version "1.7.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libgnome-games-support/"
@@ -6010,16 +6010,17 @@ queries upon that data.")
                                   "libgnome-games-support-" version ".tar.xz"))
               (sha256
                (base32
-                "1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq"))))
-    (build-system gnu-build-system)
+                "11g1r3ppb9v8m3anks9gxf7fv1x38vmjiya3lr7zjjv328pb69d6"))))
+    (build-system meson-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'pre-check
-           (lambda _
-             ;; Tests require a writable HOME.
-             (setenv "HOME" (getcwd))
-             #t)))))
+      '(#:glib-or-gtk? #t
+        #:phases
+          (modify-phases %standard-phases
+            (add-before 'check 'pre-check
+              (lambda _
+                ;; Tests require a writable HOME.
+                (setenv "HOME" (getcwd))
+                #t)))))
     (native-inputs
      `(("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
-- 
2.29.3


[-- Attachment #3: 0002-gnu-Add-gnome-2048.patch --]
[-- Type: application/octet-stream, Size: 2740 bytes --]

From 7ea5cee4c0af275dfc9afdcc28dff166110b2f3f Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Mon, 19 Apr 2021 01:43:04 -0400
Subject: [PATCH 2/2] gnu: Add gnome-2048.

    * gnu/packages/games.scm (gnome-2048): New variable.

    Co-authored-by: Carla Cao <ccao001@fiu.edu>
---
 gnu/packages/games.scm | 46 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 91ac839aee..50a742935a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1623,6 +1623,52 @@ destroying an ancient book using a special wand.")
     ;; license.  The whole package is released under GPLv3+.
     (license license:gpl3+)))
 
+(define-public gnome-2048
+  (package
+    (name "gnome-2048")
+    (version "3.38.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/gnome-2048/"
+                                  (version-major+minor version)  "/"
+                                  "gnome-2048-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"))))
+    (build-system meson-build-system)
+    (arguments
+     '(#:glib-or-gtk? #t
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'skip-gtk-update-icon-cache
+           ;; Don't create 'icon-theme.cache'.
+           (lambda _
+             (substitute* "meson_post_install.py"
+               (("gtk-update-icon-cache") "true"))
+             #t)))))
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("clutter" ,clutter)
+       ("clutter-gtk" ,clutter-gtk)
+       ("libgee" ,libgee)
+       ("libgnome-games-support" ,libgnome-games-support)))
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin") ; for desktop-file-validate and appstream-util
+       ("itstool" ,itstool)
+       ("libxml2" ,libxml2)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
+    (home-page "https://wiki.gnome.org/Apps/2048")
+    (synopsis "Move the tiles until you obtain the 2048 tile")
+    (description "GNOME 2048 provides a 2D grid for playing 2048, a single-player sliding
+tile puzzle game.  The objective of the game is to merge together adjacent tiles of the
+same number until the sum of 2048 is achieved in one tile.  However, one can continue to
+play the game after achieving a tile of 2048 to create tiles with even larger numbers.
+You can save your progress at any point, allowing you to continue from where you left off
+when reopening the game.")
+    (license license:gpl3+)))
+
 (define-public gnome-chess
   (package
     (name "gnome-chess")
-- 
2.29.3

[bug#47887] [PATCH 1/2] gnu: Add gnome-2048

[Leo Prikler]

Hi jgart,

Am Montag, den 19.04.2021, 05:58 +0000 schrieb jgart:
> Here is gnome-2048 co-authored with Carla Cao for review.
> 
> Carla wrote the description for the game.
Please make sure to stay within our very tight margins next time ;)

> I had to upgrade libgnome-games-support which now uses the meson-
> build-system instead of a Makefile.
I had a look at its dependants and they seem fine.

> We tested this with ./pre-inst-env guix environment --ad-hoc gnome-
> 2048 -- gnome-2048
> 
> A word of caution: the above command will launch you into a very
> addictive game ;)
Meh, gnome-2048 is not quick enough in its ↓→ game.

Pushed as fe5c36728f9e1287f621070383c54387f487a4a1.  

Thanks,
Leo Prikler

[bug#47887] [PATCH 1/2] gnu: Add gnome-2048

[jgart via Guix-patches via]

> Please make sure to stay within our very tight margins next time ;)

I think that must have been Carla abusing the description field string as if it were a zettelkasten think space (via leafpad editor) in a guix environment.

We'll be more careful next time :)

Thanks for merging Leo!

all the best,

jgart

April 19, 2021 5:54 AM, "Leo Prikler" <leo.prikler@student.tugraz.at> wrote:

> Hi jgart,
> 
> Am Montag, den 19.04.2021, 05:58 +0000 schrieb jgart:
> 
>> Here is gnome-2048 co-authored with Carla Cao for review.
>> 
>> Carla wrote the description for the game.
> 
> Please make sure to stay within our very tight margins next time ;)
> 
>> I had to upgrade libgnome-games-support which now uses the meson-
>> build-system instead of a Makefile.
> 
> I had a look at its dependants and they seem fine.
> 
>> We tested this with ./pre-inst-env guix environment --ad-hoc gnome-
>> 2048 -- gnome-2048
>> 
>> A word of caution: the above command will launch you into a very
>> addictive game ;)
> 
> Meh, gnome-2048 is not quick enough in its ↓→ game.
> 
> Pushed as fe5c36728f9e1287f621070383c54387f487a4a1.
> 
> Thanks,
> Leo Prikler