From patchwork Sat Nov 5 12:18:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 44332 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 7CA2D27BBE9; Sat, 5 Nov 2022 12:20:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 26F3F27BBEA for ; Sat, 5 Nov 2022 12:20:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orI9q-00027K-TE; Sat, 05 Nov 2022 08:20:18 -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 1orI9b-00025B-5Y for guix-patches@gnu.org; Sat, 05 Nov 2022 08:20:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1orI9a-0003pt-TC for guix-patches@gnu.org; Sat, 05 Nov 2022 08:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1orI9a-00057k-I5 for guix-patches@gnu.org; Sat, 05 Nov 2022 08:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59049] [PATCH 1/2] gnu: surgescript: Update to 0.5.6.1. References: <20221105121705.7763-1-timotej.lazar@araneo.si> In-Reply-To: <20221105121705.7763-1-timotej.lazar@araneo.si> Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Nov 2022 12:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59049 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59049@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 59049-submit@debbugs.gnu.org id=B59049.166765076919640 (code B ref 59049); Sat, 05 Nov 2022 12:20:02 +0000 Received: (at 59049) by debbugs.gnu.org; 5 Nov 2022 12:19:29 +0000 Received: from localhost ([127.0.0.1]:55872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orI93-00056i-3f for submit@debbugs.gnu.org; Sat, 05 Nov 2022 08:19:29 -0400 Received: from araneo.si ([90.157.193.204]:43768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orI91-00056Z-2t for 59049@debbugs.gnu.org; Sat, 05 Nov 2022 08:19:28 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 8334052b for <59049@debbugs.gnu.org>; Sat, 5 Nov 2022 12:19:26 +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=r1HublLk9R5L+T4pNjRlr8xsxfc=; b=jB8tH+nbuBllb2WL C5mA/JIY41a7mmDU5/Pt+rrJh2sA8JQ9brvFMkKS9gPuvDRFJRaXJz9/EpJ6K5BH dtsj/w7Spz+E6TeAK+tJvm4dBRp6+mLaznvWfChTyW1gH9jNvnpU68BQQw8mVsNl Ndx8V8StK6eWnRjH4y1OoykxMoETyGfdYQA+WUg26/dsqnDgWAY50l/k/oTzg5rz awDiiFqIip4vtDALQFhSztEob54gZ3sBfasRtoS5SMldPT4lS0Rg5Bh7Lh3BSZ8F Qe3q05VIFyoXE704lHk5ZlUTrjRQ55DvuZDXFL1XJRIKn8QxNRi/Rz/NbpmRyBfL bbBV3g== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 4b01e934 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 5 Nov 2022 12:19:26 +0000 (UTC) From: Timotej Lazar Date: Sat, 5 Nov 2022 13:18:59 +0100 Message-Id: <20221105121859.10076-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.38.0 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (surgescript): Update to 0.5.6.1. [arguments]: Drop #:configure-flags as the build script was fixed upstream. --- gnu/packages/game-development.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 861de63fad..15bf93d51d 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -780,7 +780,7 @@ (define-public sfxr (define-public surgescript (package (name "surgescript") - (version "0.5.5") + (version "0.5.6.1") (source (origin (method git-fetch) @@ -789,15 +789,10 @@ (define-public surgescript (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0xwd4g7n0b0rxkpbyshkzyl472h1y606ghyvf8gv034n3jz2g4jk")))) + (base32 "1p1pxb4iixzq7z14bpy32dx3dhfaaf6mcz4y3g3g09bkdmm1ys6j")))) (build-system cmake-build-system) (arguments - '(#:configure-flags - (let ((share (string-append (assoc-ref %outputs "out") "/share"))) - (list "-DWANT_STATIC=NO" - (string-append "-DICON_PATH=" share "/pixmaps") - (string-append "-DMETAINFO_PATH=" share "/metainfo"))) - #:tests? #f)) + (list #:tests? #f)) ; there are no tests (home-page "https://docs.opensurge2d.org") (synopsis "Scripting language for games") (description "@code{SurgeScript} is a dynamically typed object-oriented From patchwork Sat Nov 5 12:19:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 44333 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 96BC927BBEA; Sat, 5 Nov 2022 12:20:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 C2B1727BBE9 for ; Sat, 5 Nov 2022 12:20:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orI9q-00027D-KN; Sat, 05 Nov 2022 08:20:18 -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 1orI9b-00025J-Sg for guix-patches@gnu.org; Sat, 05 Nov 2022 08:20:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1orI9b-0003q0-9N for guix-patches@gnu.org; Sat, 05 Nov 2022 08:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1orI9b-00057t-58 for guix-patches@gnu.org; Sat, 05 Nov 2022 08:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59049] [PATCH 2/2] gnu: opensurge: Update to 0.6.0.3. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Nov 2022 12:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59049 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59049@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 59049-submit@debbugs.gnu.org id=B59049.166765078019663 (code B ref 59049); Sat, 05 Nov 2022 12:20:03 +0000 Received: (at 59049) by debbugs.gnu.org; 5 Nov 2022 12:19:40 +0000 Received: from localhost ([127.0.0.1]:55876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orI9D-000574-E2 for submit@debbugs.gnu.org; Sat, 05 Nov 2022 08:19:40 -0400 Received: from araneo.si ([90.157.193.204]:43768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orI9B-00056Z-F1 for 59049@debbugs.gnu.org; Sat, 05 Nov 2022 08:19:37 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 52e347d5 for <59049@debbugs.gnu.org>; Sat, 5 Nov 2022 12:19:36 +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=b7rBEVu+Vgr6nONLKKLHz WWQEl4=; b=jGZGRg4C2w8XesA7SHGGhVdH08vkQG9i/nfZiV1ZfM1wy3TXaZT2X G2VhRbf0FfUvfRB/l6Qez+SGk6VsboBdM/lr597GZzKxMdrlzkzZJ/5KA19Vw+6/ mFWZkMpNaM6bsUEGYYoZtGKHYVZWlcU2d4hoiGN3dx/adVN/L+LvRZMTTO3RX37l sy9OGTDbz3saMUpvjrgjenS9kpPjbCS3p/7XZFEMgDUbgc0hYPuvS4G0kPCgGoJx 0DbhjyhR2cb8SJo91SxgfwVwv4tXDpq4rjFiFIYVYlA+B7ztELW72Y3zBB/l++sJ 5mMEugsfUjt2ib3rUzBaX35hCYp4D24lw== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 11b289b9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 5 Nov 2022 12:19:36 +0000 (UTC) From: Timotej Lazar Date: Sat, 5 Nov 2022 13:19:01 +0100 Message-Id: <20221105121859.10076-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221105121859.10076-1-timotej.lazar@araneo.si> References: <20221105121859.10076-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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (opensurge): Update to 0.6.0.3. [arguments]: Use G-exps. --- gnu/packages/games.scm | 63 ++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0a41840847..d32ef98fc4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1662,7 +1662,7 @@ (define-public meandmyshadow (define-public opensurge (package (name "opensurge") - (version "0.5.2.1") + (version "0.6.0.3") (source (origin (method git-fetch) @@ -1671,40 +1671,37 @@ (define-public opensurge (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "13g5izss7dmgigc8iif8hid3z6i066b0z29rbql2b9qjmdj1dp41")))) + (base32 "0yia2qcva741a64qpls8a59lvnx5vynqkk2i3arkflw6f1m1vb55")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;there are no tests - #:configure-flags - (let* ((out (assoc-ref %outputs "out")) - (share (string-append out "/share"))) - (list (string-append "-DCMAKE_INSTALL_PREFIX=" out) - (string-append "-DGAME_BINDIR=" out "/bin") ; not /bin/games - (string-append "-DGAME_DATADIR=" share "/" ,name) - (string-append "-DDESKTOP_ENTRY_PATH=" share "/applications") - (string-append "-DDESKTOP_ICON_PATH=" share "/pixmaps") - (string-append "-DDESKTOP_METAINFO_PATH=" share "/metainfo"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-xdg-open-path - (lambda* (#:key inputs #:allow-other-keys) - ;; Look for xdg-open in the store. - (substitute* "src/core/web.c" - (("/usr(/bin/xdg-open)" _ bin) - (search-input-file inputs bin))))) - (add-after 'unpack 'unbundle-fonts - (lambda* (#:key inputs #:allow-other-keys) - ;; Replace bundled Roboto fonts with links to the store. - (with-directory-excursion "fonts" - (let ((roboto-dir (string-append - (assoc-ref inputs "font-google-roboto") - "/share/fonts/truetype/"))) - (for-each - (lambda (font) - (delete-file font) - (symlink (string-append roboto-dir font) font)) - '("Roboto-Black.ttf" "Roboto-Bold.ttf" "Roboto-Medium.ttf"))) - #t)))))) + (list #:tests? #f ; there are no tests + #:configure-flags + #~(list (string-append "-DCMAKE_INSTALL_PREFIX=" #$output) + (string-append "-DGAME_BINDIR=" #$output "/bin") ; not games + (string-append "-DGAME_DATADIR=" #$output "/share/" #$name) + (string-append "-DDESKTOP_ENTRY_PATH=" #$output "/share/applications") + (string-append "-DDESKTOP_ICON_PATH=" #$output "/share/pixmaps") + (string-append "-DDESKTOP_METAINFO_PATH=" #$output "/share/metainfo")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-xdg-open-path + (lambda* (#:key inputs #:allow-other-keys) + ;; Look for xdg-open in the store. + (substitute* "src/core/web.c" + (("/usr/(bin/xdg-open)" _ bin) + (search-input-file inputs bin))))) + (add-after 'unpack 'unbundle-fonts + (lambda* (#:key inputs #:allow-other-keys) + ;; Replace bundled fonts with links to the store. + (with-directory-excursion "fonts" + (for-each (lambda (font) + (let ((file (string-append "share/fonts/truetype/" + font))) + (delete-file font) + (symlink (search-input-file inputs file) font))) + '("Roboto-Black.ttf" + "Roboto-Bold.ttf" + "Roboto-Medium.ttf")))))))) (inputs (list allegro font-google-roboto surgescript xdg-utils)) (home-page "https://opensurge2d.org")