GNU bug report logs - #62228
[PATCH 0/2] gnu: Add sgt-puzzles

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: Sergey Trofimov <sarg@HIDDEN>; Keywords: patch; dated Thu, 16 Mar 2023 21:20:01 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 62228 <at> debbugs.gnu.org:


Received: (at 62228) by debbugs.gnu.org; 17 Mar 2023 13:15:49 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 17 09:15:49 2023
Received: from localhost ([127.0.0.1]:43957 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pd9vw-0003Sm-OB
	for submit <at> debbugs.gnu.org; Fri, 17 Mar 2023 09:15:49 -0400
Received: from smtpm1.myservices.hosting ([185.26.105.232]:49818)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1pd9vu-0003Sd-TK
 for 62228 <at> debbugs.gnu.org; Fri, 17 Mar 2023 09:15:47 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpm1.myservices.hosting (Postfix) with ESMTP id E76C72091A;
 Fri, 17 Mar 2023 14:15:41 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id 810D08009C;
 Fri, 17 Mar 2023 14:15:41 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id q-r7efkQEmON; Fri, 17 Mar 2023 14:15:41 +0100 (CET)
Received: from [192.168.1.239] (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id 861A38009A;
 Fri, 17 Mar 2023 14:15:40 +0100 (CET)
Message-ID: <7228765e-0ad3-9f2f-0395-fcb2f92842a3@HIDDEN>
Date: Fri, 17 Mar 2023 13:15:40 +0000
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.8.0
Subject: Re: [PATCH 1/2] gnu: Add halibut.
Content-Language: en-US
To: liliana.prikler@HIDDEN, Sergey Trofimov <sarg@HIDDEN>
References: <20230316212458.6187-1-sarg@HIDDEN>
 <b7e8791599f19e3bcc527142c611fefc6acb1108.camel@HIDDEN>
From: Bruno Victal <mirai@HIDDEN>
In-Reply-To: <b7e8791599f19e3bcc527142c611fefc6acb1108.camel@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -1.1 (-)
X-Debbugs-Envelope-To: 62228
Cc: 62228 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.1 (--)

On 2023-03-17 07:50, Liliana Marie Prikler wrote:
> Am Donnerstag, dem 16.03.2023 um 22:24 +0100 schrieb Sergey Trofimov:
>> +    (description "This is yet another text formatting system,
>> intended primarily for
> Use "Halibut" instead of "this".  "yet another" is a little
> superfluous.
>> +writing software documentation.  It accepts a single source format
>> and outputs any or
>> +all of text, HTML, Windows Help, man pages, GNU info, PostScript, or
>> PDF.  
> any or all of => any combination of
> text => plain text,
> Windows Help => delete, we don't advocate unfree software here

Alternatively rename “Windows Help” to “Compiled HTML (.CHM) or WinHelp (.HLP)” which is more neutral?
In general, some format might have been originally conceived for proprietary software but could have
been reverse-engineered and reused in other contexts that might not involve any non-free software at all.

I don't think stating the fact that the program can generate formats commonly used by non-free software
constitutes advocating at all. (in fact omitting this information might do more harm since it can
convey that this (free) software doesn't support that format at all, pushing the user towards some other
potentially non-free software that might fit the bill)

For what my opinion is worth.


Cheers,
Bruno
Information forwarded to guix-patches@HIDDEN:
bug#62228; Package guix-patches. Full text available.

Message received at 62228 <at> debbugs.gnu.org:


Received: (at 62228) by debbugs.gnu.org; 17 Mar 2023 08:29:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 17 04:29:10 2023
Received: from localhost ([127.0.0.1]:43615 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pd5SY-0007po-1o
	for submit <at> debbugs.gnu.org; Fri, 17 Mar 2023 04:29:10 -0400
Received: from mail-ed1-f45.google.com ([209.85.208.45]:33566)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <sarg@HIDDEN>) id 1pd5ST-0007ox-8k
 for 62228 <at> debbugs.gnu.org; Fri, 17 Mar 2023 04:29:08 -0400
Received: by mail-ed1-f45.google.com with SMTP id er8so5602317edb.0
 for <62228 <at> debbugs.gnu.org>; Fri, 17 Mar 2023 01:29:05 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=sarg.org.ru; s=google; t=1679041739;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=72AGTCfbcjJ3kkmdqgDTWI8bn4RZxEQhMU1pRNiYvw8=;
 b=kevXO+75gRhlYCh4g2NKcmo5gI8hZplaFBY04j4geyX99BZNx8No3W/s2q7DwKZNe8
 AiQC7peWD3QmImFI/D7+ZRk/ifZ4WW1VV91x6LgWbxiIUGB+fGNXoCG0In2KKqbQHxDe
 NcBDN31MNr3Q6P9akR4VOCFi5XVYAyqjs4bKY=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112; t=1679041739;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=72AGTCfbcjJ3kkmdqgDTWI8bn4RZxEQhMU1pRNiYvw8=;
 b=qeF8h0WXGa+cHwh7yi5Mhg4z8OMp6/rsRtVCoMz45bsgUT4JZgSeKCsFQcaxc63rnp
 IT5+YauNI+M3sEghHb/uOAh7GtCrLuUtPz3b3VT6D4c3lPLl1psI4zOTyp6Z9V+Qxxbs
 Mn12InikdtkUuakHorcd2G+EC8lNl4CZ2cs7FqO9b48tAfhzHNcDoQlNbhkNMBH1/j6i
 P23mgs+VpSYo0kEOkVCg9jTOpUdBUdpyrlvs+iQr6BUS3MxIEA8+A6uoSLpXUT1FKmyH
 j+Sa5pV08Gcl9im7C2eHh9FZEXfRa0x1MWW+gUJUXMJH26E4DSX7p3jHrFrerHY1iw2L
 qRyQ==
X-Gm-Message-State: AO0yUKX+ZlVnI1thfBSRl+KsTp+uA2hVoQgFfbhpvS6uiZXKZRIi7Lro
 qk5Sj3WQH9jVjXGC4aEXk1LzcmKNntkzsi0W95I=
X-Google-Smtp-Source: AK7set9waIMFz3dF8zu26Ay3W201DiHHc2nXARAR0dKaGJIqEbgzy499WbHzeSRArC/uxumm3MHXSA==
X-Received: by 2002:aa7:cad6:0:b0:4f9:db7b:b6b4 with SMTP id
 l22-20020aa7cad6000000b004f9db7bb6b4mr1919429edt.40.1679041739349; 
 Fri, 17 Mar 2023 01:28:59 -0700 (PDT)
Received: from localhost ([95.168.147.255]) by smtp.gmail.com with ESMTPSA id
 m11-20020a50998b000000b004c13fe8fabfsm702820edb.84.2023.03.17.01.28.59
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 17 Mar 2023 01:28:59 -0700 (PDT)
From: Sergey Trofimov <sarg@HIDDEN>
To: 62228 <at> debbugs.gnu.org
Subject: [PATCH v2 3/3] gnu: Add sgt-puzzles.
Date: Fri, 17 Mar 2023 09:29:10 +0100
Message-Id: <20230317082910.25037-3-sarg@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230317082910.25037-1-sarg@HIDDEN>
References: <20230317082910.25037-1-sarg@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 62228
Cc: Sergey Trofimov <sarg@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/games.scm (sgt-puzzles): New variable.
* gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch: New file.
* gnu/local.mk: Add it.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/games.scm                        | 73 +++++++++++++++++++
 .../sgt-puzzles-install-two-icon-sizes.patch  | 35 +++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index f8061e4a34..c8ebf35158 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1842,6 +1842,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/scons-test-environment.patch		\
   %D%/packages/patches/screen-hurd-path-max.patch		\
   %D%/packages/patches/scsh-nonstring-search-path.patch	\
+  %D%/packages/patches/sgt-puzzles-install-two-icon-sizes.patch	\
   %D%/packages/patches/sdl-libx11-1.6.patch			\
   %D%/packages/patches/seed-webkit.patch			\
   %D%/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch	\
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 31523777bd..ddc16b47da 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -873,6 +873,79 @@ (define-public bsd-games
               ;; phantasia (all but phantasia/pathnames.h.in, which is bsd-3)
               (license:fsf-free "file:///phantasia/COPYRIGHT")))))
 
