From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id yPwxDjQn9170MwAA0tVLHw (envelope-from ) for ; Sat, 27 Jun 2020 11:02:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id MOzFCTQn917AHwAAbx9fmQ (envelope-from ) for ; Sat, 27 Jun 2020 11:02:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9D1009400B1 for ; Sat, 27 Jun 2020 11:02:11 +0000 (UTC) Received: from localhost ([::1]:38902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jp8b2-0008F8-Se for larch@yhetil.org; Sat, 27 Jun 2020 07:02:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jp8aw-0008F1-VG for guix-patches@gnu.org; Sat, 27 Jun 2020 07:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60218) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jp8aw-0002u7-LW for guix-patches@gnu.org; Sat, 27 Jun 2020 07:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jp8aw-00056H-Id for guix-patches@gnu.org; Sat, 27 Jun 2020 07:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42078] [PATCH] gnu: warzone2100: Update to 3.4.0. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jun 2020 11:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42078 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42078@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159325569619570 (code B ref -1); Sat, 27 Jun 2020 11:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jun 2020 11:01:36 +0000 Received: from localhost ([127.0.0.1]:43531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jp8aO-00055S-Al for submit@debbugs.gnu.org; Sat, 27 Jun 2020 07:01:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:37594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jp8aJ-00055I-PV for submit@debbugs.gnu.org; Sat, 27 Jun 2020 07:01:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jp8aJ-0008CH-Gd for guix-patches@gnu.org; Sat, 27 Jun 2020 07:01:23 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:37821) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jp8aE-0002d3-VB for guix-patches@gnu.org; Sat, 27 Jun 2020 07:01:23 -0400 X-Originating-IP: 92.169.129.147 Received: from localhost.localdomain (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 3124AFF804 for ; Sat, 27 Jun 2020 11:01:13 +0000 (UTC) From: Pierre Neidhardt Date: Sat, 27 Jun 2020 13:01:00 +0200 Message-Id: <20200627110100.1798-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.199; envelope-from=mail@ambrevar.xyz; helo=relay9-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/27 07:01:14 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, FROM_SUSPICIOUS_NTLD=1, FROM_SUSPICIOUS_NTLD_FP=1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: 2.9 (++) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: 2.2 (++) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.49 X-TUID: hg+zvgyh4lDV * gnu/packages/games.scm (warzone2100): Update to 3.4.0. --- gnu/packages/games.scm | 57 +++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a4e1bba5dc..f5a410f2c3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2018 Madalin Ionel-Patrascu ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2019, 2020 Pierre Neidhardt ;;; Copyright © 2019, 2020 Oleg Pykhalov ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Julien Lepiller @@ -153,6 +153,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages shells) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) @@ -4138,24 +4139,40 @@ in-window at 640x480 resolution or fullscreen.") (define-public warzone2100 (package (name "warzone2100") - (version "3.2.3") + (version "3.4.0") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/warzone2100/archives/" - "unsupported/Warzone2100-" - (version-major+minor version) "/" version - "/warzone2100-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/warzone2100/releases/" + version + "/warzone2100_src.tar.xz")) (sha256 - (base32 "10kmpr4cby95zwqsl1zwx95d9achli6khq7flv6xmrq30a39xazw")))) - (build-system gnu-build-system) + (base32 "0g4qwi9zw0s4pfgrz3fxhargsj3405rbrh9zy3b2j3arzss2h0gy")) + (modules '((guix build utils))) + (snippet + '(begin + (with-directory-excursion "3rdparty" + (for-each + delete-file-recursively + '("discord-rpc" + "miniupnp" + "utfcpp"))) + #t)))) + (build-system cmake-build-system) (arguments - `(#:configure-flags '("--with-distributor=Guix") + `(#:configure-flags '("-DWZ_DISTRIBUTOR=Guix" + "-DENABLE_DISCORD=off") + #:tests? #f ; TODO: Tests seem to be broken, configure.ac is missing. #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-utfcpp-include + (lambda _ + (substitute* "lib/framework/wzstring.cpp" + (("") "")) + #t)) (add-after 'unpack 'link-tests-with-qt (lambda _ - (substitute* "tests/Makefile.in" + (substitute* "tests/Makefile.am" (("(framework_linktest_LDADD|maptest_LDADD) = " prefix) (string-append prefix "$(QT5_LIBS) "))) #t)) @@ -4166,32 +4183,38 @@ in-window at 640x480 resolution or fullscreen.") (string-append "iV_DrawTextRotated(\"Press ESC to exit.\", " "100, 100, 0.0f, font_regular);"))) #t))))) - (native-inputs `(("gettext" ,gettext-minimal) + (native-inputs `(("asciidoc" ,asciidoc) + ("asciidoctor" ,ruby-asciidoctor) + ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config) ("unzip" ,unzip) - ("zip" ,zip))) - (inputs `(("fontconfig" ,fontconfig) + ;; 7z is used to create .zip archive, not `zip' as in version 3.2.*. + ("p7zip" ,p7zip))) + (inputs `(("curl" ,curl) + ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("fribidi" ,fribidi) ("glew" ,glew) ("harfbuzz" ,harfbuzz) ("libtheora" ,libtheora) ("libvorbis" ,libvorbis) ("libxrandr" ,libxrandr) + ("libsodium" ,libsodium) + ("miniupnpc" ,miniupnpc) ("openal" ,openal) ("physfs" ,physfs) ("qtbase" ,qtbase) ("qtscript" ,qtscript) ("openssl" ,openssl) - ("sdl2" ,sdl2))) + ("sdl2" ,sdl2) + ("utfcpp" ,utfcpp))) (home-page "https://wz2100.net") (synopsis "3D Real-time strategy and real-time tactics game") (description "Warzone 2100 offers campaign, multi-player, and single-player skirmish -modes. An extensive tech tree with over 400 different technologies, combined +modes. An extensive tech tree with over 400 different technologies, combined with the unit design system, allows for a wide variety of possible units and tactics.") - ; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL + ;; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL (license (list license:bsd-3 license:cc0 license:cc-by-sa3.0 -- 2.26.2