unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] gnu: Add gnome-sudoku and qqwing
@ 2016-04-11  3:23 kei
  2016-04-11  4:44 ` Leo Famulari
  2016-04-11  6:09 ` Efraim Flashner
  0 siblings, 2 replies; 7+ messages in thread
From: kei @ 2016-04-11  3:23 UTC (permalink / raw)
  To: guix-devel

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

I'm attempting something new with this patch. I want to add gnome-sudoku 
to the tree, and it requires qqwing as a dependency. QQwing didn't seem 
to fit in any other category so I put it in it's own file.

Guidance would be appreciated! Thank you in advance.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-qqwing-and-gnome-sudoku.patch --]
[-- Type: text/x-diff; name=0001-gnu-Add-qqwing-and-gnome-sudoku.patch, Size: 4450 bytes --]

From c257cec53be971a009f860364b44f4ed4339807e Mon Sep 17 00:00:00 2001
From: Kei Yamashita <kei@openmailbox.org>
Date: Sun, 10 Apr 2016 23:10:43 -0400
Subject: [PATCH] gnu: Add qqwing and gnome-sudoku.

* gnu/packages/qqwing.scm (qqwing): New variable.
* gnu/packages/gnome.scm (gnome-sudoku): New variable.
---
 gnu/packages/gnome.scm  | 36 ++++++++++++++++++++++++++++++++++++
 gnu/packages/qqwing.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 gnu/packages/qqwing.scm

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5c2cf01..c6e314b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -86,6 +86,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages qqwing)
   #:use-module (gnu packages scanner)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages xml)
@@ -2207,6 +2208,41 @@ and other secrets.  It communicates with the \"Secret Service\" using DBus.")
 floating in an ocean using only your brain and a little bit of luck.")
     (license license:gpl2+)))
 