+(define-public sgt-puzzles
+  (package
+    (name "sgt-puzzles")
+    (version "20230313.adf2a09")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0205wrshf2y27fzaqxv4gfpgmnlj4klwjcadwjrzjx7fkkzlr51j"))
+              (patches (search-patches
+                        "sgt-puzzles-install-two-icon-sizes.patch"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:tests? #f ;No tests.
+           #:configure-flags #~(list "-DNAME_PREFIX=sgt-")
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'set-xdg-open-path
+                          (lambda _
+                            (substitute* "gtk.c"
+                              (("(#define HELP_BROWSER_PATH ).+" all define)
+                               (string-append define "\""
+                                              #$(this-package-input
+                                                 "xdg-utils")
+                                              "/bin/xdg-open\"\n"))))))))
+    (inputs (list gtk+ xdg-utils))
+    (native-inputs (list pkg-config perl imagemagick halibut))
+    (home-page "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/")
+    (synopsis "Simon Tatham's portable puzzle collection")
+    (description
+     "Simon Tatham's Portable Puzzle Collection contains a number of
+popular puzzle games for one player.  It currently consists of these games:
+@itemize
+@item Black Box, ball-finding puzzle
+@item Bridges, bridge-placing puzzle
+@item Cube, rolling cube puzzle
+@item Dominosa, domino tiling puzzle
+@item Fifteen, sliding block puzzle
+@item Filling, polyomino puzzle
+@item Flip, tile inversion puzzle
+@item Galaxies, symmetric polyomino puzzle
+@item Guess, combination-guessing puzzle
+@item Inertia, gem-collecting puzzle
+@item Keen, arithmetic Latin square puzzle
+@item Light Up, light-bulb placing puzzle
+@item Loopy, loop-drawing puzzle
+@item Magnets, magnet-placing puzzle
+@item Map, map-colouring puzzle
+@item Mines, mine-finding puzzle
+@item Net, network jigsaw puzzle
+@item Netslide, toroidal sliding network puzzle
+@item Pattern
+@item Pearl, loop-drawing puzzle
+@item Pegs, peg solitaire puzzle
+@item Range, visible-distance puzzle
+@item Rectangles
+@item Same Game, block-clearing puzzle
+@item Signpost, square-connecting puzzle
+@item Singles, number-removing puzzle
+@item Sixteen, toroidal sliding block puzzle
+@item Slant, maze-drawing puzzle
+@item Solo, number placement puzzle
+@item Tents, tent-placing puzzle
+@item Towers, tower-placing Latin square puzzle
+@item Twiddle, rotational sliding block puzzle
+@item Undead, monster-placing puzzle
+@item Unequal, Latin square puzzle
+@item Unruly, black and white grid puzzle
+@item Untangle, planar graph layout puzzle
+@end itemize")
+    (license license:expat)))
 
 (define-public bzflag
   (package
diff --git a/gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch b/gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch
new file mode 100644
index 0000000000..3bacd2120c
--- /dev/null
+++ b/gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch
@@ -0,0 +1,35 @@
+From: Ben Hutchings <benh@HIDDEN>
+Date: Sun, 22 Jan 2023 22:58:43 +0100
+Subject: Install both 48x48 and 96x96 icons
+Bug-Debian: https://bugs.debian.org/887982
+
+gnome-shell prefers to use 96x96 icons, so install them as well as the
+48x48 icons.  Install them in size-specific directories instead of
+using suffixes to the filename, and change the desktop files
+accordingly.
+
+---
+--- a/cmake/platforms/unix.cmake
++++ b/cmake/platforms/unix.cmake
+@@ -107,7 +107,9 @@ function(set_platform_puzzle_target_prop
+     endif()
+     configure_file(${CMAKE_SOURCE_DIR}/puzzle.desktop.in ${binary_name}.desktop)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/icons/${NAME}-48d24.png
+-      DESTINATION share/pixmaps OPTIONAL RENAME ${binary_name}-48d24.png)
++      DESTINATION share/icons/hicolor/48x48/apps OPTIONAL RENAME ${binary_name}.png)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/icons/${NAME}-96d24.png
++      DESTINATION share/icons/hicolor/96x96/apps OPTIONAL RENAME ${binary_name}.png)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${binary_name}.desktop
+       DESTINATION share/applications)
+   endif()
+--- a/puzzle.desktop.in
++++ b/puzzle.desktop.in
+@@ -4,7 +4,7 @@ Type=Application
+ Name=${displayname}
+ Comment=${description}
+ Exec=${binary_name}
+-Icon=${binary_name}-48d24
++Icon=${binary_name}
+ StartupNotify=false
+ Categories=Game;LogicGame;
+ Terminal=false
-- 
2.39.2
Information forwarded to guix-patches@HIDDEN:
bug#62228; Package guix-patches. Full text available.

Message received at 62228 <at> debbugs.gnu.org:


Received: (at 62228) by debbugs.gnu.org; 17 Mar 2023 08:29:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 17 04:29:10 2023
Received: from localhost ([127.0.0.1]:43613 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pd5SX-0007ph-MP
	for submit <at> debbugs.gnu.org; Fri, 17 Mar 2023 04:29:10 -0400
Received: from mail-ed1-f43.google.com ([209.85.208.43]:39439)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <sarg@HIDDEN>) id 1pd5SS-0007ot-8B
 for 62228 <at> debbugs.gnu.org; Fri, 17 Mar 2023 04:29:07 -0400
Received: by mail-ed1-f43.google.com with SMTP id ek18so17329252edb.6
 for <62228 <at> debbugs.gnu.org>; Fri, 17 Mar 2023 01:29:04 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=sarg.org.ru; s=google; t=1679041738;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=3UKLGF9Nv0FL5aF06TX+EDcR1i+qNygbOf3p/9SMPH4=;
 b=ZqhNVFxFuyFuWIjT+jEf9ZA4THsMbjNA2ZJLko9LJw81XgWa7WO3O106AZd1jIV40u
 pYc4kabQe9xiHl/wSFdDdeEeY/uTtyv3nWcVrKk6wg2AZ4ljFNbtlNXMn1hPQUxMLWdO
 D0PRxYIVNcbH5hycX7rtKtvYFqxcmNLjjJFBI=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112; t=1679041738;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=3UKLGF9Nv0FL5aF06TX+EDcR1i+qNygbOf3p/9SMPH4=;
 b=VOIsnIYiNBKvO+qQkDUx0fUVthHRtt67k+lZailEZcHOS9RkS03xRA/l/qf5ZeURs4
 Hh5qo03DfOUTKoNkBht8O2VZ9yryD6a/YvKW64k8es1mzGcsE51BUmaKkUNFO3om6n4H
 vaVtWxtH8pBwfLD64WyZ2t9qWuQzxO6zk4H+EVAsUI+XfhJvTg8MRjnwWleqi2xty3dz
 jBmEEEfd3EBsu0MsQxbeuNvm4N8rRrAbbz50gMS4i0/q2tQi3t2L8xv6LHcd1vSJrbpp
 +/PUow9qgP2Lc0GnWALtz5uD5+wSToWWuu4GYOo3juecDHlTMDAlQ62qns4BLpeWILfS
 nvyQ==
X-Gm-Message-State: AO0yUKXyOR0Fomm6QxSN38UhYoO6y5OOJCntCmL9kzzLHpUXo1RPpdda
 5eiR9b6Ynzw6r+SC0AxFp8bHeHe0Ysxayc3fdBU=
X-Google-Smtp-Source: AK7set8yuavWiiD3EsmSwzpKdIhPLYYvmO5aOucrBuUZrFYHYcMrFN9R2VQKyfmBg0GBAfsZ9Ai2Gg==
X-Received: by 2002:a17:906:d041:b0:878:955e:b4a4 with SMTP id
 bo1-20020a170906d04100b00878955eb4a4mr13267929ejb.33.1679041738361; 
 Fri, 17 Mar 2023 01:28:58 -0700 (PDT)
Received: from localhost ([95.168.147.255]) by smtp.gmail.com with ESMTPSA id
 b4-20020a17090630c400b0092b5384d6desm679844ejb.153.2023.03.17.01.28.58
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 17 Mar 2023 01:28:58 -0700 (PDT)
From: Sergey Trofimov <sarg@HIDDEN>
To: 62228 <at> debbugs.gnu.org
Subject: [PATCH v2 2/3] gnu: Add halibut.
Date: Fri, 17 Mar 2023 09:29:09 +0100
Message-Id: <20230317082910.25037-2-sarg@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230317082910.25037-1-sarg@HIDDEN>
References: <20230317082910.25037-1-sarg@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 62228
Cc: Sergey Trofimov <sarg@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/documentation.scm (halibut): New variable.
---
 gnu/packages/documentation.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 3a6e9b10fb..10e607d430 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -235,6 +235,33 @@ (define-public doxygen
 and to some extent D.")
     (license license:gpl3+)))
 
