From patchwork Sat Apr 6 08:44:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 62770 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 35BEC27BBEA; Sat, 6 Apr 2024 09:45:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5D03127BBE2 for ; Sat, 6 Apr 2024 09:45:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rt1fV-0005tN-QC; Sat, 06 Apr 2024 04:44:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rt1fU-0005t7-LK for guix-patches@gnu.org; Sat, 06 Apr 2024 04:44:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rt1fU-0004ZE-BI for guix-patches@gnu.org; Sat, 06 Apr 2024 04:44:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rt1fa-0005mX-9p; Sat, 06 Apr 2024 04:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70235] [PATCH 1/2] gnu: widelands: Update to 1.2. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 06 Apr 2024 08:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70235 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70235@debbugs.gnu.org Cc: Timotej Lazar , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 70235-submit@debbugs.gnu.org id=B70235.171239305922020 (code B ref 70235); Sat, 06 Apr 2024 08:45:02 +0000 Received: (at 70235) by debbugs.gnu.org; 6 Apr 2024 08:44:19 +0000 Received: from localhost ([127.0.0.1]:38211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rt1es-0005j1-O8 for submit@debbugs.gnu.org; Sat, 06 Apr 2024 04:44:19 -0400 Received: from static.51.243.21.65.clients.your-server.de ([65.21.243.51]:39694 helo=araneo.si) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rt1eq-0005ir-66 for 70235@debbugs.gnu.org; Sat, 06 Apr 2024 04:44:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=nBKMsf7Liql UyWkCV0qUQp58uG1gev3iLUNmZ61/ZwE=; h=references:in-reply-to:date: subject:cc:to:from; d=araneo.si; b=pDU0ADvt1GoZq7z/NqxpiVcD+4BpaaDKysz 6rOmu2RW5Ai9iVJFKmSC/Xgg02/YPRwBUj7u0LubkE3to6it5KTcZMR+M+kyyQk61JOw7P lMGJYC6G1kOdZsynL648dEpi0FzA9RIKdYCcCQo3C1M6AocoHw4I9a0WWsrOx4HCTc= Received: by araneo.si (OpenSMTPD) with ESMTPSA id eb9b2008 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 6 Apr 2024 08:44:08 +0000 (UTC) From: Timotej Lazar Date: Sat, 6 Apr 2024 10:44:02 +0200 Message-ID: <5f83354f3c946d1f21b3e4b9a48169a450649b88.1712392635.git.timotej.lazar@araneo.si> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (widelands): Update to 1.2. [inputs]: Drop boost, curl. [native-inputs]: Replace python-wrapper with python. Change-Id: I1a98739a5da801d3686acf152989c8ce15f16a90 --- gnu/packages/games.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6e26a15f56..78aedca434 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5786,7 +5786,7 @@ (define-public warzone2100 (define-public widelands (package (name "widelands") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) @@ -5795,7 +5795,7 @@ (define-public widelands (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07wbalwdmml9vdh9nh50svnsw4sdj9nnp32azbss8vzq5mxmzvbx")) + (base32 "1m9hn1sh1siggribzsq79k7p0lggdw41ji7zdl6h648cjak9mdsp")) (modules '((guix build utils))) (snippet '(begin @@ -5830,11 +5830,9 @@ (define-public widelands (native-inputs `(("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + ("python" ,python))) (inputs `(("asio" ,asio) - ("curl" ,curl) - ("boost" ,boost) ("glew" ,glew) ("icu4c" ,icu4c) ("libpng" ,libpng) From patchwork Sat Apr 6 08:44:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 62771 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 8BC8827BBEA; Sat, 6 Apr 2024 09:45:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B245427BBE2 for ; Sat, 6 Apr 2024 09:45:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rt1fW-0005tO-Hf; Sat, 06 Apr 2024 04:44:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rt1fV-0005tE-11 for guix-patches@gnu.org; Sat, 06 Apr 2024 04:44:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rt1fU-0004ZJ-Mt for guix-patches@gnu.org; Sat, 06 Apr 2024 04:44:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rt1fa-0005mj-Nb; Sat, 06 Apr 2024 04:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70235] [PATCH 2/2] gnu: widelands: Improve package style. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 06 Apr 2024 08:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70235 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70235@debbugs.gnu.org Cc: Timotej Lazar , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 70235-submit@debbugs.gnu.org id=B70235.171239306022030 (code B ref 70235); Sat, 06 Apr 2024 08:45:02 +0000 Received: (at 70235) by debbugs.gnu.org; 6 Apr 2024 08:44:20 +0000 Received: from localhost ([127.0.0.1]:38213 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rt1eu-0005jE-6d for submit@debbugs.gnu.org; Sat, 06 Apr 2024 04:44:20 -0400 Received: from static.51.243.21.65.clients.your-server.de ([65.21.243.51]:39694 helo=araneo.si) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rt1es-0005ir-3o for 70235@debbugs.gnu.org; Sat, 06 Apr 2024 04:44:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=q/KBTrKGd30 1YIiqFHi1X4rKvgMkN2A+m0nySAMe7cg=; h=references:in-reply-to:date: subject:cc:to:from; d=araneo.si; b=s+2xhpwYkPcVz8Y41g1ilQ9VYmqb17E54Z/ 0qM+BGaen1bk4TrR2A7q9KVYoGLnaIptzE80A8fgbXnTCo59+m3BTfmWyNnz/9dwzXfdPZ ZrROpjxjHCG75JEHDPprRb3nUUu7ZhjafUXAl/O0vmnzZTrTxElL05L15HCiX42yEA= Received: by araneo.si (OpenSMTPD) with ESMTPSA id 194259fe (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 6 Apr 2024 08:44:10 +0000 (UTC) From: Timotej Lazar Date: Sat, 6 Apr 2024 10:44:03 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (widelands): Use new package style. [snippet]: Simplify and drop trailing #t. [arguments]: Use gexps. Tweak #:configure-flags to install the binary in bin/ instead of bin/games/ and data under share/ instead of bin/share/. Modify 'unbundle-fonts phase to not depend on input labels. [inputs, native-inputs]: Drop input labels. [home-page]: Drop trailing slash. Change-Id: I75c535005ad1325ad170205b6e80b1039125619a --- gnu/packages/games.scm | 85 +++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 78aedca434..b788c7c774 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5791,58 +5791,57 @@ (define-public widelands (origin (method git-fetch) (uri (git-reference - (url "https://github.com/widelands/widelands") - (commit (string-append "v" version)))) + (url "https://github.com/widelands/widelands") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1m9hn1sh1siggribzsq79k7p0lggdw41ji7zdl6h648cjak9mdsp")) (modules '((guix build utils))) (snippet - '(begin - (delete-file-recursively "src/third_party/minizip") - #t)))) + #~(delete-file-recursively "src/third_party/minizip")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - (let* ((out (assoc-ref %outputs "out")) - (share (string-append out "/share"))) - (list (string-append "-DCMAKE_INSTALL_PREFIX=" out "/bin") - (string-append "-DWL_INSTALL_BASEDIR=" share "/widelands") - (string-append "-DWL_INSTALL_DATADIR=" share "/widelands") - "-DOPTION_BUILD_WEBSITE_TOOLS=OFF" - ;; CMakeLists.txt does not handle properly RelWithDebInfo build - ;; type. When used, no game data is installed! - "-DCMAKE_BUILD_TYPE=Release")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unbundle-fonts - ;; Unbundle fonts already packaged in Guix. XXX: missing fonts are - ;; amiri, Culmus, mmrCensus, Nakula, and Sinhala. - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "data/i18n/fonts" - (for-each (lambda (font) - (delete-file-recursively font) - (symlink (string-append (assoc-ref inputs font) - "/share/fonts/truetype") - font)) - '("DejaVu" "MicroHei"))) - #t))))) + (list + #:configure-flags + #~(let ((share (string-append #$output "/share/widelands"))) + (list (string-append "-DCMAKE_INSTALL_PREFIX=" #$output) + (string-append "-DWL_INSTALL_BINDIR=" #$output "/bin") + (string-append "-DWL_INSTALL_BASEDIR=" share) + (string-append "-DWL_INSTALL_DATADIR=" share) + "-DOPTION_BUILD_WEBSITE_TOOLS=OFF" + ;; CMakeLists.txt does not handle properly RelWithDebInfo build + ;; type. When used, no game data is installed! + "-DCMAKE_BUILD_TYPE=Release")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unbundle-fonts + ;; Unbundle fonts already packaged in Guix. XXX: missing fonts are + ;; amiri, Culmus, mmrCensus, Nakula, and Sinhala. + (lambda* (#:key inputs #:allow-other-keys) + (for-each + (lambda (font) + (let* ((path (string-append "share/fonts/truetype/" (basename font))) + (target (false-if-exception (search-input-file inputs path)))) + (when target + (delete-file font) + (symlink target font)))) + (find-files "data/i18n/fonts" "\\.tt[cf]$"))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("python" ,python))) + (list gettext-minimal pkg-config python)) (inputs - `(("asio" ,asio) - ("glew" ,glew) - ("icu4c" ,icu4c) - ("libpng" ,libpng) - ("minizip" ,minizip) - ("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) - ("zlib" ,zlib) - ;; Fonts for the ‘unbundle-fonts’ phase. Case matters in name! - ("DejaVu" ,font-dejavu) - ("MicroHei" ,font-wqy-microhei))) - (home-page "https://www.widelands.org/") + (list asio + font-dejavu + font-wqy-microhei + glew + icu4c + libpng + minizip + sdl2 + sdl2-image + sdl2-mixer + sdl2-ttf + zlib)) + (home-page "https://www.widelands.org") (synopsis "Fantasy real-time strategy game") (description "In Widelands, you are the regent of a small clan. You start out with