unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "David Wilson" <david@daviwil.com>
To: 37793@debbugs.gnu.org
Subject: [bug#37793] [PATCH] gnu: Add gens-gs.
Date: Sat, 19 Oct 2019 06:36:50 -0700	[thread overview]
Message-ID: <e701b7b6-9c17-466b-b7d0-606c7837e968@www.fastmail.com> (raw)
In-Reply-To: <20191017144238.23959-1-mail@ambrevar.xyz>

[-- Attachment #1: Type: text/plain, Size: 544 bytes --]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gens-fix.patch --]
[-- Type: text/x-patch; name="gens-fix.patch", Size: 1220 bytes --]

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)))

  parent reply	other threads:[~2019-10-19 13:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-17 14:42 [bug#37793] [PATCH] gnu: Add gens-gs Pierre Neidhardt
2019-10-17 15:38 ` Mathieu Othacehe
     [not found] ` <handler.37793.B.157132338326045.ack@debbugs.gnu.org>
2019-10-18  8:35   ` [bug#37793] Acknowledgement ([PATCH] gnu: Add gens-gs.) Pierre Neidhardt
2019-10-19 13:36 ` David Wilson [this message]
2019-10-21 16:25 ` [bug#37793] [PATCH] gnu: Add gens-gs Pierre Neidhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e701b7b6-9c17-466b-b7d0-606c7837e968@www.fastmail.com \
    --to=david@daviwil.com \
    --cc=37793@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).