From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 11 04:32:52 2019 Received: (at submit) by debbugs.gnu.org; 11 Feb 2019 09:32:52 +0000 Received: from localhost ([127.0.0.1]:43114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gt7xL-0002Ka-Sn for submit@debbugs.gnu.org; Mon, 11 Feb 2019 04:32:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gt7xK-0002KO-B3 for submit@debbugs.gnu.org; Mon, 11 Feb 2019 04:32:51 -0500 Received: from lists.gnu.org ([209.51.188.17]:51522) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gt7xE-0003qO-FZ for submit@debbugs.gnu.org; Mon, 11 Feb 2019 04:32:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gt7xD-0002bg-79 for guix-patches@gnu.org; Mon, 11 Feb 2019 04:32:44 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gt7x9-0003mr-Ld for guix-patches@gnu.org; Mon, 11 Feb 2019 04:32:41 -0500 Received: from mira.cbaines.net ([2a01:7e00::f03c:91ff:fe69:8da9]:51330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gt7x9-0003iW-2B for guix-patches@gnu.org; Mon, 11 Feb 2019 04:32:39 -0500 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id E044216A41 for ; Mon, 11 Feb 2019 09:32:31 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id f3c41469 for ; Mon, 11 Feb 2019 09:32:31 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] gnu: red-eclipse: Fix build. Date: Mon, 11 Feb 2019 09:32:31 +0000 Message-Id: <20190211093231.17805-1-mail@cbaines.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a01:7e00::f03c:91ff:fe69:8da9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Add a patch from the upstream repository [1] that resolves some errors th= at prevent the package from building [2]. 1: https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc49 2: error: =E2=80=98____gammal_r_finite=E2=80=99 was not declared in this = scope * gnu/packages/games.scm (red-eclipse)[source] Add patch. * gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch: New file * gnu/local.mk (dist_patch_DATA): Add new patch. --- gnu/local.mk | 1 + gnu/packages/games.scm | 4 +- .../red-eclipse-remove-gamma-name-hack.patch | 52 +++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/red-eclipse-remove-gamma-name-ha= ck.patch diff --git a/gnu/local.mk b/gnu/local.mk index 37083ca916..ca46ae7419 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1193,6 +1193,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/rct-add-missing-headers.patch \ %D%/packages/patches/readline-link-ncurses.patch \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ + %D%/packages/patches/red-eclipse-remove-gamma-name-hack.patch \ %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ %D%/packages/patches/reptyr-fix-gcc-7.patch \ %D%/packages/patches/ripperx-missing-file.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5d7c89a880..de53ac798d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2843,7 +2843,9 @@ http://lavachat.symlynx.com/unix/") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0"= )))) + "1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0"= )) + (patches + (search-patches "red-eclipse-remove-gamma-name-hack.pat= ch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target diff --git a/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patc= h b/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch new file mode 100644 index 0000000000..573920cb99 --- /dev/null +++ b/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch @@ -0,0 +1,52 @@ +From b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4 Mon Sep 17 00:00:00 2001 +From: Lee Salzman +Date: Tue, 12 Sep 2017 14:45:10 -0400 +Subject: [PATCH] remove gamma name hack + +--- + src/engine/main.cpp | 6 +++--- + src/shared/cube.h | 8 -------- + 2 files changed, 3 insertions(+), 11 deletions(-) + +diff --git a/src/engine/main.cpp b/src/engine/main.cpp +index 1032004d..77c9233a 100644 +--- a/src/engine/main.cpp ++++ b/src/engine/main.cpp +@@ -278,10 +278,10 @@ static void setgamma(int val) + } +=20 + static int curgamma =3D 100; +-VARF(IDF_PERSIST, gamma, 30, 100, 300, ++VARFN(IDF_PERSIST, gamma, reqgamma, 30, 100, 300, + { +- if(initing || gamma =3D=3D curgamma) return; +- curgamma =3D gamma; ++ if(initing || reqgamma =3D=3D curgamma) return; ++ curgamma =3D reqgamma; + setgamma(curgamma); + }); +=20 +diff --git a/src/shared/cube.h b/src/shared/cube.h +index 3864c492..7ff5e267 100644 +--- a/src/shared/cube.h ++++ b/src/shared/cube.h +@@ -3,19 +3,11 @@ +=20 + #define _FILE_OFFSET_BITS 64 +=20 +-#ifdef __GNUC__ +-#define gamma __gamma +-#endif +- + #ifdef WIN32 + #define _USE_MATH_DEFINES + #endif + #include +=20 +-#ifdef __GNUC__ +-#undef gamma +-#endif +- + #include + #include + #include --=20 2.20.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 12 02:57:28 2019 Received: (at 34429) by debbugs.gnu.org; 12 Feb 2019 07:57:28 +0000 Received: from localhost ([127.0.0.1]:44364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gtSwa-0007mK-2E for submit@debbugs.gnu.org; Tue, 12 Feb 2019 02:57:28 -0500 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gtSwX-0007mA-Rt for 34429@debbugs.gnu.org; Tue, 12 Feb 2019 02:57:27 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1549901418; cv=none; d=zoho.com; s=zohoarc; b=nUbodhmP+3udh+jloprZJcYQRMyDCaMeIT1Y7dSa/PTgTQtRsph8yF3WpmfthZzWmg6DWuIkKLQsvrovbaJGJ7B7ChRHXe66CN/sUmx2KxIIW3iNNCLn0Pp4OSRqGYKlkdza6rV4P7Uee+NbHLhhbvvaJNDOebnYto7+5Sddp2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1549901418; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=5aNQU4PleanwYhigJ8Z0mDghFHWt5Ey7uINm+VbZbgI=; b=YNu4gYfRGVmpp+2O84WoNKLrHXzYWT4pV/S7FGB985HHgQf/nvi7uDNd9Q6VNQ4R+wXO5sx6hgQLfKeHcCyzEbomT9NMcEPp93AS7CaKfxYqgA7FkBJW+jRqUn5ekgZvAr2tlWTIx6w6WwSraV91XiUjnosSqp5rIxOqhW2S7zI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1549901418; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; l=572; bh=5aNQU4PleanwYhigJ8Z0mDghFHWt5Ey7uINm+VbZbgI=; b=ZKsPp/fUPfuK5NLZoJTL4pYsRWf1hCCyNsllIxyH7lB2f3NrtsCT7idC+N/fiAGR EK0+38HqVwo4CxJNq76gIDML9BwJ10Sn3ypgU14PdCWJgYhFT/eOlwRcClG7GRi/jR9 MMfvbSEmsKwjpG9QJo7r2B4E6wfpQ30/LxL2rHJY= Received: from localhost (141.80.247.165 [141.80.247.165]) by mx.zohomail.com with SMTPS id 1549901417736656.0329510610217; Mon, 11 Feb 2019 08:10:17 -0800 (PST) References: <20190211093231.17805-1-mail@cbaines.net> User-agent: mu4e 1.0; emacs 26.1 From: Ricardo Wurmus To: Christopher Baines Subject: Re: [bug#34429] [PATCH] gnu: red-eclipse: Fix build. In-reply-to: <20190211093231.17805-1-mail@cbaines.net> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Mon, 11 Feb 2019 17:10:14 +0100 Message-ID: <87lg2ml315.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 34429 Cc: 34429@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Christopher Baines writes: > Add a patch from the upstream repository [1] that resolves some errors th= at > prevent the package from building [2]. > > 1: https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc49 > 2: error: =E2=80=98____gammal_r_finite=E2=80=99 was not declared in this = scope > > * gnu/packages/games.scm (red-eclipse)[source] Add patch. > * gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch: New file > * gnu/local.mk (dist_patch_DATA): Add new patch. LGTM! Thanks! --=20 Ricardo From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 13 03:04:02 2019 Received: (at 34429-done) by debbugs.gnu.org; 13 Feb 2019 08:04:02 +0000 Received: from localhost ([127.0.0.1]:45736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gtpWU-00042s-2i for submit@debbugs.gnu.org; Wed, 13 Feb 2019 03:04:02 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:43412 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gtpWS-00042S-0B for 34429-done@debbugs.gnu.org; Wed, 13 Feb 2019 03:04:01 -0500 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id B83E516B82; Wed, 13 Feb 2019 08:03:58 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a8cdd839; Wed, 13 Feb 2019 08:03:57 +0000 (UTC) References: <20190211093231.17805-1-mail@cbaines.net> <87lg2ml315.fsf@elephly.net> User-agent: mu4e 1.0; emacs 26.1 From: Christopher Baines To: Ricardo Wurmus Subject: Re: [bug#34429] [PATCH] gnu: red-eclipse: Fix build. In-reply-to: <87lg2ml315.fsf@elephly.net> Date: Wed, 13 Feb 2019 08:03:57 +0000 Message-ID: <87y36kt8r6.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 34429-done Cc: 34429-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ricardo Wurmus writes: > Hi, > > Christopher Baines writes: > >> Add a patch from the upstream repository [1] that resolves some errors t= hat >> prevent the package from building [2]. >> >> 1: https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc49 >> 2: error: =E2=80=98____gammal_r_finite=E2=80=99 was not declared in this= scope >> >> * gnu/packages/games.scm (red-eclipse)[source] Add patch. >> * gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch: New file >> * gnu/local.mk (dist_patch_DATA): Add new patch. > > LGTM! Thanks! Great, I've pushed this as e7e259a50335269cddd004482a655f59d5c7a237 Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlxjz21fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XfyuhAAjn79zLNYEqmL468o0yQccz007pm/NjLbooIJTMKgDcaUvv/W8crlkx+v vSeHziNVabHvuyCWyXSIdT2scx8UOU4I2OvOVTFtXd5sboOTYBJzbKs73z++LlmK LW0U6ANJ/LM/RtnTvxyPWeFBfupfORJapY3AZ4JQeBBBBXctM9vbI1rF8eyYUrtT UYwmZcWlIKfc1dnfH3SlCmC1RwLK093WNpl8bPo8+h2fv2+HW10no3QCl3Dx5a/p EpaqE74fqLh28LhTTWtK1hrU9T0eVyaoiTZVFa8A7EGcIREbupFulbb31k+/keCO zAiUVRabM6DdlBOZTaaPkAIQ1H2NyzbR20oRSGe9PV6/UnhBvxgW/iKkfPLfVBRY K53E8Amd4O0kwPSEGWMidyhYibjlST0TTf86fnBy20WpxIPHGxLlqmYjdPmjhUsa XQLYtKNNlBstzQYDazemBcgBnDuZ2Pie6y8GCzGaPoIPNZ2lfh/hujGUYJFTdWd7 6/X143fAbUlL709B0SkECobwbc4HctnTtdo9vjScyjfAk7jVvhbgM5MKE2AL4+jB RUQCgChy0RO+wBmb156TqP1ovLRh7H3VGrmiKsWBENAN1gAbAVhmcoMGzQoStBfC dnVvlFleIwAWDdWsjoteyvmP/PgqeKj1VPNCkTwWB49NGD+5Qmo= =kPYW -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Sep 10 03:52:23 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 13 Mar 2019 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator