From patchwork Thu Apr 27 17:38:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49597 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 91B6327BBE9; Thu, 27 Apr 2023 18:40:17 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 3C2A927BBE2 for ; Thu, 27 Apr 2023 18:40:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps5bD-0006QO-OM; Thu, 27 Apr 2023 13:40:07 -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 1ps5b9-0006Q6-4r for guix-patches@gnu.org; Thu, 27 Apr 2023 13:40:03 -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 1ps5b7-0002yO-W6 for guix-patches@gnu.org; Thu, 27 Apr 2023 13:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ps5b7-0004xX-IP for guix-patches@gnu.org; Thu, 27 Apr 2023 13:40:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63126] [PATCH 1/2] gnu: recastnavigation: Update to commit 6d1f971. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Apr 2023 17:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63126 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63126@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 63126-submit@debbugs.gnu.org id=B63126.168261714218971 (code B ref 63126); Thu, 27 Apr 2023 17:40:01 +0000 Received: (at 63126) by debbugs.gnu.org; 27 Apr 2023 17:39:02 +0000 Received: from localhost ([127.0.0.1]:59737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps5aA-0004vl-AX for submit@debbugs.gnu.org; Thu, 27 Apr 2023 13:39:02 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:22923) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps5a8-0004vQ-D0 for 63126@debbugs.gnu.org; Thu, 27 Apr 2023 13:39:00 -0400 Date: Thu, 27 Apr 2023 17:38:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682617134; x=1682876334; bh=7EqLYV1IBc+jXJPfuOFvVD1zDBRrSsFuZwZM1GHdK/s=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=j/I4SG9rjrgN3BqkksyIvVfLCav8AszReowJiE8PIQQWNS/yXJrLIzrao+UnmWgk7 7ye3EzbKl96nksnyEiYQ+kK2H/6DljM/FgPE8ji/6LPQzJ3t15qwuw5DhqwFAhVJAX mkq21KB6K4h64MR3rMr72i4LCqjSgK2MSzaesJyiBGmRciYjscTxdaXdweg7dGVfsM CRXC+En3c8AJIjkqnsTCg7uW5SkHCjfPman1KIKpwnvfTFFNtxRj6MmoBiMWTZEYEF KIfpL/7/WOopl+cOv0SkBGGXNlQVw7GFkFoA7N/VGO3xdrJdcgVEsLch4iYVJUSpdH xPUbQQW31v4MQ== Message-ID: <8ac77bf58b6dfa95626b21010f89a2505e9e5411.1682611459.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton 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: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata 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/game-development.scm (recastnavigation): Update to commit 6d1f971. --- gnu/packages/game-development.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.39.2 diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 844ce935ae..a3a331c290 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2803,8 +2803,8 @@ (define-public tesseract-engine (define-public recastnavigation ;; We follow master since there hasn't been a release since 1.5.1 in 2016. - (let ((commit "c5cbd53024c8a9d8d097a4371215e3342d2fdc87") - (revision "1")) + (let ((commit "6d1f9711b3b71f28c2c1c0742d76e0ef8766cf91") + (revision "2")) (package (name "recastnavigation") (version (git-version "1.5.1" revision commit)) @@ -2816,7 +2816,7 @@ (define-public recastnavigation (file-name (git-file-name name version)) (sha256 (base32 - "034bm47gc3r285w1pnvkhmm74zz99d204b1r865gisaiq4qfbza0")))) + "0cqp0sbm0ixqnxqz6gf2gybh5l4az91mdsd8b5bgxs1wpl2jmnga")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" From patchwork Thu Apr 27 17:38:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49598 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 8281227BBE9; Thu, 27 Apr 2023 18:40:35 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 6292227BBE2 for ; Thu, 27 Apr 2023 18:40:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps5bA-0006QM-9H; Thu, 27 Apr 2023 13:40:04 -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 1ps5b9-0006Q4-4J for guix-patches@gnu.org; Thu, 27 Apr 2023 13:40:03 -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 1ps5b8-0002z3-5V for guix-patches@gnu.org; Thu, 27 Apr 2023 13:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ps5b8-0004xf-0u for guix-patches@gnu.org; Thu, 27 Apr 2023 13:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63126] [PATCH 2/2] gnu: openmw: Fix build on glibc 2.34 and newer. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Apr 2023 17:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63126 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63126@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 63126-submit@debbugs.gnu.org id=B63126.168261714918990 (code B ref 63126); Thu, 27 Apr 2023 17:40:01 +0000 Received: (at 63126) by debbugs.gnu.org; 27 Apr 2023 17:39:09 +0000 Received: from localhost ([127.0.0.1]:59741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps5aG-0004wE-J4 for submit@debbugs.gnu.org; Thu, 27 Apr 2023 13:39:08 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:30789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps5aD-0004vX-Ve for 63126@debbugs.gnu.org; Thu, 27 Apr 2023 13:39:06 -0400 Date: Thu, 27 Apr 2023 17:38:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682617140; x=1682876340; bh=A/ZwrgK55mI45VI3kePB9cGkT4gBdUZijE2HZA+nBBE=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Z93pbTofKAZCgI37cp6SuQJxM5O73Byh0WlXo05Dc0WJlDCJiN6Oj20XQgTc8cNZn agflWSASYxwMnxDg4ozohwyf0PMaPMcoCN3TsROtJQILhj068tN+abwIT9eafXBG7n RJzy+z67BN1vhq1wxQWuxsmDA0SaxfDymZ08g6caOkVDwf7pB52M/xGhr1OeNyMo7i 2A5DPJPU4bwwXgFKblHfzlTZR9eDqxrLvRFKD6v9bzNkM4GhRk+sPaNJJPEvTh0CDq VjgKSs4BOS2A7JEooSCNmeeN62eiTiGNy3AhLlCOQvk+Nnu4BtwP9F0I/3rW01ZxeM rEEQvXrvY73Pg== Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton 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: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata 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/patches/openmw-assume-nonconst-SIGSTKSZ.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/game-development.scm (openmw)[source]: Use it here. --- gnu/local.mk | 1 + gnu/packages/game-development.scm | 3 +- .../openmw-assume-nonconst-SIGSTKSZ.patch | 39 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch -- 2.39.2 diff --git a/gnu/local.mk b/gnu/local.mk index c0a5c721fc..448c9d8139 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1640,6 +1640,7 @@ dist_patch_DATA = \ %D%/packages/patches/openjdk-10-setsignalhandler.patch \ %D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ + %D%/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openssh-trust-guix-store-directory.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index a3a331c290..c22b33e177 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1775,7 +1775,8 @@ (define-public openmw (file-name (git-file-name name version)) (sha256 (base32 - "19mcbnjl4279qalb97msf965bjax48mx1r1qczyvwhn28h6n3bsy")))) + "19mcbnjl4279qalb97msf965bjax48mx1r1qczyvwhn28h6n3bsy")) + (patches (search-patches "openmw-assume-nonconst-SIGSTKSZ.patch")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target diff --git a/gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch b/gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch new file mode 100644 index 0000000000..ff0080e28a --- /dev/null +++ b/gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch @@ -0,0 +1,39 @@ +From 98a7d90ee258ceef9c70b0b2955d0458ec46f048 Mon Sep 17 00:00:00 2001 +From: elsid +Date: Fri, 24 Sep 2021 19:40:29 +0200 +Subject: [PATCH] Assume SIGSTKSZ is not a constant + +SIGSTKSZ is not defined as constant since glibc 2.34: +https://sourceware.org/git/?p=glibc.git;a=commit;h=6c57d320484988e87e446e2e60ce42816bf51d53 +--- + components/crashcatcher/crashcatcher.cpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp +index 86571e1e3a..c828e1ca81 100644 +--- a/components/crashcatcher/crashcatcher.cpp ++++ b/components/crashcatcher/crashcatcher.cpp +@@ -56,8 +56,6 @@ static const char exec_err[] = "!!! Failed to exec debug process\n"; + + static char argv0[PATH_MAX]; + +-static char altstack[SIGSTKSZ]; +- + + static struct { + int signum; +@@ -475,9 +473,10 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig + + /* Set an alternate signal stack so SIGSEGVs caused by stack overflows + * still run */ ++ static char* altstack = new char [SIGSTKSZ]; + altss.ss_sp = altstack; + altss.ss_flags = 0; +- altss.ss_size = sizeof(altstack); ++ altss.ss_size = SIGSTKSZ; + sigaltstack(&altss, nullptr); + + memset(&sa, 0, sizeof(sa)); +-- +GitLab +