From patchwork Fri Feb 15 12:26:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 1096 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 69E0C16BDC; Fri, 15 Feb 2019 12:27:14 +0000 (GMT) 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 103DC16B87 for ; Fri, 15 Feb 2019 12:27:14 +0000 (GMT) Received: from localhost ([127.0.0.1]:38573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gucaH-0008I5-Mn for patchwork@mira.cbaines.net; Fri, 15 Feb 2019 07:27:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guca8-0008Ev-6C for guix-patches@gnu.org; Fri, 15 Feb 2019 07:27:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guca7-0002TX-0D for guix-patches@gnu.org; Fri, 15 Feb 2019 07:27:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49375) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guca6-0002Sx-Lj for guix-patches@gnu.org; Fri, 15 Feb 2019 07:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1guca6-0002QV-Ho for guix-patches@gnu.org; Fri, 15 Feb 2019 07:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34482] [PATCH 3/3] gnu: freedink-engine: Update to 109.4. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Feb 2019 12:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34482 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34482@debbugs.gnu.org Received: via spool by 34482-submit@debbugs.gnu.org id=B34482.15502336039293 (code B ref 34482); Fri, 15 Feb 2019 12:27:02 +0000 Received: (at 34482) by debbugs.gnu.org; 15 Feb 2019 12:26:43 +0000 Received: from localhost ([127.0.0.1]:48655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gucZn-0002Pj-EJ for submit@debbugs.gnu.org; Fri, 15 Feb 2019 07:26:43 -0500 Received: from mout01.posteo.de ([185.67.36.65]:59267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gucZg-0002PI-9Q for 34482@debbugs.gnu.org; Fri, 15 Feb 2019 07:26:37 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id F3F48160060 for <34482@debbugs.gnu.org>; Fri, 15 Feb 2019 13:26:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1550233590; bh=pILBLlq+NKydw5Zwr7L4cWxtPlgsSHb/q6jMl60rTK4=; h=From:To:Cc:Subject:Date:From; b=aoS34SVkXq6fMAiMmzSAiltoWq8SLyqUMiTSdWv3mo0Bl+4lPyWuxHxirS5gfqVYj GILhQpuqojSJvm01YsE6nnQogojoUJrSiYb3NwNbS4g1tCTyvEF1+NwOG0Ame20QUM G9O3V9l9IrAMHdPp5aEigpeQbAq2qxVLOVcQ+AD9Pwgui0qDxhsiComBB7TfSEW1Ap bLcud1FoSN13jaI7r4QUfxZczRVBwi/zITf4fHgY60iJxg35QYIa0rNxGTN1W8zi1e ZFatwZAg4RKtD3OzB0tK2ILwJt6cUf1MIpAdYZIBoG8Li9eJy+QJsaV8mQ8zjpBnS6 VLH3Y0inOCRZA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 441CDP23q5z6tmH; Fri, 15 Feb 2019 13:26:29 +0100 (CET) From: Kei Kebreau Date: Fri, 15 Feb 2019 07:26:24 -0500 Message-Id: <20190215122624.5269-2-kkebreau@posteo.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215122624.5269-1-kkebreau@posteo.net> References: <20190215122624.5269-1-kkebreau@posteo.net> MIME-Version: 1.0 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: , Cc: Kei Kebreau Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (freedink-engine): Update to 109.4. [arguments]: Add 'disable-graphical-tests' phase. [native-inputs]: Add autoconf, automake and cxxtest. Remove check. [inputs]: Add glm and sdl-union of sdl2, sdl2-image, sdl2-mixer, sdl2-ttf and sdl2-gfx. Remove sdl, sdl-image, sdl-mixer, sdl-ttf and sdl-gfx. --- gnu/packages/games.scm | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6d9e63c4e9..980bf872e7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -112,6 +112,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages haskell) + #:use-module (gnu packages maths) #:use-module (gnu packages mp3) #:use-module (gnu packages music) #:use-module (gnu packages multiprecision) @@ -1401,25 +1402,34 @@ interface or via an external visual interface such as GNU XBoard.") (define freedink-engine (package (name "freedink-engine") - (version "108.4") + (version "109.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/freedink/freedink-" version ".tar.gz")) (sha256 (base32 - "08c51imfjfcydm7h0va09z8qfw5nc837bi2x754ni2z737hb5kw2")))) + "0iaagwnyfgm3mqzkj550q60hrsjr13gykg5vfn2nz2ia520bb52g")))) (build-system gnu-build-system) - (arguments `(#:configure-flags '("--disable-embedded-resources"))) - (native-inputs `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) - (inputs `(("sdl" ,sdl) - ("sdl-image" ,sdl-image) - ("sdl-mixer" ,sdl-mixer) - ("sdl-ttf" ,sdl-ttf) - ("sdl-gfx" ,sdl-gfx) + (arguments + `(#:configure-flags '("--disable-embedded-resources") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-graphical-tests + (lambda _ + ;; These tests require a graphical interface. + (substitute* "src/Makefile.am" + (("test_gfx_fonts TestIOGfxDisplay") "")) + #t))))) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("cxxtest" ,cxxtest))) + (inputs `(("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer + sdl2-ttf sdl2-gfx))) ("fontconfig" ,fontconfig) - ("check" ,check))) + ("glm" ,glm))) (properties '((ftp-directory . "/freedink") (upstream-name . "freedink"))) (home-page "https://www.gnu.org/software/freedink/")