Re: [PATCH] gnu: Add gnome-sudoku and qqwing

[Efraim Flashner <efraim@flashner.co.il>]

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

On Sun, Apr 10, 2016 at 11:23:51PM -0400, kei@openmailbox.org wrote:
> 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.

I would normally suggest putting qqwing in game-development, since it
also contains game engines, but since it's only used for gnome-sudoku
(also in Debian, as shown with `apt-cache rdepends libqqwing2v5`), I'd
just stick it in gnome.scm next to gnome-sudoku.

> 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

If you create a new file, you also need to register it in gnu-system.am

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

we generally try not to use Debian (or other distros') mirrors for
downloading unless the original isn't available any longer. From
qqwing's download site https://qqwing.com/download.html the link on the
bottom is for the source code, which should work as a drop-in
replacement, perhaps with a hash change.

> +              (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.")

synopsis shouldn't have a period at the end.

> +    (description
> +     "QQwing is software for generating and solving Sudoku puzzles.")
> +    (license license:gpl2+)))
> -- 
> 2.7.3
> 

I haven't built the software to test it, but everything looks good to
me, minus the small changes.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]