From patchwork Fri Mar 17 08:29:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 48065 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 802B316EA0; Fri, 17 Mar 2023 08:30:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 673BE16DA3 for ; Fri, 17 Mar 2023 08:30:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pd5TU-0005ym-7K; Fri, 17 Mar 2023 04:30:08 -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 ) id 1pd5TP-0005xY-GF for guix-patches@gnu.org; Fri, 17 Mar 2023 04:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pd5TP-00023j-8M for guix-patches@gnu.org; Fri, 17 Mar 2023 04:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pd5TO-0007rl-Vm for guix-patches@gnu.org; Fri, 17 Mar 2023 04:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62228] [PATCH v2 3/3] gnu: Add sgt-puzzles. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Mar 2023 08:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62228 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62228@debbugs.gnu.org Cc: Sergey Trofimov Received: via spool by 62228-submit@debbugs.gnu.org id=B62228.167904175030132 (code B ref 62228); Fri, 17 Mar 2023 08:30:02 +0000 Received: (at 62228) by debbugs.gnu.org; 17 Mar 2023 08:29:10 +0000 Received: from localhost ([127.0.0.1]:43615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pd5SY-0007po-1o for submit@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 ) id 1pd5ST-0007ox-8k for 62228@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@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 Date: Fri, 17 Mar 2023 09:29:10 +0100 Message-Id: <20230317082910.25037-3-sarg@sarg.org.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230317082910.25037-1-sarg@sarg.org.ru> References: <20230317082910.25037-1-sarg@sarg.org.ru> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 +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