From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id yBfREmSHrV4AIwAA0tVLHw (envelope-from ) for ; Sat, 02 May 2020 14:44:52 +0000 Received: from aspmx2.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id MI9lJm6HrV6negAAbx9fmQ (envelope-from ) for ; Sat, 02 May 2020 14:45:02 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id 20B43680A68 for ; Sat, 2 May 2020 14:45:00 +0000 (UTC) Received: from localhost ([::1]:47900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUtO1-0004IT-0l for larch@yhetil.org; Sat, 02 May 2020 10:45:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUtNa-00049C-W6 for guix-devel@gnu.org; Sat, 02 May 2020 10:44:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUtNX-0005vE-C3 for guix-devel@gnu.org; Sat, 02 May 2020 10:44:34 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:54023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUtNW-0005ss-Kb for guix-devel@gnu.org; Sat, 02 May 2020 10:44:30 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 02C8D4C5; Sat, 2 May 2020 10:44:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sat, 02 May 2020 10:44:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=ZJNEI3v+mAtuzspe5LFeu/+J/4 /Bt55pLIlM6KUGtr0=; b=qlqwPkROcfuwEFZ3KnRmUoc50RtnJKPQosBOTBPCTy K49o+xgruA5f5LpZuihDlDkRywsW0SLCT8yxB2AsYath13EkmNmN6huzyvYTPE1h F89FwjXFWm6fyVFv/UbKiS3+OJ2yqLgwDNQMSJLjD+eKSBzPWcgWu9GR21NHaF26 ny3QvA+kXeFXd3sf7eSb3RDfi4uwgL2MWNgOj6hwDdLfcn6FHlhtia7VHqVlxNCa iB3LjLVy2MTq25ukD/TxlOTg9ffmsgKWqfJDKQdLd817Lt1t9NLmSQdyFtFWixpU D0dMtnaIlKDO+rRSq16nU4idQf3drMMYH4Dqy0UlSJ2A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=ZJNEI3 v+mAtuzspe5LFeu/+J/4/Bt55pLIlM6KUGtr0=; b=WbVnIBqORlYKxLKa8NTcs9 IShFUl5SdlMDCEXqZqpEN+ojgVtsK7LI0dIos4omT3rcma7DWXa4IKC9CmDbPEjb kzvogZ8xAB9ocDqyWfJnlOmvTKUUTpazmY/FFeabnQMTCOe78kZzkE7CJu2Gg30X Yif3H9hgtcgZYEqJjyr9Ac/z3+iidwLcHyL+zv4zLJT2MKzYfjOPWAzGrX7q9dp8 k3U7r7E5F+thxByhHFaEvTW19n036/mEvXRjearDnkTgq2/Vqzdy5MKORE7PAxW+ ceAHMOiadxwKHmwlkmZ9Nb/IZIU1KquIFpOfBhykr04l2A/prJNYrLjGhNjTpFWg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrieelgdejjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculddujedmnecujfgurhephffvuf gjfhgffffkgggtsehgtderredtredtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcu oehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrghtthgvrhhnpedtvd fggeevgeeivdffueejiedttedvkedtudfggfdtgeefiedtieekffdugfeuffenucfkphep keegrddvtddvrdeikedrjeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtghomh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 1ED25328005E; Sat, 2 May 2020 10:44:28 -0400 (EDT) From: Marius Bakke To: Pierre Neidhardt , guix-devel@gnu.org Subject: Re: branch master updated: gnu: Add warsow-qfusion. In-Reply-To: <20200502135735.22136.31429@vcs0.savannah.gnu.org> References: <20200502135735.22136.31429@vcs0.savannah.gnu.org> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Sat, 02 May 2020 16:44:26 +0200 Message-ID: <87ftci2y7p.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=64.147.123.25; envelope-from=mbakke@fastmail.com; helo=wout2-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/02 09:46:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 64.147.123.25 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 X-Spam-Score: -1.31 Authentication-Results: aspmx2.migadu.com; dkim=pass header.d=fastmail.com header.s=fm2 header.b=qlqwPkRO; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=WbVnIBqO; dmarc=pass (policy=none) header.from=fastmail.com; spf=pass (aspmx2.migadu.com: domain of guix-devel-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Scan-Result: default: False [-1.31 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.4950290791215]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; FREEMAIL_FROM(0.00)[fastmail.com]; DWL_DNSWL_FAIL(0.00)[2001:470:142::17:server fail,fastmail.com:server fail]; R_MISSING_CHARSET(2.50)[]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.15), country: US(-0.00), ip: 2001:470:142::17(-0.50)]; DKIM_TRACE(0.00)[fastmail.com:+,messagingengine.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[fastmail.com,none]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; MAILLIST(-0.20)[mailman]; SIGNED_PGP(-2.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[mbakke@fastmail.com,guix-devel-bounces@gnu.org]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[fastmail.com:s=fm2,messagingengine.com:s=fm2]; URIBL_BLOCKED(0.00)[messagingengine.com:dkim,fastmail.com:dkim,gnu.org:email,ambrevar.xyz:email]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; HAS_LIST_UNSUB(-0.01)[]; RCVD_COUNT_SEVEN(0.00)[8]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: dzlX03r23Agp --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Pierre, guix-commits@gnu.org writes: > commit 39f1806ca1d04b9aee70e897e06466aadbbee152 > Author: Pierre Neidhardt > AuthorDate: Thu Apr 9 15:56:42 2020 +0200 > > gnu: Add warsow-qfusion. >=20=20=20=20=20 > * gnu/local.mk (warsow-qfusion): New variable. This commit message is weird. > --- > gnu/local.mk | 1 + > gnu/packages/game-development.scm | 78 +++++++++++++++++++++++++++++++++= ++++++ > 2 files changed, 79 insertions(+) warsow-qfusion-fix-bool-return-type.patch is missing, breaking the build of both Guix and this package. > +(define-public warsow-qfusion > + ;; As of 2020-04-09, the latest stable version 2.1.0 is deprecated. > + ;; The 2.5 beta as published on the homepage is commit > + ;; c4de15df559410aff0ca6643724e24cddb0ecbbd > + (let ((commit "c4de15df559410aff0ca6643724e24cddb0ecbbd") > + (arch (match (or (%current-target-system) > + (%current-system)) > + ("x86_64-linux" "x86_64") > + ("i686-linux" "i386") > + (_ "")))) Don't do this if you just need to determine architecture at build time. > + (add-after 'install 'really-install > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out"))) > + (install-file (string-append "../source/build/basewsw/l= ibgame_" > + ,arch ".so") > + (string-append out "/lib/")) > + (install-file (string-append "../source/build/libui_" ,= arch ".so") > + (string-append out "/lib/")) Add it here instead. There is also no need for the fallback value as the package apparently only supports i686 and x86_64 according to supported-systems. > + (synopsis "Warsow's fork of qfusion, the id Tech 2 derived game en= gine") > + (supported-systems '("i686-linux" "x86_64-linux")) > + (description > + "This package contains Warsow's fork of qfusion, the id Tech 2 de= rived > +game engine. id Tech 2 is the engine originally behind Quake 2.") > + (license license:gpl2+)))) Nit-pick: could you put description immediately after synopsis? Also, please avoid restating the synopsis in the description, but try to expand on it. I.e. what is Warsow? I thought it was a city! Meanwhile I've reverted the commit so that 'make' works again. Thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6th0oACgkQoqBt8qM6 VPrYXgf9EcvB1hidHR3AJ2uEz9LyaiSIU1EaVnsSmBRXsB/iRFch9Ag40BOURii8 s23bARtZ99Dq1YlJhqLD2kg4YTfq/0C2Hxy9V9QBQ6hgRiD66Jzvi8P2rvzDxUkn bZg+lce+93c+n/ZxNs2ZPBY/E6KcXbTcPUIpETyvLMkUJoDeyevVGstx1VKQWzmy UC9IX9LWRBul7VGMgxTzuuV75T8gIN4SZqb+PB2V5yjQd26hIIo685RvqZQwdtFW GJ07FsNk7glQ46uB9j0D8uQDDAMSA94pMM9+dfrMVNJpyDhTjSTU08AKqNMpoj83 jar72w8ytpoqbxt3JsvYlHsVBsfYqA== =Jmfi -----END PGP SIGNATURE----- --=-=-=--