+(define-public halibut
+  (package
+    (name "halibut")
+    (version "1.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-"
+                    version "/halibut-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ciikn878vivs4ayvwvr63nnhpcg12m8023xv514zxqpdxlzg85a"))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:tests? #f)) ;No tests.
+    (native-inputs (list pkg-config perl))
+    (home-page "https://www.chiark.greenend.org.uk/~sgtatham/halibut/")
+    (synopsis "Documentation production system for software manuals")
+    (description
+     "Halibut is a text formatting system designed primarily for writing software
+documentation.  It accepts a single source format and outputs any combination of
+plain text, HTML, Unix man or info pages, PostScript or PDF.  It has extensive
+support for indexing and cross-referencing, and generates hyperlinks within output
+documents wherever possible.  It supports Unicode, with the ability to fall back to
+an alternative representation if Unicode output is not available.")
+    (license license:expat)))
+
 (define-public doc++
   (package
     (name "doc++")
-- 
2.39.2
Information forwarded to guix-patches@HIDDEN:
bug#62228; Package guix-patches. Full text available.

Message received at 62228 <at> debbugs.gnu.org:


Received: (at 62228) by debbugs.gnu.org; 17 Mar 2023 08:29:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 17 04:29:09 2023
Received: from localhost ([127.0.0.1]:43611 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pd5SX-0007pd-9B
	for submit <at> debbugs.gnu.org; Fri, 17 Mar 2023 04:29:09 -0400
Received: from mail-ed1-f49.google.com ([209.85.208.49]:46721)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <sarg@HIDDEN>) id 1pd5SR-0007or-Jv
 for 62228 <at> debbugs.gnu.org; Fri, 17 Mar 2023 04:29:07 -0400
Received: by mail-ed1-f49.google.com with SMTP id eg48so17209691edb.13
 for <62228 <at> debbugs.gnu.org>; Fri, 17 Mar 2023 01:29:03 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=sarg.org.ru; s=google; t=1679041737;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=LXdsHVHQiDtbykcBh70NdKC7DN8CX86A/Dz16/5S20k=;
 b=CcdP9aUhJB9P2ZsIi5XFnXYIOrYdWItHN2lsh9evYGBM/KyrTeNcKmbfMCTPTDiVCC
 DMkfQv83vjLzHOmCMSsldif1liCzgXdNuDd5IJvPRFBaK7UEvvRE+INdo/W4VJ4B/4Og
 Szaia6bc0ay1nuXlScfFWW3LgsSezjEu69UhE=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112; t=1679041737;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=LXdsHVHQiDtbykcBh70NdKC7DN8CX86A/Dz16/5S20k=;
 b=OoAqaXraXLu96bmOzmmijcC7x3NzScubxRKFhfd8yk5QQAQwfycyTgqNkCYHcWKSif
 i0Vi2T3gWqd+hKSH3q47Lq62eRBeVRpcl6sYzpu9sYtgH9na6GFiIJaiKoKPMIWbbrSg
 UKvS3QVzcVQBuhgiv0H0RYOeVKvTjjRXj8KX5jDg42riK1N9x9AbWSdpfttWUQufQQVs
 JE5f6MeNKrwFRvIaoZ3503H9UIy414REwvW7snp7g/ah7lManw3eArnaspj8DD+3yTAh
 2P0MRG5xFtNi2y0syq2OPWdfZKdV6zRTtKp/jPqNX3Ry3egLqCvxsRnsY1Bpev9MVuzw
 B71Q==
X-Gm-Message-State: AO0yUKU+LRg0v0olqQnueUxsBBG9oEErccEEtW4+0WrI0e687VWhIYuA
 rm48FhsiTkUN5iq14LSftBsxgtXdbBufSUKZ/fo=
X-Google-Smtp-Source: AK7set+fkOO6aJn1zYgnC89Dl/tXjNq4aLE63qgTNg3W0MyolLm4AD4GgXl1SSOffuIwvFLd9SMz4w==
X-Received: by 2002:a17:906:2ad1:b0:928:c92e:d112 with SMTP id
 m17-20020a1709062ad100b00928c92ed112mr12477599eje.50.1679041737383; 
 Fri, 17 Mar 2023 01:28:57 -0700 (PDT)
Received: from localhost ([95.168.147.255]) by smtp.gmail.com with ESMTPSA id
 lt2-20020a170906fa8200b00930bbf7e894sm699239ejb.35.2023.03.17.01.28.56
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 17 Mar 2023 01:28:57 -0700 (PDT)
From: Sergey Trofimov <sarg@HIDDEN>
To: 62228 <at> debbugs.gnu.org
Subject: [PATCH v2 1/3] gnu: Prefix licenses in documentation.scm
Date: Fri, 17 Mar 2023 09:29:08 +0100
Message-Id: <20230317082910.25037-1-sarg@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 62228
Cc: Sergey Trofimov <sarg@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/documentation.scm: Prefix licenses.
---
 gnu/packages/documentation.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index a372e1a6ca..3a6e9b10fb 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -29,7 +29,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages documentation)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix gexp)
@@ -102,7 +102,7 @@ (define-public latex2html
     (description "LaTeX2HTML is a utility that converts LaTeX documents to web
 pages in HTML.")
     (home-page "https://www.latex2html.org/")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public asciidoc
   (package
@@ -178,7 +178,7 @@ (define-public asciidoc
 AsciiDoc is highly configurable: both the AsciiDoc source file syntax and
 the backend output markups (which can be almost any type of SGML/XML
 markup) can be customized and extended by the user.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-deprecated asciidoc-py3 asciidoc)
 
@@ -233,7 +233,7 @@ (define-public doxygen
 programming languages such as C, Objective-C, C#, PHP, Java, Python,
 IDL (Corba, Microsoft, and UNO/OpenOffice flavors), Fortran, VHDL, Tcl,
 and to some extent D.")
-    (license gpl3+)))
+    (license license:gpl3+)))
 
 (define-public doc++
   (package
@@ -258,7 +258,7 @@ (define-public doc++
 generate both TeX output for high-quality hardcopies or HTML output for online
 browsing.  The documentation is extracted directly from the C/C++/IDL source
 or Java class files.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public pod2pdf
   (package
@@ -284,7 +284,7 @@ (define-public pod2pdf
 Documentation} format to PDF files.  It also supports some extensions to the POD
 format, and supports the file types JPG, GIF, TIFF, PNG, and PNM for embedded
 objects.")
-    (license artistic2.0)))
+    (license license:artistic2.0)))
 
 (define-public python-docrepr
   (package
@@ -335,7 +335,7 @@ (define-public python-docrepr
     (description "Docrepr renders Python docstrings to HTML with Sphinx.  It
 can generate rich and plain representations of docstrings, alongside
 additional metadata about the object to which the docstring belongs.")
-    (license bsd-3)))
+    (license license:bsd-3)))
 
 (define-public scrollkeeper
   (package
@@ -368,7 +368,7 @@ (define-public scrollkeeper
 provides a simple API to allow help browsers to find, sort, and search the
 document catalog.  It will also be able to communicate with catalog servers on
 the Net to search for documents which are not on the local system.")
-    (license lgpl2.1+)))
+    (license license:lgpl2.1+)))
 
 (define-public zeal
   (let ((commit "d3c5521c501d24050f578348ff1b9d68244b992c")
@@ -416,4 +416,4 @@ (define-public zeal
       (synopsis "Offline documentation browser inspired by Dash")
       (description "Zeal is a simple offline documentation browser
 inspired by Dash.")
-      (license gpl3+))))
+      (license license:gpl3+))))
-- 
2.39.2
Information forwarded to guix-patches@HIDDEN:
bug#62228; Package guix-patches. Full text available.

Message received at 62228 <at> debbugs.gnu.org:


Received: (at 62228) by debbugs.gnu.org; 17 Mar 2023 07:50:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 17 03:50:40 2023
Received: from localhost ([127.0.0.1]:43517 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pd4rH-0006jD-Ln
	for submit <at> debbugs.gnu.org; Fri, 17 Mar 2023 03:50:39 -0400
Received: from mailrelay.tugraz.at ([129.27.2.202]:58758)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <liliana.prikler@HIDDEN>) id 1pd4rF-0006j4-7Q
 for 62228 <at> debbugs.gnu.org; Fri, 17 Mar 2023 03:50:38 -0400
Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101])
 by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4PdGWs3pNtz3x7r;
 Fri, 17 Mar 2023 08:50:33 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at;
 s=mailrelay; t=1679039433;
 bh=WGY0Fj3KHBuqKSGU5+dgJopaXpxS5Pf2jqZWeCH8U1M=;
 h=Subject:From:Reply-To:To:Cc:Date:In-Reply-To:References;
 b=F2inRSyiOZPuzydRyiyLpOF7V4IKdWnV7uE8EBOrVFOW7oZ3/j8VJneSMrjcXzy74
 19ujqpmIbibSda21No3hTY0ZHLalYOwP4n5L0G0efn/dJXMVrbBj1Owsv837jIAMbn
 5TW8dwjD5KDxIbDCvPgzqhzwm4eGM4uDo7C+LcnU=
