From patchwork Sat Oct 19 13:36:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Wilson X-Patchwork-Id: 15773 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 D720B175DB; Sat, 19 Oct 2019 14:38:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 98E03175D6 for ; Sat, 19 Oct 2019 14:38:27 +0100 (BST) Received: from localhost ([::1]:54952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLow7-0006rP-12 for patchwork@mira.cbaines.net; Sat, 19 Oct 2019 09:38:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38655) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLovo-0006rF-TO for guix-patches@gnu.org; Sat, 19 Oct 2019 09:38:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLovk-00052F-Vi for guix-patches@gnu.org; Sat, 19 Oct 2019 09:38:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43293) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLovi-00050O-Gt for guix-patches@gnu.org; Sat, 19 Oct 2019 09:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iLovi-0005xo-Cx for guix-patches@gnu.org; Sat, 19 Oct 2019 09:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37793] [PATCH] gnu: Add gens-gs. References: <20191017144238.23959-1-mail@ambrevar.xyz> In-Reply-To: <20191017144238.23959-1-mail@ambrevar.xyz> Resent-From: "David Wilson" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Oct 2019 13:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37793 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37793@debbugs.gnu.org Received: via spool by 37793-submit@debbugs.gnu.org id=B37793.157149227222909 (code B ref 37793); Sat, 19 Oct 2019 13:38:02 +0000 Received: (at 37793) by debbugs.gnu.org; 19 Oct 2019 13:37:52 +0000 Received: from localhost ([127.0.0.1]:52114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iLovY-0005xR-58 for submit@debbugs.gnu.org; Sat, 19 Oct 2019 09:37:52 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:38529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iLovW-0005xD-7B for 37793@debbugs.gnu.org; Sat, 19 Oct 2019 09:37:50 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id F38F92179E for <37793@debbugs.gnu.org>; Sat, 19 Oct 2019 09:37:44 -0400 (EDT) Received: from imap2 ([10.202.2.52]) by compute2.internal (MEProxy); Sat, 19 Oct 2019 09:37:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daviwil.com; h= mime-version:message-id:date:from:to:subject:content-type; s= fm3; bh=4UfkzNh/tS/+XKIx4qiUtmXUHyAgV/Li04K/XoSUXrM=; b=QeVLP/z2 RW51Ii47URIzfflO4EEJ6hAzsAMrKea0Mrd1R0my8+RCSC+CKSGZFDVWkLpPAzCE ooVlBSDtTSpnkYnaxgDVUkVJ+GdhwtUfu1i6pTqzQ3DpMoFiQ1lhyDe9IadPjuRi 0UXxj4VIWbU5BG0HC6ib9fyoCQg7AkUycgD2sR4XrgFUpiwkkPyGhziYN2pRNILS M6pKYiDZRZr8yStW+pEuyAN93D0qV4XGgYxXfzTnJ4ZeCcWRlRooyefwfh6Yl2KJ iKlcshqs15ck5jGxhqMBEXk6iuQrwBbnVFjAXeYRaXNByMKaQZlXvO6udJp2KZWh GI1uCcjAB4rzzQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=4UfkzNh/tS/+XKIx4qiUtmXUHyAgV /Li04K/XoSUXrM=; b=wmhgcR8WKF2q50weZY5rFuetlqoq9wKNMPmqEZp2rOgTm hAE2JYPuJmRpMuVw2elwlEQuJNIf99gpxEV/mel0Xg8Nzbqf0PzlhjVH4Erg8SOI Llb6Yr28yn7CT2R5BX6lcQ8dxJKO7/KXnjhxy6CLC7Nc9za6PuP3le+A3s8YIrFy vKlKR8gwWG2k37dIiW4ztRIvKN7YpMR+ckwNLsRQwYrUQW9+l2RYfTx5c4s4JGVR AkYztSERPEtgu/GKLWRx9swY7BreF95GJHDVsx9WjSTF81dsAxC9UBgzFFRoCO8L aNKvlQRa9vBAKJFdilg3h2RhO5BNftQ3rEcAwxauw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrkedtgdduleejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfffhffvufgtsehmtderre erredtnecuhfhrohhmpedfffgrvhhiugcuhghilhhsohhnfdcuoegurghvihgusegurghv ihifihhlrdgtohhmqeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecurfgrrhgrmh epmhgrihhlfhhrohhmpegurghvihgusegurghvihifihhlrdgtohhmnecuvehluhhsthgv rhfuihiivgeptd X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 88992E00A5; Sat, 19 Oct 2019 09:37:44 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.7-360-g7dda896-fmstable-20191004v2 Mime-Version: 1.0 Message-Id: Date: Sat, 19 Oct 2019 06:36:50 -0700 From: "David Wilson" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Hi all! I was able to get the gens-gs build working with the attached patch on top of Pierre's original. Tested the output by loading up a "Chakan: The Forever Man" ROM, seemed to work fine :) The key was this line of the Nix package definition: https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/emulators/gens-gs/default.nix#L16 Apparently gens-gs' code is so old that it's using some deprecated GTK APIs, so we have to remove the GTK_DISABLE_DEPRECATED define, etc, from GTK_CFLAGS so that the build will complete successfully. David diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index c1d1d54052..d616f7fd21 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -82,6 +82,7 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages web) #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu)) (define-public desmume @@ -1379,9 +1380,18 @@ functions. The source code to MAME serves as this documentation.") (sha256 (base32 "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) + (supported-systems '("i686-linux" "x86_64-linux")) (arguments - `(#:system "i686-linux")) + `(#:system "i686-linux" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-CFLAGS + (lambda* _ + ;; Remove GTK API deprecation flags that cause build errors + (substitute* "configure" + (("GTK_CFLAGS=\"\\$GTK_CFLAGS .*\"") "")) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("nasm" ,nasm)))