From: Sergey Trofimov <sarg@sarg.org.ru>
To: 62228@debbugs.gnu.org
Cc: Sergey Trofimov <sarg@sarg.org.ru>,
mirai@makinata.eu, iyzsong@envs.net, liliana.prikler@gmail.com
Subject: [bug#62228] [PATCH v1] gnu: Add sgt-puzzles.
Date: Fri, 17 Mar 2023 08:40:18 +0100 [thread overview]
Message-ID: <20230317074018.3525-1-sarg@sarg.org.ru> (raw)
In-Reply-To: <20230316211925.5145-1-sarg@sarg.org.ru>
* 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@debian.org>
+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
next prev parent reply other threads:[~2023-03-17 7:41 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-16 21:19 [bug#62228] [PATCH 0/2] gnu: Add sgt-puzzles Sergey Trofimov
2023-03-16 21:24 ` [bug#62228] [PATCH 1/2] gnu: Add halibut Sergey Trofimov
2023-03-16 21:24 ` Sergey Trofimov
2023-03-17 7:50 ` Liliana Marie Prikler
2023-03-17 13:15 ` Bruno Victal
2023-03-17 17:16 ` Liliana Marie Prikler
2023-03-16 21:25 ` [bug#62228] [PATCH 2/2] gnu: Add sgt-puzzles Sergey Trofimov
2023-03-17 3:05 ` Bruno Victal
2023-03-16 21:46 ` [bug#62228] [PATCH] " Sergey Trofimov
2023-03-17 7:40 ` Sergey Trofimov [this message]
2023-03-17 8:29 ` [bug#62228] [PATCH v2 1/3] gnu: Prefix licenses in documentation.scm Sergey Trofimov
2023-03-17 8:29 ` [bug#62228] [PATCH v2 2/3] gnu: Add halibut Sergey Trofimov
2023-03-17 8:29 ` [bug#62228] [PATCH v2 3/3] gnu: Add sgt-puzzles Sergey Trofimov
2024-03-10 21:36 ` [bug#62228] [PATCH v3 1/3] gnu: Prefix licenses in documentation.scm Sergey Trofimov
2024-03-10 21:36 ` [bug#62228] [PATCH v3 2/3] gnu: Add halibut Sergey Trofimov
2024-03-10 21:36 ` [bug#62228] [PATCH v3 3/3] gnu: Add sgt-puzzles Sergey Trofimov
2024-03-11 19:31 ` Liliana Marie Prikler
2024-03-11 19:31 ` [bug#62228] [PATCH v3 1/3] gnu: Prefix licenses in documentation.scm Liliana Marie Prikler
2024-03-12 7:28 ` [bug#62228] [PATCH v4 " Sergey Trofimov
2024-03-12 7:28 ` [bug#62228] [PATCH v4 2/3] gnu: Add halibut Sergey Trofimov
2024-03-12 7:28 ` [bug#62228] [PATCH v4 3/3] gnu: Add sgt-puzzles Sergey Trofimov
2024-03-12 7:50 ` Liliana Marie Prikler
2024-03-12 8:11 ` Sergey Trofimov
2024-03-12 16:47 ` [bug#62228] [PATCH v5 1/3] gnu: Prefix licenses in documentation.scm Sergey Trofimov
2024-03-12 16:47 ` [bug#62228] [PATCH v5 2/3] gnu: Add halibut Sergey Trofimov
2024-03-12 16:47 ` [bug#62228] [PATCH v5 3/3] gnu: Add sgt-puzzles Sergey Trofimov
2024-03-17 12:32 ` bug#62228: " Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230317074018.3525-1-sarg@sarg.org.ru \
--to=sarg@sarg.org.ru \
--cc=62228@debbugs.gnu.org \
--cc=iyzsong@envs.net \
--cc=liliana.prikler@gmail.com \
--cc=mirai@makinata.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).