Message-ID: <b7e8791599f19e3bcc527142c611fefc6acb1108.camel@HIDDEN>
Subject: Re: [PATCH 1/2] gnu: Add halibut.
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
To: Sergey Trofimov <sarg@HIDDEN>, 62228 <at> debbugs.gnu.org
Date: Fri, 17 Mar 2023 08:50:32 +0100
In-Reply-To: <20230316212458.6187-1-sarg@HIDDEN>
References: <20230316212458.6187-1-sarg@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.0 
MIME-Version: 1.0
X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ
X-Spam-Scanner: SpamAssassin 3.003001 
X-Spam-Score-relay: -1.9
X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116
X-Spam-Score: 0.2 (/)
X-Debbugs-Envelope-To: 62228
Cc: Bruno Victal <mirai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Reply-To: liliana.prikler@HIDDEN
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Am Donnerstag, dem 16.03.2023 um 22:24 +0100 schrieb Sergey Trofimov:
> * gnu/packages/documentation.scm (halibut): New variable.
Split the cosmetic changes (prefixing guix licenses with license:) and
functional (adding halibut) changes into two: First the prefixing, then
adding halibut.

> +(define-public halibut
> +=C2=A0 (package
> +=C2=A0=C2=A0=C2=A0 (name "halibut")
> +=C2=A0=C2=A0=C2=A0 (version "1.3")
> +=C2=A0=C2=A0=C2=A0 (source
> +=C2=A0=C2=A0=C2=A0=C2=A0 (origin
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (method url-fetch)
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (uri (string-append
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0
> "https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-"
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
 version "/halibut-" version ".tar.gz"))
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (sha256
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32
> "0ciikn878vivs4ayvwvr63nnhpcg12m8023xv514zxqpdxlzg85a"))))
> +=C2=A0=C2=A0=C2=A0 (build-system cmake-build-system)
> +=C2=A0=C2=A0=C2=A0 (native-inputs (list pkg-config perl))
> +=C2=A0=C2=A0=C2=A0 (arguments
> +=C2=A0=C2=A0=C2=A0=C2=A0 '(#:tests? #f)) ; No tests.
Normally, arguments come after build-system and before any inputs.
> +=C2=A0=C2=A0=C2=A0 (home-page
> "https://www.chiark.greenend.org.uk/~sgtatham/halibut/")
> +=C2=A0=C2=A0=C2=A0 (synopsis "Documentation production system for softwa=
re
> manuals")
> +=C2=A0=C2=A0=C2=A0 (description "This is yet another text formatting sys=
tem,
> intended primarily for
Use "Halibut" instead of "this".  "yet another" is a little
superfluous.
> +writing software documentation.=C2=A0 It accepts a single source format
> and outputs any or
> +all of text, HTML, Windows Help, man pages, GNU info, PostScript, or
> PDF.=C2=A0=C2=A0
any or all of =3D> any combination of
text =3D> plain text,
Windows Help =3D> delete, we don't advocate unfree software here
man pages, GNU info =3D> Unix man or info pages
I'd also add the word "document" to plain text, HTML, PostScript and
PDF.  Feel free to regroup them.


Cheers
Information forwarded to guix-patches@HIDDEN:
bug#62228; Package guix-patches. Full text available.

Message received at 62228 <at> debbugs.gnu.org:


Received: (at 62228) by debbugs.gnu.org; 17 Mar 2023 07:40:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 17 03:40:24 2023
Received: from localhost ([127.0.0.1]:43505 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pd4hI-0006Na-Kb
	for submit <at> debbugs.gnu.org; Fri, 17 Mar 2023 03:40:24 -0400
Received: from mail-ed1-f50.google.com ([209.85.208.50]:37630)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <sarg@HIDDEN>) id 1pd4hC-0006NE-Bp
 for 62228 <at> debbugs.gnu.org; Fri, 17 Mar 2023 03:40:19 -0400
Received: by mail-ed1-f50.google.com with SMTP id z21so16986923edb.4
 for <62228 <at> debbugs.gnu.org>; Fri, 17 Mar 2023 00:40:14 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=sarg.org.ru; s=google; t=1679038808;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=mBgDqzdQOe0sv7V+DqmJKXl725SsKqgL4kRVYvsO9Ng=;
 b=jYWTCRSgvTdYkRemwJRHq68nn9+oX2HxY9MGhk8utGx3y3diUFGTlCuKqpoooQ9fSz
 QaziEq7HoWhS9yPXctJL6A8sX18Q2onIiswIpEJ8rVk8Ge++9l5ExX4Vecyz6+9Yn1dB
 uvbJ+K9CojRexb9+3buYTHGmYEJ7b+kwpvHzc=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112; t=1679038808;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=mBgDqzdQOe0sv7V+DqmJKXl725SsKqgL4kRVYvsO9Ng=;
 b=IkCuoLcnaw9sfFPkf7v3gVYX/hIq6Y2Kpwncufq7lGhlGJUP6Jy9GtIKwcMtvI3eYs
 5LEq8CfJFjJjnX+NWcRm9h8XrEKowasSsNngIo5Qpj8yCG1ugk0qFtXYzDGydj1ry1Gr
 qKGZzgVTysJ2isoTKHClLPTU0g0cCRfvzvFnu0uZUAmHyORxUxuPiNORMLZ7Fk/nXbBZ
 svYkHpx2XrLaqi2nHiM9uaEsVhVNLWBG3H3od1KUEfVe9tPqq8jbZ1UjW/eln8JuQ1Jm
 loyAyW32ksmlXqYC0CoPLYDDaRo+mcQSLlUQBComF+iZs6CW89s5DM+JJjZ9RLVHijJR
 abRQ==
X-Gm-Message-State: AO0yUKWzhNFkMF9KoVOeQzVO5cK8eSBfH+CbXbJ3K7NKSgUcrw3G1WDg
 kSXXZwCfuWYGb99UddubfAI2jUk52/ZLayXW0rI=
X-Google-Smtp-Source: AK7set8mDA+a4N9Eahg1rsbdv2FC0Sj3CFzSys3Lx6d3RvCo9NgQnjLcYJYrerOgwBuwv4mmR4dtRA==
X-Received: by 2002:a17:906:6a28:b0:930:ba36:2211 with SMTP id
 qw40-20020a1709066a2800b00930ba362211mr6154691ejc.0.1679038808068; 
 Fri, 17 Mar 2023 00:40:08 -0700 (PDT)
Received: from localhost ([95.168.147.255]) by smtp.gmail.com with ESMTPSA id
 gq20-20020a170906e25400b008dffda52d71sm630669ejb.124.2023.03.17.00.40.07
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 17 Mar 2023 00:40:07 -0700 (PDT)
From: Sergey Trofimov <sarg@HIDDEN>
To: 62228 <at> debbugs.gnu.org
Subject: [PATCH v1] gnu: Add sgt-puzzles.
Date: Fri, 17 Mar 2023 08:40:18 +0100
Message-Id: <20230317074018.3525-1-sarg@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
X-Debbugs-Cc: mirai@HIDDEN, iyzsong@HIDDEN, liliana.prikler@HIDDEN
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 62228
Cc: Sergey Trofimov <sarg@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/games.scm (sgt-puzzles): New variable.
* gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch: New file.
* gnu/local.mk: Add it.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/games.scm                        | 73 +++++++++++++++++++
 .../sgt-puzzles-install-two-icon-sizes.patch  | 35 +++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index e96dceb4d5..7da0446e22 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1843,6 +1843,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/scons-test-environment.patch		\
   %D%/packages/patches/screen-hurd-path-max.patch		\
   %D%/packages/patches/scsh-nonstring-search-path.patch	\
+  %D%/packages/patches/sgt-puzzles-install-two-icon-sizes.patch	\
   %D%/packages/patches/sdl-libx11-1.6.patch			\
   %D%/packages/patches/seed-webkit.patch			\
   %D%/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch	\
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 31523777bd..9ab9bc1db0 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -873,6 +873,79 @@ (define-public bsd-games
               ;; phantasia (all but phantasia/pathnames.h.in, which is bsd-3)
               (license:fsf-free "file:///phantasia/COPYRIGHT")))))
 
+(define-public sgt-puzzles
+  (package
+    (name "sgt-puzzles")
+    (version "20230313.adf2a09")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0205wrshf2y27fzaqxv4gfpgmnlj4klwjcadwjrzjx7fkkzlr51j"))
+              (patches (search-patches
+                        "sgt-puzzles-install-two-icon-sizes.patch"))))
+    (build-system cmake-build-system)
+    (inputs (list gtk+ xdg-utils))
+    (native-inputs (list pkg-config perl imagemagick halibut))
+    (arguments
+     (list #:tests? #f ;No tests.
+           #:configure-flags #~(list "-DNAME_PREFIX=sgt-")
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'set-xdg-open-path
+                          (lambda _
+                            (substitute* "gtk.c"
+                              (("(#define HELP_BROWSER_PATH ).+" all define)
+                               (string-append define "\""
+                                              #$(this-package-input
+                                                 "xdg-utils")
+                                              "/bin/xdg-open\"\n"))))))))
+    (home-page "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/")
+    (synopsis "Simon Tatham's portable puzzle collection")
+    (description
+     "Simon Tatham's Portable Puzzle Collection contains a number of
+popular puzzle games for one player.  It currently consists of these games:
+@itemize
+@item Black Box, ball-finding puzzle
+@item Bridges, bridge-placing puzzle
+@item Cube, rolling cube puzzle
+@item Dominosa, domino tiling puzzle
+@item Fifteen, sliding block puzzle
+@item Filling, polyomino puzzle
+@item Flip, tile inversion puzzle
+@item Galaxies, symmetric polyomino puzzle
+@item Guess, combination-guessing puzzle
+@item Inertia, gem-collecting puzzle
+@item Keen, arithmetic Latin square puzzle
+@item Light Up, light-bulb placing puzzle
+@item Loopy, loop-drawing puzzle
+@item Magnets, magnet-placing puzzle
+@item Map, map-colouring puzzle
+@item Mines, mine-finding puzzle
+@item Net, network jigsaw puzzle
+@item Netslide, toroidal sliding network puzzle
+@item Pattern
+@item Pearl, loop-drawing puzzle
+@item Pegs, peg solitaire puzzle
+@item Range, visible-distance puzzle
+@item Rectangles
+@item Same Game, block-clearing puzzle
+@item Signpost, square-connecting puzzle
+@item Singles, number-removing puzzle
+@item Sixteen, toroidal sliding block puzzle
+@item Slant, maze-drawing puzzle
+@item Solo, number placement puzzle
+@item Tents, tent-placing puzzle
+@item Towers, tower-placing Latin square puzzle
+@item Twiddle, rotational sliding block puzzle
+@item Undead, monster-placing puzzle
+@item Unequal, Latin square puzzle
+@item Unruly, black and white grid puzzle
+@item Untangle, planar graph layout puzzle
+@end itemize")
+    (license license:expat)))
 
 (define-public bzflag
   (package
diff --git a/gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch b/gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch
new file mode 100644
index 0000000000..3bacd2120c
--- /dev/null
+++ b/gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch
@@ -0,0 +1,35 @@
+From: Ben Hutchings <benh@HIDDEN>
+Date: Sun, 22 Jan 2023 22:58:43 +0100
+Subject: Install both 48x48 and 96x96 icons
+Bug-Debian: https://bugs.debian.org/887982
+
+gnome-shell prefers to use 96x96 icons, so install them as well as the
+48x48 icons.  Install them in size-specific directories instead of
+using suffixes to the filename, and change the desktop files
+accordingly.
+
+---
+--- a/cmake/platforms/unix.cmake
++++ b/cmake/platforms/unix.cmake
+@@ -107,7 +107,9 @@ function(set_platform_puzzle_target_prop
+     endif()
+     configure_file(${CMAKE_SOURCE_DIR}/puzzle.desktop.in ${binary_name}.desktop)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/icons/${NAME}-48d24.png
+-      DESTINATION share/pixmaps OPTIONAL RENAME ${binary_name}-48d24.png)
++      DESTINATION share/icons/hicolor/48x48/apps OPTIONAL RENAME ${binary_name}.png)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/icons/${NAME}-96d24.png
++      DESTINATION share/icons/hicolor/96x96/apps OPTIONAL RENAME ${binary_name}.png)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${binary_name}.desktop
+       DESTINATION share/applications)
+   endif()
+--- a/puzzle.desktop.in
++++ b/puzzle.desktop.in
+@@ -4,7 +4,7 @@ Type=Application
+ Name=${displayname}
+ Comment=${description}
+ Exec=${binary_name}
+-Icon=${binary_name}-48d24
++Icon=${binary_name}
+ StartupNotify=false
+ Categories=Game;LogicGame;
+ Terminal=false
-- 
2.39.2
Information forwarded to mirai@HIDDEN, iyzsong@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN:
bug#62228; Package guix-patches. Full text available.