+(define-public gnome-sudoku
+  (package
+    (name "gnome-sudoku")
+    (version "3.18.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/" name "/"
+                           (version-major+minor version) "/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "1b60z22fjrjzsz0kfhv0kfhvigzn54wvh9s31zrlp7sx2h2dxvsf"))))
+    (build-system glib-or-gtk-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("desktop-file-utils" ,desktop-file-utils)
+       ("intltool" ,intltool)
+       ("itstool" ,itstool)
+       ("xmllint" ,libxml2)))
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("json-glib" ,json-glib)
+       ("libgee" ,libgee)
+       ("librsvg" ,librsvg)
+       ("qqwing" ,qqwing)))
+    (home-page "https://wiki.gnome.org/Apps/Sudoku")
+    (synopsis "Japanese logic game")
+    (description
+     "Sudoku is a Japanese logic game that exploded in popularity in 2005.  
+GNOME Sudoku is meant to have an interface as simple and unobstrusive as
+possible while still providing features that make playing difficult Sudoku
+more fun.")
+    (license license:gpl2+)))
+
 (define-public gnome-terminal
   (package
     (name "gnome-terminal")
diff --git a/gnu/packages/qqwing.scm b/gnu/packages/qqwing.scm
new file mode 100644
index 0000000..709490d
--- /dev/null
+++ b/gnu/packages/qqwing.scm
@@ -0,0 +1,46 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages qqwing)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages pkg-config))
+
+(define-public qqwing
+  (package
+    (name "qqwing")
+    (version "1.3.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://debian/pool/main/q/qqwing/"
+                    name "_" version ".orig.tar.gz"))
+              (sha256
+               (base32
+                "0bw0papyqjg22z6irf36gs54y8236wa37b6gyn2h1spy65n76lqp"))))
+    (build-system gnu-build-system)
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (home-page "https://qqwing.com/")
+    (synopsis "Software for working with sudoku puzzles.")
+    (description
+     "QQwing is software for generating and solving Sudoku puzzles.")
+    (license license:gpl2+)))
-- 
2.7.3


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH] gnu: Add gnome-sudoku and qqwing
@ 2016-04-12 16:59 kei
  2016-04-13  6:25 ` 宋文武
  0 siblings, 1 reply; 7+ messages in thread
From: kei @ 2016-04-12 16:59 UTC (permalink / raw)
  To: guix-devel

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



-------- Original Message --------
Subject: Re: [PATCH] gnu: Add gnome-sudoku and qqwing
Date: 2016-04-12 12:58
 From: kei@openmailbox.org
To: Leo Famulari <leo@famulari.name>

On 2016-04-11 17:57, Leo Famulari wrote:
> On Mon, Apr 11, 2016 at 12:06:17PM -0400, kei@openmailbox.org wrote:
>> I decided to add gnome-sudoku to gnome.scm because of how a new 
>> version
>> is released with each new version of GNOME. Also, since qqwing seems 
>> to
>> be used only by gnome-sudoku, I moved it over to gnome.scm as well.
> 
> Okay, if gnome-sudoku has to stay in sync with GNOME, then I'd say it
> makes some sense to put it in gnome.scm. Is there some GNOME package
> that sets the version for the rest of our GNOME ecosystem? Should we be
> pulling the version from some other package?
> 
> I still think the best place is games.scm with the other games.
> 
> CC-ing our GNOME expert, 宋文武, for some advice.
> 
> I don't think qqwing belongs in gnome.scm. The source code doesn't
> mention GNOME in any substantive way and, as far as I can tell, it's 
> not
> tied to GNOME. Am I wrong? If not, I think that games.scm (or possibly
> game-development.scm) are appropriate.
> 
>> >Why download the source code from Debian instead of https://qqwing.com
>> >(which redirects to GitHub)?
>> >
>> I switched to using the link at the bottom of the page.
> 
> Thanks!
> 
>> >>+    (description
>> >>+     "QQwing is software for generating and solving Sudoku puzzles.")
>> >
>> >Sometimes there isn't much to say. But can you try to add a little more
>> >here? You could look for inspiration in the man page.
>> 
>> This is as extensive as the descriptions for this software get in its 
>> own
>> documentation as well as across many different software repositories. 
>> Any
>> ideas for what else to put here?
> 
> If you thought about it and couldn't come up with anything, then I 
> guess
> there's nothing else to add :)

QQwing is added to game-development.scm, as it's more of a tool to 
facilitate
gameplay than a game per se.

P.S. Forgot to CC the development mailing list.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-qqwing.patch --]
[-- Type: text/x-diff; name=0001-gnu-Add-qqwing.patch, Size: 1799 bytes --]

From 76135d4a75436e569ca0f59623821ac88b5b79fe Mon Sep 17 00:00:00 2001
From: Kei Yamashita <kei@openmailbox.org>
Date: Tue, 12 Apr 2016 12:47:26 -0400
Subject: [PATCH 1/2] gnu: Add qqwing.

* gnu/packages/game-development.scm (qqwing): New variable.
---
 gnu/packages/game-development.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 0a58a7e..3572092 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -407,3 +408,24 @@ games.  In addition to basic pixel editing features, Aseprite can assist in
 the creation of animations, tiled graphics, texture atlases, and more.")
     (home-page "http://www.aseprite.org/")
     (license license:gpl2+)))
+
+(define-public qqwing
+  (package
+    (name "qqwing")
+    (version "1.3.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://qqwing.com/"
+                    name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0bw0papyqjg22z6irf36gs54y8236wa37b6gyn2h1spy65n76lqp"))))
+    (build-system gnu-build-system)
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (home-page "https://qqwing.com/")
+    (synopsis "Software for working with Sudoku puzzles")
+    (description
+     "QQwing is software for generating and solving Sudoku puzzles.")
+    (license license:gpl2+)))
-- 
2.7.3


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-gnome-sudoku.patch --]
[-- Type: text/x-diff; name=0002-gnu-Add-gnome-sudoku.patch, Size: 2597 bytes --]

From 6a2507edf2ea54e19a34acb2177e527ed6ac1e57 Mon Sep 17 00:00:00 2001
From: Kei Yamashita <kei@openmailbox.org>
Date: Tue, 12 Apr 2016 12:47:57 -0400
Subject: [PATCH 2/2] gnu: Add gnome-sudoku.

* gnu/packages/gnome.scm (gnome-sudoku): 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 5c2cf01..2adf267 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net>
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
+;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -57,6 +58,7 @@
   #:use-module (gnu packages flex)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages enchant)
+  #:use-module (gnu packages game-development)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
@@ -2207,6 +2209,41 @@ and other secrets.  It communicates with the \"Secret Service\" using DBus.")
 floating in an ocean using only your brain and a little bit of luck.")
     (license license:gpl2+)))
 
+(define-public gnome-sudoku
+  (package
+    (name "gnome-sudoku")
+    (version "3.18.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/" name "/"
+                           (version-major+minor version) "/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "1b60z22fjrjzsz0kfhv0kfhvigzn54wvh9s31zrlp7sx2h2dxvsf"))))
+    (build-system glib-or-gtk-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("desktop-file-utils" ,desktop-file-utils)
+       ("intltool" ,intltool)
+       ("itstool" ,itstool)
+       ("xmllint" ,libxml2)))
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("json-glib" ,json-glib)
+       ("libgee" ,libgee)
+       ("librsvg" ,librsvg)
+       ("qqwing" ,qqwing)))
+    (home-page "https://wiki.gnome.org/Apps/Sudoku")
+    (synopsis "Japanese logic game")
+    (description
+     "Sudoku is a Japanese logic game that exploded in popularity in 2005.
+GNOME Sudoku is meant to have an interface as simple and unobstrusive as
+possible while still providing features that make playing difficult Sudoku
+more fun.")
+    (license license:gpl2+)))
+
 (define-public gnome-terminal
   (package
     (name "gnome-terminal")
-- 
2.7.3


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2016-04-13  6:26 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-11  3:23 [PATCH] gnu: Add gnome-sudoku and qqwing kei
2016-04-11  4:44 ` Leo Famulari
2016-04-11 16:06   ` kei
2016-04-11 21:57     ` Leo Famulari
2016-04-11  6:09 ` Efraim Flashner
  -- strict thread matches above, loose matches on Subject: below --
2016-04-12 16:59 kei
2016-04-13  6:25 ` 宋文武

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).