From patchwork Thu Mar 16 21:25: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: 48057 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 AE9F916E83; Thu, 16 Mar 2023 21:25:32 +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=unavailable 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 ABF9B16CBF for ; Thu, 16 Mar 2023 21:25:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcv5t-00070N-2n; Thu, 16 Mar 2023 17:25:05 -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 1pcv5r-00070C-Mq for guix-patches@gnu.org; Thu, 16 Mar 2023 17:25: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 1pcv5r-00084D-Dj for guix-patches@gnu.org; Thu, 16 Mar 2023 17:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcv5q-00070G-VC for guix-patches@gnu.org; Thu, 16 Mar 2023 17:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62228] [PATCH 2/2] gnu: Add sgt-puzzles. References: <20230316211925.5145-1-sarg@sarg.org.ru> In-Reply-To: <20230316211925.5145-1-sarg@sarg.org.ru> Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Mar 2023 21:25: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.167900189826897 (code B ref 62228); Thu, 16 Mar 2023 21:25:02 +0000 Received: (at 62228) by debbugs.gnu.org; 16 Mar 2023 21:24:58 +0000 Received: from localhost ([127.0.0.1]:43212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcv5l-0006zk-Ri for submit@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 ) id 1pcv5j-0006zF-OA for 62228@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@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 Date: Thu, 16 Mar 2023 22:25:10 +0100 Message-Id: <20230316212510.6281-1-sarg@sarg.org.ru> X-Mailer: git-send-email 2.39.2 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 | 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 +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