Message received at 62228 <at> debbugs.gnu.org:


Received: (at 62228) by debbugs.gnu.org; 17 Mar 2023 03:05:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 16 23:05:45 2023
Received: from localhost ([127.0.0.1]:43407 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pd0PZ-0007Gf-4Z
	for submit <at> debbugs.gnu.org; Thu, 16 Mar 2023 23:05:45 -0400
Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:50596)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1pd0PV-0007GU-Qb
 for 62228 <at> debbugs.gnu.org; Thu, 16 Mar 2023 23:05:43 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpmciv4.myservices.hosting (Postfix) with ESMTP id 32C4A20C98;
 Fri, 17 Mar 2023 04:05:36 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id DBE33800A4;
 Fri, 17 Mar 2023 04:05:36 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id XdCIvb_SxydX; Fri, 17 Mar 2023 04:05:36 +0100 (CET)
Received: from [192.168.1.239] (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id 147938009F;
 Fri, 17 Mar 2023 04:05:36 +0100 (CET)
Message-ID: <dad23924-42cd-286c-e1ae-bed8b281157a@HIDDEN>
Date: Fri, 17 Mar 2023 03:05:35 +0000
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.8.0
Subject: Re: [bug#62228] [PATCH 2/2] gnu: Add sgt-puzzles.
Content-Language: en-US
To: Sergey Trofimov <sarg@HIDDEN>
References: <20230316211925.5145-1-sarg@HIDDEN>
 <20230316212510.6281-1-sarg@HIDDEN>
From: Bruno Victal <mirai@HIDDEN>
In-Reply-To: <20230316212510.6281-1-sarg@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-Spam-Score: -1.1 (-)
X-Debbugs-Envelope-To: 62228
Cc: 62228 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.1 (--)

Hi,

On 2023-03-16 21:25, Sergey Trofimov wrote:
> +    (arguments
> +     `(#:tests? #f                      ; No tests.
> +       #:configure-flags '("-DNAME_PREFIX=sgt-")
> +       #:phases (modify-phases %standard-phases
> +                  (add-after 'unpack 'set-xdg-open-path
> +                    (lambda* (#:key inputs #:allow-other-keys)
> +                      (substitute* "gtk.c"
> +                        (("(#define HELP_BROWSER_PATH ).+" all define)
> +                         (string-append define "\""
> +                          (search-input-file inputs "/bin/xdg-open") "\"" "\n")))
> +                      #t)))))

Use G-Expressions here.
You can drop the trailing #t as well.


> +    (home-page "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/")
> +    (synopsis "Simon Tatham's portable puzzle collection")
> +    (description "Simon Tatham's Portable Puzzle Collection contains a number of
> +popular puzzle games for one player.  It currently consists of these games:
> + * Black Box, ball-finding puzzle
> + * Bridges, bridge-placing puzzle
> + * Cube, rolling cube puzzle
> + * Dominosa, domino tiling puzzle
> + * Fifteen, sliding block puzzle
> + * Filling, polyomino puzzle
> + * Flip, tile inversion puzzle
> + * Galaxies, symmetric polyomino puzzle
> + * Guess, combination-guessing puzzle
> + * Inertia, gem-collecting puzzle
> + * Keen, arithmetic Latin square puzzle
> + * Light Up, light-bulb placing puzzle
> + * Loopy, loop-drawing puzzle
> + * Magnets, magnet-placing puzzle
> + * Map, map-colouring puzzle
> + * Mines, mine-finding puzzle
> + * Net, network jigsaw puzzle
> + * Netslide, toroidal sliding network puzzle
> + * Pattern
> + * Pearl, loop-drawing puzzle
> + * Pegs, peg solitaire puzzle
> + * Range, visible-distance puzzle
> + * Rectangles
> + * Same Game, block-clearing puzzle
> + * Signpost, square-connecting puzzle
> + * Singles, number-removing puzzle
> + * Sixteen, toroidal sliding block puzzle
> + * Slant, maze-drawing puzzle
> + * Solo, number placement puzzle
> + * Tents, tent-placing puzzle
> + * Towers, tower-placing Latin square puzzle
> + * Twiddle, rotational sliding block puzzle
> + * Undead, monster-placing puzzle
> + * Unequal, Latin square puzzle
> + * Unruly, black and white grid puzzle
> + * Untangle, planar graph layout puzzle")

Format with @itemize here:
@itemize
@item Black Box, ball-finding puzzle
...
@end itemize


Cheers,
Bruno
Information forwarded to guix-patches@HIDDEN:
bug#62228; Package guix-patches. Full text available.

Message received at 62228 <at> debbugs.gnu.org:


Received: (at 62228) by debbugs.gnu.org; 16 Mar 2023 21:47:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 16 17:47:08 2023
Received: from localhost ([127.0.0.1]:43235 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pcvRE-0007Ya-7C
	for submit <at> debbugs.gnu.org; Thu, 16 Mar 2023 17:47:08 -0400
Received: from mail-ed1-f54.google.com ([209.85.208.54]:43980)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <sarg@HIDDEN>) id 1pcvRC-0007Y2-Jv
 for 62228 <at> debbugs.gnu.org; Thu, 16 Mar 2023 17:47:07 -0400
Received: by mail-ed1-f54.google.com with SMTP id x3so13137754edb.10
 for <62228 <at> debbugs.gnu.org>; Thu, 16 Mar 2023 14:47:06 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=sarg.org.ru; s=google; t=1679003220;
 h=mime-version:message-id:date:subject:to:from:user-agent:from:to:cc
 :subject:date:message-id:reply-to;
 bh=LJcjFtC3PbFX9c01DPdQ4PvKTLALjkHGHcGOXN8d7g8=;
 b=kd2VexWcXibv5eppfP6+oGzhR5WxsxwbPAYO7p5cYVU4/SdggRwhfD7AieIprDDKZ7
 12guc2naLbTltZ3EU5HbeL2vFmJ1qNLjVYcJlfM/YcyOd79m9vfei0CLQ5V/2F3GbQZy
 PA5TIOom7+Nh/vI2SNc5FIzmi+v+Eh+OAKSIQ=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112; t=1679003220;
 h=mime-version:message-id:date:subject:to:from:user-agent
 :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
 bh=LJcjFtC3PbFX9c01DPdQ4PvKTLALjkHGHcGOXN8d7g8=;
 b=3N5RO47OKXIC6nyaIqHhoShAWDXQYtiGTn0WQYItLq3WPgnM52NTScI6PjAusMLpRR
 F9fuKddtMDuBpNZ+y5JLepvPEDzUNhVp/3JUsMBPRUdkDUrPn85gn8twRpYxds9AcH+j
 IbwruvoFxZ+jHZr2mxajcouU/uELuqI0qNk/au8f5OsKD2aObKupGdhPkGCZkUE+TIeR
 AgbYjf8AlCBtras4eOPRMvwiftbmK1Cb+wNJaDLx8bWiWnxfjdu34w80xPwdDogGzIZz
 tZ6ZsWHJz3RLNqxshrg1U0A8Es6w0W8KR1L585wmnQ2azg8+Jn/pm41fyVxNSzF0cLI1
 Z6Ng==
X-Gm-Message-State: AO0yUKU7A3gKuRxbj5Jc0SL3xJxknsNF4+A+VDiFGCwOk2UXOvvhMDd9
 0OvM54X+/6yYNRJf/z+i/B71GSLEO8bltWDP53U=
X-Google-Smtp-Source: AK7set8TxPTGD8QDO4bXxeHyeJ+W0qnar2v/4uPWQXCcM8PrGoeIX/JRHNESuf00hSUM+n5rtd0urA==
X-Received: by 2002:a17:906:71d8:b0:878:7a0e:5730 with SMTP id
 i24-20020a17090671d800b008787a0e5730mr11779208ejk.56.1679003220302; 
 Thu, 16 Mar 2023 14:47:00 -0700 (PDT)
Received: from localhost ([95.168.147.255]) by smtp.gmail.com with ESMTPSA id
 b1-20020a1709065e4100b008ca52f7fbcbsm137813eju.1.2023.03.16.14.46.59
 for <62228 <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 16 Mar 2023 14:47:00 -0700 (PDT)
User-agent: mu4e 1.8.13; emacs 29.0.60
From: Sergey Trofimov <sarg@HIDDEN>
To: 62228 <at> debbugs.gnu.org
Subject: [PATCH] gnu: Add sgt-puzzles
Date: Thu, 16 Mar 2023 22:46:44 +0100
X-Debbugs-Cc: iyzsong@HIDDEN, liliana.prikler@HIDDEN
Message-ID: <875yb0v05x.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; format=flowed
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 62228
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)


Adding games team to CC.
Information forwarded to iyzsong@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN:
bug#62228; Package guix-patches. Full text available.

Message received at 62228 <at> debbugs.gnu.org:


Received: (at 62228) by debbugs.gnu.org; 16 Mar 2023 21:24:58 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 16 17:24:58 2023
Received: from localhost ([127.0.0.1]:43212 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pcv5l-0006zk-Ri
	for submit <at> debbugs.gnu.org; Thu, 16 Mar 2023 17:24:58 -0400
Received: from mail-ed1-f51.google.com ([209.85.208.51]:35386)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <sarg@HIDDEN>) id 1pcv5j-0006zF-OA
 for 62228 <at> debbugs.gnu.org; Thu, 16 Mar 2023 17:24:56 -0400
Received: by mail-ed1-f51.google.com with SMTP id y4so13082591edo.2
 for <62228 <at> debbugs.gnu.org>; Thu, 16 Mar 2023 14:24:55 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=sarg.org.ru; s=google; t=1679001889;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=uOT5tCkHX4U83xF7na5UBj8RoA9B7KzyUks085DDH2c=;
 b=ipFUMapCUY7MYqnvb5a/U4V5PglVtL3W5VNYVyuhat6gM0e05/dV83tJB7w5qm73bT
 VTowZOd4Bc20KyCJbv3GGbd02Dl4mBfs27rqLPjVeyp9bSWkOCS/kdN0/6DrC4wqJFhR
 2+ot/9indwApCAH97jwv3VFi9FXR7APBu+/v8=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112; t=1679001889;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=uOT5tCkHX4U83xF7na5UBj8RoA9B7KzyUks085DDH2c=;
 b=r64AN5ZtUt6XsBCBqk++jkPJzXfjKdUygg5yUR/4Sv41MMW3yExfXY4u1euqU/1aOl
 0Q/v7s9alhlHqXGOu+8sGEnPcq4XEMosBo4qtmnnOB+gP0I9BxTQetR5yY+2a74j1n7m
 +CPm1tz9kgpfBam2c/ku85pEABVvCyXaQwrQ9o3phs1zxOBjDkJ+B0OezDmRHe9ThUQU
 5G2SwRQk+G9k9bBS6m4HfK2GzAtGEz02UUDc009TCVKcNOiBieDQIH0AmTm71RSReDVy
 RJtdFTuTwDrrDsHfb/aI4oM2hChua04ewmOyYZowQahIw94pqREVW4vUwhrXimbrPNNj
 q0Jw==
X-Gm-Message-State: AO0yUKWXdx88B2yGtRX3v3HCvakPkyn4Z89LWfPar4+ULwjz5oLDFOBm
 VGrEDYKehi087DOf1KBw474jsajHI3yokhQse+E=
X-Google-Smtp-Source: AK7set8fOWHehvqkiW8t4FP/GNglwpWep6WNOX9iNksxbEXn1YOelD3Atr9xoPoKTkmuNrI6Asmn5A==
X-Received: by 2002:a17:907:c498:b0:92f:7c42:8637 with SMTP id
 tp24-20020a170907c49800b0092f7c428637mr7279566ejc.30.1679001889619; 
 Thu, 16 Mar 2023 14:24:49 -0700 (PDT)
Received: from localhost ([95.168.147.255]) by smtp.gmail.com with ESMTPSA id
 x9-20020a1709065ac900b0092ce7c94332sm104573ejs.148.2023.03.16.14.24.49
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 16 Mar 2023 14:24:49 -0700 (PDT)
From: Sergey Trofimov <sarg@HIDDEN>
To: 62228 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: Add sgt-puzzles.
Date: Thu, 16 Mar 2023 22:25:10 +0100
Message-Id: <20230316212510.6281-1-sarg@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 62228
Cc: Sergey Trofimov <sarg@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/games.scm (sgt-puzzles): New variable.
* gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch: New file.
* gnu/local.mk: Add it.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/games.scm                        | 68 +++++++++++++++++++
 .../sgt-puzzles-install-two-icon-sizes.patch  | 35 ++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index e96dceb4d5..7da0446e22 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1843,6 +1843,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/scons-test-environment.patch		\
   %D%/packages/patches/screen-hurd-path-max.patch		\
   %D%/packages/patches/scsh-nonstring-search-path.patch	\
+  %D%/packages/patches/sgt-puzzles-install-two-icon-sizes.patch	\
   %D%/packages/patches/sdl-libx11-1.6.patch			\
   %D%/packages/patches/seed-webkit.patch			\
   %D%/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch	\
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 31523777bd..31dfd86379 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -873,6 +873,74 @@ (define-public bsd-games
               ;; phantasia (all but phantasia/pathnames.h.in, which is bsd-3)
               (license:fsf-free "file:///phantasia/COPYRIGHT")))))
 
+(define-public sgt-puzzles
+  (package
+    (name "sgt-puzzles")
+    (version "20230313.adf2a09")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-"
+             version ".tar.gz"))
+       (sha256
+        (base32 "0205wrshf2y27fzaqxv4gfpgmnlj4klwjcadwjrzjx7fkkzlr51j"))
+       (patches (search-patches "sgt-puzzles-install-two-icon-sizes.patch"))))
+    (build-system cmake-build-system)
+    (inputs (list gtk+ xdg-utils))
+    (native-inputs (list pkg-config perl imagemagick halibut))
+    (arguments
+     `(#:tests? #f                      ; No tests.
+       #:configure-flags '("-DNAME_PREFIX=sgt-")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'set-xdg-open-path
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (substitute* "gtk.c"
+                        (("(#define HELP_BROWSER_PATH ).+" all define)
+                         (string-append define "\""
+                          (search-input-file inputs "/bin/xdg-open") "\"" "\n")))
+                      #t)))))
+    (home-page "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/")
+    (synopsis "Simon Tatham's portable puzzle collection")
+    (description "Simon Tatham's Portable Puzzle Collection contains a number of
+popular puzzle games for one player.  It currently consists of these games:
+ * Black Box, ball-finding puzzle
+ * Bridges, bridge-placing puzzle
+ * Cube, rolling cube puzzle
+ * Dominosa, domino tiling puzzle
+ * Fifteen, sliding block puzzle
+ * Filling, polyomino puzzle
+ * Flip, tile inversion puzzle
+ * Galaxies, symmetric polyomino puzzle
+ * Guess, combination-guessing puzzle
+ * Inertia, gem-collecting puzzle
+ * Keen, arithmetic Latin square puzzle
+ * Light Up, light-bulb placing puzzle
+ * Loopy, loop-drawing puzzle
+ * Magnets, magnet-placing puzzle
+ * Map, map-colouring puzzle
+ * Mines, mine-finding puzzle
+ * Net, network jigsaw puzzle
+ * Netslide, toroidal sliding network puzzle
+ * Pattern
+ * Pearl, loop-drawing puzzle
+ * Pegs, peg solitaire puzzle
+ * Range, visible-distance puzzle
+ * Rectangles
+ * Same Game, block-clearing puzzle
+ * Signpost, square-connecting puzzle
+ * Singles, number-removing puzzle
+ * Sixteen, toroidal sliding block puzzle
+ * Slant, maze-drawing puzzle
+ * Solo, number placement puzzle
+ * Tents, tent-placing puzzle
+ * Towers, tower-placing Latin square puzzle
+ * Twiddle, rotational sliding block puzzle
+ * Undead, monster-placing puzzle
+ * Unequal, Latin square puzzle
+ * Unruly, black and white grid puzzle
+ * Untangle, planar graph layout puzzle")
+    (license license:expat)))
 
 (define-public bzflag
   (package
diff --git a/gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch b/gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch
new file mode 100644
index 0000000000..3bacd2120c
--- /dev/null
+++ b/gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch
@@ -0,0 +1,35 @@
+From: Ben Hutchings <benh@HIDDEN>
+Date: Sun, 22 Jan 2023 22:58:43 +0100
+Subject: Install both 48x48 and 96x96 icons
+Bug-Debian: https://bugs.debian.org/887982
+
+gnome-shell prefers to use 96x96 icons, so install them as well as the
+48x48 icons.  Install them in size-specific directories instead of
+using suffixes to the filename, and change the desktop files
+accordingly.
+
+---
+--- a/cmake/platforms/unix.cmake
++++ b/cmake/platforms/unix.cmake
+@@ -107,7 +107,9 @@ function(set_platform_puzzle_target_prop
+     endif()
+     configure_file(${CMAKE_SOURCE_DIR}/puzzle.desktop.in ${binary_name}.desktop)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/icons/${NAME}-48d24.png
+-      DESTINATION share/pixmaps OPTIONAL RENAME ${binary_name}-48d24.png)
++      DESTINATION share/icons/hicolor/48x48/apps OPTIONAL RENAME ${binary_name}.png)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/icons/${NAME}-96d24.png
++      DESTINATION share/icons/hicolor/96x96/apps OPTIONAL RENAME ${binary_name}.png)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${binary_name}.desktop
+       DESTINATION share/applications)
+   endif()
+--- a/puzzle.desktop.in
++++ b/puzzle.desktop.in
+@@ -4,7 +4,7 @@ Type=Application
+ Name=${displayname}
+ Comment=${description}
+ Exec=${binary_name}
+-Icon=${binary_name}-48d24
++Icon=${binary_name}
+ StartupNotify=false
+ Categories=Game;LogicGame;
+ Terminal=false
-- 
2.39.2
Information forwarded to guix-patches@HIDDEN:
bug#62228; Package guix-patches. Full text available.

Message received at 62228 <at> debbugs.gnu.org:


Received: (at 62228) by debbugs.gnu.org; 16 Mar 2023 21:24:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 16 17:24:51 2023
Received: from localhost ([127.0.0.1]:43208 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pcv5f-0006zO-Aq
	for submit <at> debbugs.gnu.org; Thu, 16 Mar 2023 17:24:51 -0400
Received: from mail-ed1-f42.google.com ([209.85.208.42]:36431)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <sarg@HIDDEN>) id 1pcv5d-0006yw-6z
 for 62228 <at> debbugs.gnu.org; Thu, 16 Mar 2023 17:24:50 -0400
Received: by mail-ed1-f42.google.com with SMTP id w9so13101432edc.3
 for <62228 <at> debbugs.gnu.org>; Thu, 16 Mar 2023 14:24:49 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=sarg.org.ru; s=google; t=1679001883;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=0fBahF3i97sPOsiIJ2LjL0G1zDDQ9cZdg3C6pV0qwu8=;
 b=dmGOQnDloB/MuaKKBrZIsiNRAjeeMMXTuv0EHhJ2OW6k4M4Cw+XdbUTXDL4m4NoNH2
 Ljv3ivWZFgSEHTWBWx59nYrUMiol9ivA0J1pqNdFhB37/DX2ADJn1R7GbkKC3zkOhM+D
 zdJs1bXje9LMUPeM4BQ1tjyBovoT7ceWRvQBg=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112; t=1679001883;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=0fBahF3i97sPOsiIJ2LjL0G1zDDQ9cZdg3C6pV0qwu8=;
 b=q8bKGxLuRsTDeR8erB+K3UfhVSJ4Rhv58t+ISAexJ2JktNjkfXDmEvo8e3ZWqiyZWa
 wQg2RlnVZ2lGPbZuPudZMbHQB9akpmyC8zk27gdubt3TPOondWgOcPMQ4KxBmLHV9LAK
 W2fIKwlnmZmVfadUsOLB+9bDi4gteEzYtFOVVwdIvdS8qWUrVHkS3fLnRxOMWBlYMcz4
 Aa6Za22irQzdJwYMG7uucTm3CvRtYEzziD4/p/4qYRXss4eOeMvekGgjKZW7ubnE0ouI
 f14MzUf2A608XE2WjJR/2Iqu8VMKjM50wp+F8Beyxb/Hk9sEHN60p3Bl+h30ikNacnr1
 jY0Q==
X-Gm-Message-State: AO0yUKXiDG430LabxBQs3DUJuHOkk3oY2YQd+JByO8jDQPb/nAcFuqhR
 8ggwDeUYr4fFv6LToRrHUoNTiK5rMaFPqHZUFQw=
X-Google-Smtp-Source: AK7set8E35z69n2G4wR2z3eH5+KlozNwY+SppoGcffxO5JtQEtPna9sYI3UhWzPWfNFKSAqUSll/WA==
X-Received: by 2002:a17:906:a84f:b0:91f:b13f:a028 with SMTP id
 dx15-20020a170906a84f00b0091fb13fa028mr10809168ejb.34.1679001882868; 
 Thu, 16 Mar 2023 14:24:42 -0700 (PDT)
Received: from localhost ([95.168.147.255]) by smtp.gmail.com with ESMTPSA id
 wr5-20020a170907700500b008b133f9b33dsm100164ejb.169.2023.03.16.14.24.42
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 16 Mar 2023 14:24:42 -0700 (PDT)
From: Sergey Trofimov <sarg@HIDDEN>
To: 62228 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: Add halibut.
Date: Thu, 16 Mar 2023 22:24:58 +0100
Message-Id: <20230316212458.6187-1-sarg@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 62228
Cc: Sergey Trofimov <sarg@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/documentation.scm (halibut): New variable.
---
 gnu/packages/documentation.scm | 44 +++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index a372e1a6ca..ed9851cc5f 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -29,7 +29,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages documentation)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix gexp)
