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 aBVAAQlpU2E/DwAAgWs5BA (envelope-from ) for ; Tue, 28 Sep 2021 21:12:09 +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 8JlvOAhpU2FYMAAAbx9fmQ (envelope-from ) for ; Tue, 28 Sep 2021 19:12:08 +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 6294724D7 for ; Tue, 28 Sep 2021 21:12:08 +0200 (CEST) Received: from localhost ([::1]:53234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVIWN-0004d0-HD for larch@yhetil.org; Tue, 28 Sep 2021 15:12:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVIWI-0004aZ-Lu for guix-patches@gnu.org; Tue, 28 Sep 2021 15:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVIWI-0001YJ-E0 for guix-patches@gnu.org; Tue, 28 Sep 2021 15:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVIWI-0005jx-9a for guix-patches@gnu.org; Tue, 28 Sep 2021 15:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50653] [PATCH v2] gnu: Add sdlpop. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Sep 2021 19:12:02 +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 Cc: 50653@debbugs.gnu.org Received: via spool by 50653-submit@debbugs.gnu.org id=B50653.163285627622011 (code B ref 50653); Tue, 28 Sep 2021 19:12:02 +0000 Received: (at 50653) by debbugs.gnu.org; 28 Sep 2021 19:11:16 +0000 Received: from localhost ([127.0.0.1]:47013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVIVR-0005iq-Ln for submit@debbugs.gnu.org; Tue, 28 Sep 2021 15:11:16 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:35286 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVIVL-0005i6-JH for 50653@debbugs.gnu.org; Tue, 28 Sep 2021 15:11:08 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1632856257; bh=KPO8b1L9yxeDZGujkcuyG3XYh9GNgk+5uAy/Ks4qYx0=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=FXqi/XNeQ11RE7yia3s/8GqByLgicUf2Hjb9X/CCXSXgNA55yMLLm5K7l28A5hofy y53dzjgr8RfAR7qqJIlSZUy1keR73119E7U1k+mCWwDkQsGh4h+V4OQSg3yN0HeB9H 38lR3pKNd80uTpD3DOEA13zkrF4llLvcaVKS8+R8= In-Reply-To: References: Date: Tue, 28 Sep 2021 21:10:56 +0200 Message-ID: <87h7e4348v.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=1632856328; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=pybAjorEQR3xZ/cBVO4fkxhW43sVf6hHa05yqe1G6ps=; b=abZAouTTiN1OXbVVfm2Gg6xGXk9CAMWEaLc2GINXiWw/GkNR35287pxeByWHTBX/33z+s+ dM9BDiFbPaFXuDwFbS2U/EQQjAcVskZJYqibLL73BIfoSYiOqUrhzHk3iANyeEUS6NxzKC UZzn+nqbyS62kWxTudBVWPlVYCciCiOvEyabWtW4PQWrXLokFIK17ZZNOC9iheDMcKCim4 lvYg+hO6A4mRhe/9t8b/jsrDXNr9xIUoXbBTl1y3slP3EEgcGmu1ZmWU8GqDYSGvOBWkO6 1G1XZYOdbsmiP0rzzfcccTHbMdvaap6A/ThUEfiObAyM3A99xMMCv3v53akUlw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632856328; a=rsa-sha256; cv=none; b=Z06PIY8qeZnbwq1oR7BMFW1bGcCAoDlbk2Ic2hsm1Xq7bnABlV26wBPN5QSrMs/WN0Yc3D b1n7MBcco4aqXaagpfvOZ40MoHRWaLRtAdL2Dw7cHOpS11bhARIt4b0MHpThhfCA78ObIJ xohtIm7elqlmAi+f/244k/BHqiazl4jBzunbG+MnB7ipDddUeuxNbouMMIvp/zCopWWjI5 LFtNchanJao73uf8fM48NzpywzTceHmOFrq57Q1j6ypgEKRHr+dKRgwUoRdaSuC3GTnrJG FgVZd7BPzSAK7r30ObhVLPmT6pQFbUr92+ZDrIMVee9yS8zjwIhCHFhkTrROSQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b="FXqi/XNe"; 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: -2.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b="FXqi/XNe"; 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: 6294724D7 X-Spam-Score: -2.30 X-Migadu-Scanner: scn1.migadu.com X-TUID: tFrzlbBs9utK --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Mon, Sep 27 2021, phodina wrote: > Hi Xinglu, > > thank you for the review and comments. Here's the updated patch. > > If you or anyone committing the patch disagrees with the copyright > sorting then be my guest and remove it. Otherwise IMHO the list should > be sorted to maintain order :-) I don=E2=80=99t have any objections; I just don=E2=80=99t think it really m= atters. > --8<---------------cut here---------------start------------->8--- Not sure why you put this here. > * 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..9a6e36ccc1 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 > ;;; > ;;; 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 ; no tests provided > + #: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 _ > + (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 "This package provides port of Prince of Persia, based = on the > +disassembly of the DOS version, extended with new features.") > + (home-page "https://github.com/NagyD/SDLPoP") > + (license license:gpl3+))) > + The updated patch LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmFTaMAVHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x5YwAP/ifh1PH9zk4XpmNE512Tti3r9Db4 AHr26JNKLJXlkMXpDix/PdnzTXJ7m2IBosdikU9R+gWrVMlBcLJqSspm0Ry1KscR 8XRZO3jyxC16EAG0cyleph8fy9oujcfDt7U88QIWwi5C4xwEkF3STGvIY7PZodd3 SOrtaKaXYNGf2rc+ZNf3L3W2705C1lVwXtonfttV8V8xsIIQ8qNLaDHq0vuRZR3C gasJiEvwRw16Pdk0Gg2PzhGB6O2kAGLQjOne2wkZoGTAa2pm+ywFhzBELgtfxvlJ tGnsuyvtqRvk91EHhptxi8iAA2+w7VWX/3afh6stD00HXSsjKRGOtq0/hhHrH6tr xJ4jjCG1Uc+RCU5dUDSweBM/e6rXJediUYZ23oe8uNXg9PSse+QkTvdGyOsHv9gh sPn6ASUBGlS/wOgZR1SmXt9E1t0Z4hpiCz8LsOLwQVTXL+DWiV/WNydLtwRubFsT FdLFVfbUkq/QqehQFpSYIu85CYZUd516syM4zGIzSJ5jJNcnm8xUKJPCk7zTNYUI UkSJ3qqA3dRqllCnjvXhXY1U3lG9s1+ZGs8Enq92DcvGFBAzH2Kp3uTL4cYnE4yW 8dGujquuw+/7IOSFnBNadZDTDKtLren+j7BDYr3SkAzFw9NGBbNaRB/HLIfRJlg3 NgPHNNbGxaTC33Sz =R4ld -----END PGP SIGNATURE----- --=-=-=--