From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GADOI6F8SGGidwAAgWs5BA (envelope-from ) for ; Mon, 20 Sep 2021 14:20:49 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id wHRRH6F8SGEPJgAAbx9fmQ (envelope-from ) for ; Mon, 20 Sep 2021 12:20:49 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A0AD55968 for ; Mon, 20 Sep 2021 14:20:48 +0200 (CEST) Received: from localhost ([::1]:38874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mSIHv-0007X6-1C for larch@yhetil.org; Mon, 20 Sep 2021 08:20:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSIHC-0007WH-AD for guix-patches@gnu.org; Mon, 20 Sep 2021 08:20:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mSIHC-00019L-2l for guix-patches@gnu.org; Mon, 20 Sep 2021 08:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mSIHB-0006HL-T6 for guix-patches@gnu.org; Mon, 20 Sep 2021 08:20:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50653] [PATCH] gnu: Add sdlpop. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Sep 2021 12:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: phodina , 50653@debbugs.gnu.org Received: via spool by 50653-submit@debbugs.gnu.org id=B50653.163214038824104 (code B ref 50653); Mon, 20 Sep 2021 12:20:01 +0000 Received: (at 50653) by debbugs.gnu.org; 20 Sep 2021 12:19:48 +0000 Received: from localhost ([127.0.0.1]:41173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSIGo-0006GS-PQ for submit@debbugs.gnu.org; Mon, 20 Sep 2021 08:19:47 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:53872 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSIGn-0006GE-49 for 50653@debbugs.gnu.org; Mon, 20 Sep 2021 08:19:38 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1632140368; bh=7jSwvU5Bk7+XEk9uMcsZCUBQWU4lKWzvDCDhuyIGKHc=; h=From:To:Subject:In-Reply-To:References:Date; b=oMOBzbv+YB07aE9srw2WrLQ2cXMlvZKe1dVUE9Pz8iu0otJgNeUBOo2H3mI91h/Dl Kr+ipzTsLas2Bs8iTdrdoBWDnnk/RtspiSMWjQjsUkKetdlo628ap8MD0B+b/3D7UV Km//KBitOO5qrPwklUd3+jkE3b6HaJo9qhC2JIYo= In-Reply-To: <-p2XzmyUeU34-LyC3z50Id77Y3mrwZAnC3s3bUigV4CSc1rE9Pz-FYX9HxF97dLz1oBPpUEx06AoVSLT5eJGyZRZOFmCSfXlSzKHc5U8iCc=@protonmail.com> References: <-p2XzmyUeU34-LyC3z50Id77Y3mrwZAnC3s3bUigV4CSc1rE9Pz-FYX9HxF97dLz1oBPpUEx06AoVSLT5eJGyZRZOFmCSfXlSzKHc5U8iCc=@protonmail.com> Date: Mon, 20 Sep 2021 14:19:26 +0200 Message-ID: <87y27rfnht.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632140449; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=6oJTqi13RZf7S++/N/HD273biVjDJFbj9wUJN6NbBYA=; b=kucS9/+aqvYGJenn64za9ekj0i+KAmFH+nCPKQXp0y7OnVdNgdrLcHjpEY78e9xtMmxpZL 6jZIPvrW9Cwawnq+0A3vVZyfJdk0Acqg79pLimnkXpXr6WC4JN7+rm90O3wIk/V3g5XRX2 sfCqTYE+stLyvdqD3i5YuD+CtTvQfC6ocvAFCDhC1lsHlB/DSpyR2PBUpoSK2uhB0dBR2K i0DV1rIPn3KZ5DqbEvAzR3LP1FW3tCtKw2nbTGW2qg6/52LZtA0lwSJ47k5p2vkRjwTJ4j KZrpeJm+hinrlyVFf4i8oASe/4Gixa0aDPFUfjFWms/L4ISf0mVdVvbVhia9GA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632140449; a=rsa-sha256; cv=none; b=cxqCkA8ENc1h0G5vrRbjaOKi4ACygrYweOg4QNuWDeLVxHRUhoP8rG0R94j8JyemPfNKfg oaV1MVhBSd0vUNI1kxswn736BuXfwwwYDXxA9ONuJFiLlWDDCZuxneCHHhZaMAc9kLCyZ0 M1iccq5EQAHBWdeKi4raHcfmnrVLSxrP3HtSTvLEt7/DkpVbDbjIX9M+1aoo7IcUWksp2I gkurSpZdjS26dq6pb+5shw3Pbi7T+YBHFSlI+QB88K43dggZoSNTn9dagNCXiizbDqI/SL 3f2ml+1NG7PHX7gwC4FmbuC0waOP/MFFRl3TsAc4xHKzQ6mJu6Ix3nAh8QiNQg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=oMOBzbv+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.39 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=oMOBzbv+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: A0AD55968 X-Spam-Score: -3.39 X-Migadu-Scanner: scn0.migadu.com X-TUID: qS5llqhelpwP --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Sat, Sep 18 2021, phodina via Guix-patches via wrote: > * gnu/packages/games.scm (sdlpop): New variable. > [copyright]: Sort by date pkill9@runbox.com. > > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm > index c39770c260..0eed238f32 100644 > --- a/gnu/packages/games.scm > +++ b/gnu/packages/games.scm > @@ -45,6 +45,7 @@ > ;;; Copyright =C2=A9 2019, 2020 Guillaume Le Vaillant > ;;; Copyright =C2=A9 2019, 2020 Timotej Lazar > ;;; Copyright =C2=A9 2019 Josh Holland > +;;; Copyright =C2=A9 2019 Pkill -9 > ;;; Copyright =C2=A9 2017, 2019 Hartmut Goebel > ;;; Copyright =C2=A9 2020 Alberto Eleuterio Flores Guerrero > ;;; Copyright =C2=A9 2020 Naga Malleswari > @@ -63,7 +64,7 @@ > ;;; Copyright =C2=A9 2021 Felix Gruber > ;;; Copyright =C2=A9 2021 Solene Rapenne > ;;; Copyright =C2=A9 2021 Noisytoot > -;;; Copyright =C2=A9 2019 Pkill -9 > +;;; Copyright =C2=A9 2021 Petr Hodina I don=E2=80=99t think sorting copyright lines is necessary. > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -12480,6 +12481,62 @@ do so you need to explore the island, find food,= build a shelter and try to > get attention, so you get found.") > (license license:cc-by4.0)))) > > +(define-public sdlpop > + (package > + (name "sdlpop") > + (version "1.22") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/NagyD/SDLPoP") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7"))= )) > + (build-system gnu-build-system) > + (arguments > + `(#:tests? #f What=E2=80=99s the reason for disabling tests? There should a comment explaining why. > + #:phases > + (modify-phases %standard-phases > + (delete 'configure) > + (add-before 'build 'prepare-build > + ;; Set correct environment for SDL. > + (lambda* (#:key inputs #:allow-other-keys) > + (setenv "CPATH" > + (string-append (assoc-ref inputs "sdl") > + "/include/SDL2:" > + (or (getenv "CPATH") ""))))) > + (add-after 'unpack 'chdir > + (lambda* _ Just =E2=80=98lambda=E2=80=99 would work. > + (chdir "src"))) > + (replace 'install > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (bin (string-append out "/bin")) > + (opt (string-append out "/opt/sdlpop")) > + (app (string-append out "/usr/share/applications")) > + (template "src/SDLPoP.desktop.template")) > + (chdir "..") > + (install-file "prince" bin) > + (substitute* template (("\\$ROOT") out)) > + (install-file template app) > + (rename-file (string-append app "/SDLPoP.desktop.template= ") > + (string-append app "/SDLPoP.desktop")) > + (install-file "SDLPoP.ini" opt) > + (copy-recursively "data" (string-append bin "/data")) > + (copy-recursively "doc" opt) > + (copy-recursively "mods" opt))))))) > + (native-inputs `(("pkg-config" ,pkg-config))) > + (inputs `(("sdl" ,(sdl-union (list sdl2 > + sdl2-image > + sdl2-mixer))))) > + (synopsis "Open-source port of Prince of Persia") > + (description "Open-source port of Prince of Persia, based on the dis= assembly > +of the DOS version, extended with new features.") The description should consist of one or more complete sentences, and try to keep lines <=3D80 characters. > + (home-page "https://github.com/NagyD/SDLPoP") > + (license license:gpl3))) The =E2=80=98src/GPLv3.h=E2=80=99 file says GPLv3 or later, so it should be =E2=80=98license:gpl3+=E2=80=99. Could you send an updated patch? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmFIfE8VHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x5GWYQAKohmEzCLac7qAXyAXAeYl+p15RO fzt9DHMgJHRd0z9VbseFgLeXsYRUsa7cv9Oiso4n82rbRyA/7TbpJmFkYtbAn61s pYdugqIVG4PkSq5PLhliJD3iuGj55mBvwZnxjDQQE+dfYIagnIh619bibpGRjXPQ Kh2vTzUme5mRnc9H2PC0b7wk4gomB7Ky/13tm9F/IISgDzG3cQM51szmpC0Zmyf2 gHl4cwFAyZV7wXHmELgabZqEc84j34u8qBciiKCZ7PXlJDYBRliaQSidBUdIHQq7 bdO/+9x6xuxfac1c0DkXq/bLt+2doNRoiKvaEBI1z5IrJtEW+sBCXWm3nWp2T+Io EvK3qtNExQlKpKDfBdU/D7pQ2AoE+0nefjbVL9p9qYMFzHxkDQcKNgsAWKmZiLxE DHn9aUm9GqcwIH6OBzElHdnv0bHe1TC3rce+3MGgswJFYcW3A2PvAHgC4CVImjqp MkHUMS4qh8gbWUhJ/OcQ2g8xhDzox+LtU2ATdyTGCRUiU2sTlVkQuINWoiv9zhd1 Gb25xA03lHmSDFHovgJhUShIJgDQ+8hrdli+Tl9aAM+TSSwkFzKNipBCz+y/zzgT g508vhA0S4Boy648JLLmYeW+Y7qkowyOdpgyvK2gqp+GjQPobws9KvhwxqW8BEjC FqH1TptA2WpUgKlf =Uzt9 -----END PGP SIGNATURE----- --=-=-=--