@@ -102,7 +102,7 @@ (define-public latex2html
     (description "LaTeX2HTML is a utility that converts LaTeX documents to web
 pages in HTML.")
     (home-page "https://www.latex2html.org/")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public asciidoc
   (package
@@ -178,7 +178,7 @@ (define-public asciidoc
 AsciiDoc is highly configurable: both the AsciiDoc source file syntax and
 the backend output markups (which can be almost any type of SGML/XML
 markup) can be customized and extended by the user.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-deprecated asciidoc-py3 asciidoc)
 
@@ -233,7 +233,33 @@ (define-public doxygen
 programming languages such as C, Objective-C, C#, PHP, Java, Python,
 IDL (Corba, Microsoft, and UNO/OpenOffice flavors), Fortran, VHDL, Tcl,
 and to some extent D.")
-    (license gpl3+)))
+    (license license:gpl3+)))
+
+(define-public halibut
+  (package
+    (name "halibut")
+    (version "1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-"
+             version "/halibut-" version ".tar.gz"))
+       (sha256
+        (base32 "0ciikn878vivs4ayvwvr63nnhpcg12m8023xv514zxqpdxlzg85a"))))
+    (build-system cmake-build-system)
+    (native-inputs (list pkg-config perl))
+    (arguments
+     '(#:tests? #f)) ; No tests.
+    (home-page "https://www.chiark.greenend.org.uk/~sgtatham/halibut/")
+    (synopsis "Documentation production system for software manuals")
+    (description "This is yet another text formatting system, intended primarily for
+writing software documentation.  It accepts a single source format and outputs any or
+all of text, HTML, Windows Help, man pages, GNU info, PostScript, or PDF.  It has
+comprehensive indexing and cross-referencing support, and generates hyperlinks within
+output documents wherever possible.  It supports Unicode, with the ability to fall
+back to an alternative representation when Unicode output is not available.")
+    (license license:expat)))
 
 (define-public doc++
   (package
@@ -258,7 +284,7 @@ (define-public doc++
 generate both TeX output for high-quality hardcopies or HTML output for online
 browsing.  The documentation is extracted directly from the C/C++/IDL source
 or Java class files.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public pod2pdf
   (package
@@ -284,7 +310,7 @@ (define-public pod2pdf
 Documentation} format to PDF files.  It also supports some extensions to the POD
 format, and supports the file types JPG, GIF, TIFF, PNG, and PNM for embedded
 objects.")
-    (license artistic2.0)))
+    (license license:artistic2.0)))
 
 (define-public python-docrepr
   (package
@@ -335,7 +361,7 @@ (define-public python-docrepr
     (description "Docrepr renders Python docstrings to HTML with Sphinx.  It
 can generate rich and plain representations of docstrings, alongside
 additional metadata about the object to which the docstring belongs.")
-    (license bsd-3)))
+    (license license:bsd-3)))
 
 (define-public scrollkeeper
   (package
@@ -368,7 +394,7 @@ (define-public scrollkeeper
 provides a simple API to allow help browsers to find, sort, and search the
 document catalog.  It will also be able to communicate with catalog servers on
 the Net to search for documents which are not on the local system.")
-    (license lgpl2.1+)))
+    (license license:lgpl2.1+)))
 
 (define-public zeal
   (let ((commit "d3c5521c501d24050f578348ff1b9d68244b992c")
@@ -416,4 +442,4 @@ (define-public zeal
       (synopsis "Offline documentation browser inspired by Dash")
       (description "Zeal is a simple offline documentation browser
 inspired by Dash.")
-      (license gpl3+))))
+      (license license:gpl3+))))
-- 
2.39.2
Information forwarded to guix-patches@HIDDEN:
bug#62228; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 16 Mar 2023 21:19:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 16 17:19:54 2023
Received: from localhost ([127.0.0.1]:43198 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pcv0s-0006qo-1y
	for submit <at> debbugs.gnu.org; Thu, 16 Mar 2023 17:19:54 -0400
Received: from lists.gnu.org ([209.51.188.17]:45326)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <sarg@HIDDEN>) id 1pcv0q-0006qf-Mj
 for submit <at> debbugs.gnu.org; Thu, 16 Mar 2023 17:19:52 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <sarg@HIDDEN>) id 1pcv0q-00068v-12
 for guix-patches@HIDDEN; Thu, 16 Mar 2023 17:19:52 -0400
Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <sarg@HIDDEN>) id 1pcv0m-0003fx-Nu
 for guix-patches@HIDDEN; Thu, 16 Mar 2023 17:19:51 -0400
