From patchwork Sat May 16 20:53:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 22115 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 1579D27BBE1; Sat, 16 May 2020 21:54:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4D52627BBE3 for ; Sat, 16 May 2020 21:54:13 +0100 (BST) Received: from localhost ([::1]:40346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ja3oy-0002pw-L3 for patchwork@mira.cbaines.net; Sat, 16 May 2020 16:54:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ja3op-0002pi-0T for guix-patches@gnu.org; Sat, 16 May 2020 16:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ja3oo-0005vd-23 for guix-patches@gnu.org; Sat, 16 May 2020 16:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ja3oo-0005tH-0W for guix-patches@gnu.org; Sat, 16 May 2020 16:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41337] [PATCH 1/2] gnu: julius: Update to 1.4.0. References: <87blmnr4w8.fsf@araneo.si> In-Reply-To: <87blmnr4w8.fsf@araneo.si> Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 May 2020 20:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41337@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 41337-submit@debbugs.gnu.org id=B41337.158966241022598 (code B ref 41337); Sat, 16 May 2020 20:54:01 +0000 Received: (at 41337) by debbugs.gnu.org; 16 May 2020 20:53:30 +0000 Received: from localhost ([127.0.0.1]:41825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ja3oI-0005sO-2p for submit@debbugs.gnu.org; Sat, 16 May 2020 16:53:30 -0400 Received: from araneo.si ([90.157.193.204]:48754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ja3oF-0005s9-Uk for 41337@debbugs.gnu.org; Sat, 16 May 2020 16:53:28 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id cca1f906 for <41337@debbugs.gnu.org>; Sat, 16 May 2020 20:53:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=20180623; bh=4r1k9DR23XPpNeCd49nZt0/nbyo=; b=vcbg2/FOZ37HSLNo wnVT5HfC3HXoadhdCGWB5cjTUwgDvYOSyvpnxyocNLV9dU0B2RIHkBuhvF2Uq19S vnFW4g/7l309qDm4CT+mg3NAemJulrJ6+lpccgjK5PnpkJ6knEFEaWEAzzr+8Ain Q7pK9Wae696BNqgjQ1SmThOIA2zcbhK+Neac5IcqBEOoXpF4oXlJk5UoSXwOl4dj OK4eSSjXqSCjcQcn481/BGrm/7MEzX4hJAxWn0XAXO6jhz6baBn19OzOTnNiL+H0 D0kIPT52FgoKbNz7rC74UAwOUcpgonFcldJpnvk4v1a0IDRxjsy49/bPpSIGW1YX 25TYXw== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 17ac0e4c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 16 May 2020 20:53:25 +0000 (UTC) From: Timotej Lazar Date: Sat, 16 May 2020 22:53:16 +0200 Message-Id: <20200516205317.19589-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/packages/games.scm (julius): Update to 1.4.0. [inputs]: Add new dependency libpng. --- gnu/packages/games.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f7b21ce44f..2933267629 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -978,7 +978,7 @@ automata. The following features are available: (define-public julius (package (name "julius") - (version "1.3.0") + (version "1.4.0") (source (origin (method git-fetch) @@ -987,10 +987,11 @@ automata. The following features are available: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ws5lmwdhla73676fj0w26v859n47s0wyxa0mgd0dmkx0x91qriy")))) + (base32 "01rygr592ar530qv1flmaiq8icl0qdxgc8lhkcdyn1g09941z47v")))) (build-system cmake-build-system) (inputs - `(("sdl2" ,sdl2) + `(("libpng" ,libpng) + ("sdl2" ,sdl2) ("sdl2-mixer" ,sdl2-mixer))) (home-page "https://github.com/bvschaik/julius") (synopsis "Re-implementation of Caesar III game engine") From patchwork Sat May 16 20:53:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 22114 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 AB15C27BBE4; Sat, 16 May 2020 21:54:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2B4E127BBE1 for ; Sat, 16 May 2020 21:54:13 +0100 (BST) Received: from localhost ([::1]:40350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ja3oy-0002q2-Mp for patchwork@mira.cbaines.net; Sat, 16 May 2020 16:54:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ja3op-0002pj-0Y for guix-patches@gnu.org; Sat, 16 May 2020 16:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58515) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ja3oo-0005ve-G8 for guix-patches@gnu.org; Sat, 16 May 2020 16:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ja3oo-0005tO-ET for guix-patches@gnu.org; Sat, 16 May 2020 16:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41337] [PATCH 2/2] gnu: julius: Remove unused bundled libraries. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 May 2020 20:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41337@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 41337-submit@debbugs.gnu.org id=B41337.158966241022604 (code B ref 41337); Sat, 16 May 2020 20:54:02 +0000 Received: (at 41337) by debbugs.gnu.org; 16 May 2020 20:53:30 +0000 Received: from localhost ([127.0.0.1]:41827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ja3oI-0005sQ-9j for submit@debbugs.gnu.org; Sat, 16 May 2020 16:53:30 -0400 Received: from araneo.si ([90.157.193.204]:48754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ja3oH-0005s9-2X for 41337@debbugs.gnu.org; Sat, 16 May 2020 16:53:29 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id ce4e2bc2 for <41337@debbugs.gnu.org>; Sat, 16 May 2020 20:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=k7/A0zypnkOW79fHPvlYZ RPEzoI=; b=kHKdvKpe8LcSWkDGK8rXTGevIFPPnVhHpFC9Ts8j4aYkH6zUeID9g 1f0BP+JDVlDzNbBgs3BdzFsP2OmnmkbynfPLIHZqwCUp8R8uejXgAGZq2Kx85jFB rB1e/mUj4dLe+m5Sek8O1+FFw01BKYnpNehRt35ebKmDUD+1XJGaAF/e6pxQJh6Z ukXWogoJSjFXDO1JbyPC3umsoirtJeKQFUw1zrcp+dWnP94duKKMSAqg9TI8lyVV E69nEJZjOexE3ZPuVwMGI1k0h1rAlFxeT86ghi1ol0x973qbIAtOVrQuS1wcBdZB Y8Z0xwTo7pepYvZx2rht38wHqbIj9P8NQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id d1eb73ce (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 16 May 2020 20:53:26 +0000 (UTC) From: Timotej Lazar Date: Sat, 16 May 2020 22:53:17 +0200 Message-Id: <20200516205317.19589-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200516205317.19589-1-timotej.lazar@araneo.si> References: <20200516205317.19589-1-timotej.lazar@araneo.si> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/packages/games.scm (julius)[source](snippet): Remove ext/{dirent,png,SDL2,zlib}. --- gnu/packages/games.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2933267629..d84841b0b7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -987,7 +987,14 @@ automata. The following features are available: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01rygr592ar530qv1flmaiq8icl0qdxgc8lhkcdyn1g09941z47v")))) + (base32 "01rygr592ar530qv1flmaiq8icl0qdxgc8lhkcdyn1g09941z47v")) + ;; Remove unused bundled libraries. + (modules '((guix build utils))) + (snippet + '(begin + (with-directory-excursion "ext" + (for-each delete-file-recursively '("dirent" "png" "SDL2" "zlib"))) + #t)))) (build-system cmake-build-system) (inputs `(("libpng" ,libpng) @@ -1001,7 +1008,6 @@ Julius includes some UI enhancements while preserving the logic (including bugs) of the original game, so that saved games are compatible. This package does not include game data.") (license (list license:agpl3 - license:expat ; ext/dirent license:zlib)))) ; ext/tinyfiledialogs (define-public meandmyshadow