Received: by mail-ed1-x532.google.com with SMTP id x13so13044210edd.1
 for <guix-patches@HIDDEN>; Thu, 16 Mar 2023 14:19:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=sarg.org.ru; s=google; t=1679001582;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=ozL0y2aVpPLnoYB1zy1wON3xm748aAACmgeGmMAfQnI=;
 b=SnlIvjv2QOhIEsoDKoHBgcz4D+MJd/az1/+oKEfS9a4mGLKsK2ic1l1CDjKjQJe4Bu
 r/4VakVtNQQMIgANKhUa6GbdW//5B1GlEobcCiQ0KOVTIjNnUVG3Ez+8JaOINpIzeVmH
 Om9nzpRZEiae0En8FXqrJhRG3rxwokUPOD9yg=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112; t=1679001582;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=ozL0y2aVpPLnoYB1zy1wON3xm748aAACmgeGmMAfQnI=;
 b=fS1DDEfwM7Rtj/0N50axtpZS1jM+kLhsOjB6EaG88aR+Vp6TAGm1k64nqtAPQl0Pa6
 xl1bkfoUCK7l4kZhPrQLpwkGHaXyhgW69Bi863damEg4O8M9bv6UfNVz15SdEqGrcN/p
 ogBxLy9QvwOElGZHV1AWKus7IlHm5umQt9zau5h8vxGCYRnEG+MplpeUfwsopuzXGsDN
 MojdGGXe3/fVuy6TyYbDZljPrSXpdkjGp8bx8LIHg+iaalamzRbnOzU7boEXByK51U6j
 DYKfvZ9n9cpf7WViDTGUX6ODmw1RKlxAUkJUq6JkfuyahljQNjaWX/vuOUuLgRgvhSjJ
 8n9Q==
X-Gm-Message-State: AO0yUKWWLZ8HVRPtsUywkmPBsMoCCPqTrvAKkfhd3QmdY+JwsHifNo+j
 hH0TSRaA/xnHu3rGSEPFr0AkFLnNV0Ka6VYw6BY=
X-Google-Smtp-Source: AK7set+Mnb0vbsZ4mkBMwRVn9/y6M1ajIy81Grxg8yDvzkM7MCGDaQJSrQ56IBX1Sz+Zide4GXICYw==
X-Received: by 2002:a17:906:3bda:b0:8f3:9ee9:f1bc with SMTP id
 v26-20020a1709063bda00b008f39ee9f1bcmr893184ejf.13.1679001582391; 
 Thu, 16 Mar 2023 14:19:42 -0700 (PDT)
Received: from localhost ([95.168.147.255]) by smtp.gmail.com with ESMTPSA id
 z21-20020a1709064e1500b00930de1da701sm115622eju.10.2023.03.16.14.19.41
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 16 Mar 2023 14:19:42 -0700 (PDT)
From: Sergey Trofimov <sarg@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 0/2] gnu: Add sgt-puzzles
Date: Thu, 16 Mar 2023 22:19:25 +0100
Message-Id: <20230316211925.5145-1-sarg@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: none client-ip=2a00:1450:4864:20::532;
 envelope-from=sarg@HIDDEN; helo=mail-ed1-x532.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_NONE=0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: submit
Cc: Sergey Trofimov <sarg@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hi there, the beloved sgt-puzzles are missing in guix. Time to fix that.
Patch series follows.

Sergey Trofimov (2):
  gnu: Add halibut.
  gnu: Add sgt-puzzles.

 gnu/local.mk                                  |  1 +
 gnu/packages/documentation.scm                | 44 +++++++++---
 gnu/packages/games.scm                        | 68 +++++++++++++++++++
 .../sgt-puzzles-install-two-icon-sizes.patch  | 35 ++++++++++
 4 files changed, 139 insertions(+), 9 deletions(-)
 create mode 100644 gnu/packages/patches/sgt-puzzles-install-two-icon-sizes.patch

-- 
2.39.2
Acknowledgement sent to Sergey Trofimov <sarg@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#62228; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Fri, 17 Mar 2023 13:30:03 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.