From patchwork Sun Aug 11 05:16:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 66937 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 0642A27BBEA; Sun, 11 Aug 2024 06:17:39 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 4E80927BBE2 for ; Sun, 11 Aug 2024 06:17:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sd0xR-0003I9-Ft; Sun, 11 Aug 2024 01:17:33 -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 1sd0xQ-0003GC-GJ for guix-patches@gnu.org; Sun, 11 Aug 2024 01:17:32 -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 1sd0xQ-0006Gn-0n for guix-patches@gnu.org; Sun, 11 Aug 2024 01:17:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:MIME-Version:Date:To:In-Reply-To:References:Subject; bh=rtdBQBle+wlIPZsUSUgRy8Mj60riHlgUTVlgGlEY7/Y=; b=EelySIky4mV+LA2IoFx9SZdD1qNSTa/piQph+lZOh2WIrI7umXmnrUD1tw+NNgJ1CqETPV5haWO6ABIVsqJ0Bm/hOuiVtfzD3jzv2UI/t+eTc3ZNU+KNWangcw4U+7gMXYBX0nLgp3zIisPFr7/ohzAM6/6DED38iHZsgoXCZN5V/mAY1gr0maQa+W9cXD17Vb/6INgCM/jt6oRR4rJPI46mVOw343/BUQcevnBqyk3OkskszTAAPcNDINu71lH7mj3wkSG7lIfFZ2d/FdcX3pp/G2yKXq2MR9BJhNikzY1elPtKSD0cIk4UjpuerIe1nqT7B00t9c5Ze4DMEBWTJA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sd0xu-0007t9-5u for guix-patches@gnu.org; Sun, 11 Aug 2024 01:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72569] [PATCH 1/4] gnu: Add backward-cpp. References: <59b04394-4737-6da3-cf9e-3f181431afa8@disroot.org> In-Reply-To: <59b04394-4737-6da3-cf9e-3f181431afa8@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Aug 2024 05:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72569 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72569@debbugs.gnu.org Received: via spool by 72569-submit@debbugs.gnu.org id=B72569.172335342230242 (code B ref 72569); Sun, 11 Aug 2024 05:18:02 +0000 Received: (at 72569) by debbugs.gnu.org; 11 Aug 2024 05:17:02 +0000 Received: from localhost ([127.0.0.1]:40568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd0wv-0007ra-KV for submit@debbugs.gnu.org; Sun, 11 Aug 2024 01:17:01 -0400 Received: from layka.disroot.org ([178.21.23.139]:55544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd0wu-0007rP-K6 for 72569@debbugs.gnu.org; Sun, 11 Aug 2024 01:17:01 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5183D42E72 for <72569@debbugs.gnu.org>; Sun, 11 Aug 2024 07:16:29 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SF-aUUdjAB4w for <72569@debbugs.gnu.org>; Sun, 11 Aug 2024 07:16:28 +0200 (CEST) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1723353388; bh=FIVgm+tsGD52Dy4Z/Xkgoa/vSZOkHPuVYPgMaFJmgtk=; h=Date:To:From:Subject; b=i3Ik9rJmTOIPgTyOhvmmmIuZ8JXT4xjEK26cmBEOTtMghVkzMNn1xn7mfO5yiSVuY fpSFRCWk5747QryywPpc9JpoTkovPR8qWsIExrJfI3F3ZioZRB5uaiOeBvX/CnmQOJ YK74Zohwo9HkVqtmLUTFLJIk+cvDOmkNc0uv/AyEpweufDY0aezRfzt3SJgMPb8UgA Kxn12rywBUt0TIy/NCCqcKTVXJo/lYhmnmTLNIPg2ncJmdbOpBaGuycnT7b5Dfh/K/ 15vGmhGy6kt9BP9eFulRq3ZzhA1oWVCFPOZhyrobK/oxeuhRTKmHjiZ9XnnPa+KFt0 IDZGg+oeNpEWw== Date: Sun, 11 Aug 2024 13:16:04 +0800 MIME-Version: 1.0 Content-Language: en-US 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: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz 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 From edcd1203111fe557c22e4b9053d0dcf6cc690794 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: References: From: AwesomeAdam54321 Date: Sun, 11 Aug 2024 08:40:08 +0800 Subject: [PATCH 1/4] gnu: Add backward-cpp. * gnu/packages/debug.scm (backward-cpp): New variable. --- gnu/packages/debug.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 2cdf87e266..4e652ba94d 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -513,6 +513,32 @@ (define-public qemu-for-american-fuzzy-lop ;; Several tests fail on MIPS. (supported-systems (delete "mips64el-linux" %supported-systems)))))) +(define-public backward-cpp + (package + (name "backward-cpp") + (version "1.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bombela/backward-cpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1b2h03iwfhcsg8i4f125mlrjf8l1y7qsr2gsbkv0z03i067lykns")))) + (arguments + (list + #:configure-flags + #~(list "-DBACKWARD_SHARED=ON"))) + (build-system cmake-build-system) + (inputs + (list libiberty zlib)) + (synopsis "Stack trace pretty printer for C++") + (description + "Backward-cpp is a stack trace pretty printer for C++.") + (home-page "https://github.com/bombela/backward-cpp") + (license license:expat))) + (define-public aflplusplus (package (inherit american-fuzzy-lop) From patchwork Sun Aug 11 05:17:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 66938 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 E754827BBE9; Sun, 11 Aug 2024 06:19:02 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 8485927BBE2 for ; Sun, 11 Aug 2024 06:19:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sd0yQ-0003Px-F4; Sun, 11 Aug 2024 01:18:35 -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 1sd0yO-0003O8-2n for guix-patches@gnu.org; Sun, 11 Aug 2024 01:18:32 -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 1sd0yN-0006Jh-QB for guix-patches@gnu.org; Sun, 11 Aug 2024 01:18:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:MIME-Version:Date:To:In-Reply-To:References:Subject; bh=RYEmNuJwFza6O6ET7mWBChoAHRLihjKqKd/C9kTVLiM=; b=PcWtha1L0VuBbR8fIOEnEB4a3VNc8y9qzxq0XSzE10gWVazbnHrcfu47qayQd7KdN4ucGvAiieUtKE/pTiqTkz9cezfCXsfi50MTxqhqCGg5ZefNCwHgHggWcjViifHKBgbi89cn7VxOd6kWAVBnIt3nSQUpPActOGiCsPcPvWHLo39fP0X64vpZXZAe6CJradxPO9mIC1oT+XTgrLIXivkI/LmOgc2z/zL55Wdo4CQTIjyesNaBUDXXWnF1TokX6vEtP1BPeDvZsBM1oHvQzFOCfrHTWbhynjrvz655MgJ42tuI/bF2C/kTg6A9PrY7Kl8TDp9EOsxc9X01API7nw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sd0yr-0007um-MI for guix-patches@gnu.org; Sun, 11 Aug 2024 01:19:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72569] [PATCH 2/4] gnu: Add sort-h. References: <59b04394-4737-6da3-cf9e-3f181431afa8@disroot.org> In-Reply-To: <59b04394-4737-6da3-cf9e-3f181431afa8@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Aug 2024 05:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72569 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72569@debbugs.gnu.org Received: via spool by 72569-submit@debbugs.gnu.org id=B72569.172335349630370 (code B ref 72569); Sun, 11 Aug 2024 05:19:01 +0000 Received: (at 72569) by debbugs.gnu.org; 11 Aug 2024 05:18:16 +0000 Received: from localhost ([127.0.0.1]:40572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd0y8-0007tl-31 for submit@debbugs.gnu.org; Sun, 11 Aug 2024 01:18:16 -0400 Received: from layka.disroot.org ([178.21.23.139]:46134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd0y6-0007te-Pt for 72569@debbugs.gnu.org; Sun, 11 Aug 2024 01:18:15 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 19A6441A31 for <72569@debbugs.gnu.org>; Sun, 11 Aug 2024 07:17:44 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ohVLcSd8Ubxf for <72569@debbugs.gnu.org>; Sun, 11 Aug 2024 07:17:42 +0200 (CEST) Message-ID: <21cba819-e142-80aa-43d2-60e27178aa95@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1723353461; bh=DLhysqaf9GJzY7YpXClESxB8yYwOXz1aqWTMdGATpIk=; h=Date:To:From:Subject; b=IF9VA4AboMObfb3ZqBlwKj8k9CcS2Uq+nNvIGo5n5U8Tb8seSCvdmy7iJ4SL50myv LkUliZIAGPXXPZcq/yNk7zlgioorjoY5LfK+I8nii9iIF5oCGeP5xZSxgHISx3BrIQ g0OFlfoQXE0AAJBo8yG+5xEpnRkdJ/NP+83wCVnUYMdo+jeewzhAlrYwAEnAj7Eyo4 qnkBQepxNeGQ2hMUIeQhEkzXUsf8pmixi7MFvZxvtpsciUu6iLlnUudm4nY/A3rxm4 77uTreLT8G8jDOzNwOQPhCqPOGTx/bUMqfbefsrBmwhA/inbQS3+ZMsqDwjcwO2VUf OUIdlTrTVWaSg== Date: Sun, 11 Aug 2024 13:17:18 +0800 MIME-Version: 1.0 Content-Language: en-US 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: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz 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 From 0af97f6bab6c523903c075b2578245fc280e6613 Mon Sep 17 00:00:00 2001 Message-ID: <0af97f6bab6c523903c075b2578245fc280e6613.1723353069.git.adam.faiz@disroot.org> In-Reply-To: References: From: AwesomeAdam54321 Date: Sun, 11 Aug 2024 08:41:05 +0800 Subject: [PATCH 2/4] gnu: Add sort-h. * gnu/packages/c.scm (sort-h): New variable. --- gnu/packages/c.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index a7ac359a94..0b0ff35459 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -695,6 +695,51 @@ (define-public sfsexp expressions.") (license license:lgpl2.1+))) +(define-public sort-h + ;; The latest commit is used as there is no release. + (let ((commit "24f5b8b13810ad130109c7b56daf8e99ab0fe1b8") + (revision "0")) + (package + (name "sort-h") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/swenson/sort") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q3pgw51rjq7pb6gc7zx9i48pckyl930lcab4ngxrpa5a8flq850")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "Makefile" + (("^demo:" all) + (string-append + "install:\n\t" + "install -d $(DESTDIR)$(PREFIX)/include\n\t" + "install sort.h $(DESTDIR)$(PREFIX)/include\n\t" + "install sort_extra.h $(DESTDIR)$(PREFIX)/include\n\n" + all))))))) + (build-system gnu-build-system) + (arguments + (list + #:make-flags + #~(list + (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (delete 'build)))) + (home-page "https://github.com/swenson/sort") + (synopsis "C implementation of many sorting algorithms") + (description "@code{sort.h} is an implementation of a ton of sorting +algorithms in C with a user-defined type that is provided at include time.") + (license license:expat)))) + (define-public sparse (package (name "sparse") From patchwork Sun Aug 11 05:18:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 66939 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 A8A5727BBEA; Sun, 11 Aug 2024 06:19:51 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 6689D27BBE2 for ; Sun, 11 Aug 2024 06:19:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sd0zc-00040h-M0; Sun, 11 Aug 2024 01:19:48 -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 1sd0zM-0003wg-Qs for guix-patches@gnu.org; Sun, 11 Aug 2024 01:19:34 -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 1sd0zM-0006MY-4U for guix-patches@gnu.org; Sun, 11 Aug 2024 01:19:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:MIME-Version:Date:To:In-Reply-To:References:Subject; bh=6bu7q45LxtSk+cN0EZxaldcKIvppBH9JXw1fsqtBziE=; b=slsvsGEcBhrVx+NUeaPR6sHtM+ohbGdDMSZ42QR0sMkupTtZhgXW57ngHebBw6Shmn3Z7/y5sbWmPFLTCYXQtNZI6oXUYekbFqEebootGhRwwQU2HpdiqS2suV6MIxoAt8LKA/3/1DUPWqLrYjazGTofyAy36IiiZQqzYnChg5kWDvtnhH/n/eU0XqBnE7yU3wwG09v9FUDRx1GpxeR3ZXDa5PHILadXt7iSHhq+x2xRz/3mTvx+XuUTz0Cd7nfO2EkljdesNXPrsX8V7BhxA7FnZnVBNJS0QytxiJwdWCUoMDp+DB2fAdt2mIwtX95nboaNxIJ5dB+ard9k7psTcg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sd0zq-0007wd-B3 for guix-patches@gnu.org; Sun, 11 Aug 2024 01:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72569] [PATCH 3/4] gnu: openclonk: Fix build. References: <59b04394-4737-6da3-cf9e-3f181431afa8@disroot.org> In-Reply-To: <59b04394-4737-6da3-cf9e-3f181431afa8@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Aug 2024 05:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72569 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72569@debbugs.gnu.org Received: via spool by 72569-submit@debbugs.gnu.org id=B72569.172335358930508 (code B ref 72569); Sun, 11 Aug 2024 05:20:02 +0000 Received: (at 72569) by debbugs.gnu.org; 11 Aug 2024 05:19:49 +0000 Received: from localhost ([127.0.0.1]:40576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd0zc-0007vz-Ic for submit@debbugs.gnu.org; Sun, 11 Aug 2024 01:19:48 -0400 Received: from layka.disroot.org ([178.21.23.139]:57176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd0zZ-0007vq-Uj for 72569@debbugs.gnu.org; Sun, 11 Aug 2024 01:19:46 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 39E0D41C96 for <72569@debbugs.gnu.org>; Sun, 11 Aug 2024 07:19:15 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dfEb_XWCbK5h for <72569@debbugs.gnu.org>; Sun, 11 Aug 2024 07:19:14 +0200 (CEST) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1723353553; bh=dr7IZfYq+dpXYjIU8c3X5rXzbhouA7xzo/1ELyKISJE=; h=Date:To:From:Subject; b=JmXjO/4BSAIGFkFl7gy1SsEK3JHlrXNeo5AZAmtl+O0wYg4KcP3rM1tv3xisRLDWI ySjnzKHm2adq+J1LnVT1bMWaBD1EKmTzbpfQPBV9zhwWhvA/Dy5hI0w39JPMt4ac8j Sp+Xgm0LrjoYvGE9reogW4QiynlsI2QRJl6y93woS1hP4BAvakXDWwZP+MjkwPJw33 kWybVbsDOLyFsmmgINZts5KJNL0dn9I31rm0U1vliRDgP+4diGZsMJAStI3BuyuAkK OKFwZzdR6j2bfScj3999Q9mNHk3SMRZIVq5W1HbP/3Iua0CasFbD80JTFKJDVwwOXt m5ZHSQ/VskVcA== Date: Sun, 11 Aug 2024 13:18:47 +0800 MIME-Version: 1.0 Content-Language: en-US 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: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz 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 From 628f6a299da5035b5c3b3724e78aca9bdb702ba7 Mon Sep 17 00:00:00 2001 Message-ID: <628f6a299da5035b5c3b3724e78aca9bdb702ba7.1723353069.git.adam.faiz@disroot.org> In-Reply-To: References: From: AwesomeAdam54321 Date: Sun, 11 Aug 2024 09:25:30 +0800 Subject: [PATCH 3/4] gnu: openclonk: Fix build. * gnu/packages/games.scm (openclonk): Fix build. [source]: Unbundle dependencies and include the header where necessary to fix the build. [arguments]<#:phases>: Remove workarounds for bundled backward-cpp. [inputs]: Remove dependencies for bundled backward-cpp. Add libb2, pcg-cpp, and sort-h. --- gnu/packages/games.scm | 60 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9ad6eabad2..504dfe74de 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -123,6 +123,7 @@ (define-module (gnu packages games) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages c) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -9622,7 +9623,32 @@ (define-public openclonk "openclonk-" version "-src.tar.bz2")) (sha256 (base32 - "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik")))) + "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik")) + (modules '((guix build utils))) + (snippet + #~(begin + (delete-file-recursively "thirdparty") + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(thirdparty/.*\\)") "") + (("set_property\\(.*Third-party.*\\)") "") + (("blake2") "b2") + (("thirdparty/timsort/sort\\.h") "") + (("thirdparty/pcg/.*\\.hpp") "")) + (substitute* '("src/lib/C4Random.cpp" + "src/landscape/C4Particles.h") + (("#include ") + "#include ")) + (substitute* "src/script/C4ScriptLibraries.cpp" + (("blake2b.hash_output.get.., raw_output_length, data, data_length, nullptr, 0.") + "blake2b(hash_output.get(), (const void*)raw_output_length, data, data_length, (size_t)(0), 0)")) + (substitute* '("src/script/C4AulParse.cpp" + "src/editor/C4EditCursor.cpp" + "src/gui/C4ScriptGuiWindow.cpp") + (("#include .C4Include\\.h." all) + (string-append "#include \n" all))) + (substitute* "src/lib/StdMesh.cpp" + (("#include .timsort/sort\\.h.") + "#include ")))))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DAudio_TK=OpenAL") @@ -9641,30 +9667,7 @@ (define-public openclonk (("PATH_SUFFIXES \"src\" \"gtest\"") "PATH_SUFFIXES \"src\"")) #t)) - (add-after 'unpack 'adjust-backward-cpp-includes - (lambda _ - ;; XXX: The bundled backward-cpp exports a CMake "interface" - ;; that includes external libraries such as libdl from glibc. - ;; By default, CMake interface includes are treated as "system - ;; headers", and GCC behaves poorly when glibc is passed as a - ;; system header (causing #include_next failures). - - ;; Here we prevent targets that consume the Backward::Backward - ;; interface from treating it as "system includes". - (substitute* "CMakeLists.txt" - (("target_link_libraries\\((.+) Backward::Backward\\)" all target) - (string-append "set_property(TARGET " target " PROPERTY " - "NO_SYSTEM_FROM_IMPORTED true)\n" - all))) - #t)) - (add-after 'unpack 'add-libiberty - ;; Build fails upon linking executables without this. - (lambda _ - (substitute* "thirdparty/backward-cpp/BackwardConfig.cmake" - (("set\\(LIBBFD_LIBRARIES (.*?)\\)" _ libraries) - (string-append "set(LIBBFD_LIBRARIES " libraries " iberty)"))) - #t)) - (add-after 'add-libiberty 'lax-freealut-requirement + (add-after 'prepare-gmock 'lax-freealut-requirement ;; TODO: We provide freealut 1.1.0, but pkg-config somehow detects ;; it as 1.0.1. Force minimal version. (lambda _ @@ -9689,7 +9692,7 @@ (define-public openclonk `(("freealut" ,freealut) ("freetype" ,freetype) ("glew" ,glew) - ("libiberty" ,libiberty) + ("libb2" ,libb2) ("libjpeg" ,libjpeg-turbo) ("libogg" ,libogg) ("libpng" ,libpng) @@ -9698,11 +9701,12 @@ (define-public openclonk ("mesa" ,mesa) ("miniupnpc" ,miniupnpc) ("openal" ,openal) + ("pcg-cpp" ,pcg-cpp) ("qtbase" ,qtbase-5) ("readline" ,readline) ("sdl" ,sdl2) - ("tinyxml" ,tinyxml) - ("zlib" ,zlib))) + ("sort-h" ,sort-h) + ("tinyxml" ,tinyxml))) (home-page "https://www.openclonk.org/") (synopsis "Multiplayer action game where you control small and nimble humanoids") From patchwork Sun Aug 11 05:20:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 66940 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 EDB4827BBEA; Sun, 11 Aug 2024 06:21:37 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 7088E27BBE2 for ; Sun, 11 Aug 2024 06:21:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sd11J-0004Nu-Jg; Sun, 11 Aug 2024 01:21:33 -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 1sd11I-0004M7-7l for guix-patches@gnu.org; Sun, 11 Aug 2024 01:21:32 -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 1sd11H-0006fU-Js for guix-patches@gnu.org; Sun, 11 Aug 2024 01:21:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:MIME-Version:Date:To:In-Reply-To:References:Subject; bh=/pyChboce8rPD4UbtNvHJX+VB2+RifaL7IxD8KnPRK4=; b=fTE4jf8g6wMxDApXAc77syZMzEnPoQs7/VDuzOabCf2xsOd6ZTrKZCRgdpEKIOEjq6c6OM1qJOqmmcx6dJKwVfo0O0nrPSI9+pdcsSMOOkbG+SL0LJMHIuFunO4LFFWyEMqaNMkkbwQaocT5llplZ8FfVjta2+2MAUneq5URJ3oFymoPRRixxXuAZYYg+6AS4tjNb+SsJdYv8ylYYNiyosS/oJjjEy4nE4PeATBc5kefrCLx+FfuxxvS+aLqsLO7O0qLeeMmQJzchRpoT+sdBGpFsIW5zjLxKjkEQ17zgNTHa72Vc5Y2wwUEu872UnfqrqduQUiRQoVOz0RRwUEJfA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sd11l-00080K-O7 for guix-patches@gnu.org; Sun, 11 Aug 2024 01:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72569] [PATCH 4/4] gnu: openclonk: Use gexps and new input style. References: <59b04394-4737-6da3-cf9e-3f181431afa8@disroot.org> In-Reply-To: <59b04394-4737-6da3-cf9e-3f181431afa8@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Aug 2024 05:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72569 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72569@debbugs.gnu.org Received: via spool by 72569-submit@debbugs.gnu.org id=B72569.172335367230680 (code B ref 72569); Sun, 11 Aug 2024 05:22:01 +0000 Received: (at 72569) by debbugs.gnu.org; 11 Aug 2024 05:21:12 +0000 Received: from localhost ([127.0.0.1]:40580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd10y-0007yl-54 for submit@debbugs.gnu.org; Sun, 11 Aug 2024 01:21:12 -0400 Received: from layka.disroot.org ([178.21.23.139]:43146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd10w-0007yd-7B for 72569@debbugs.gnu.org; Sun, 11 Aug 2024 01:21:10 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6940F41ABE for <72569@debbugs.gnu.org>; Sun, 11 Aug 2024 07:20:39 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7rd-m5YpYYHY for <72569@debbugs.gnu.org>; Sun, 11 Aug 2024 07:20:38 +0200 (CEST) Message-ID: <0b7c8992-c811-a2bb-9229-52c50698b925@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1723353638; bh=M0yUfSfuRE+71QPNT/sd+PMaf2p4eSc2tyVn8ZBXblE=; h=Date:To:From:Subject; b=QSyKLOlNqvoEej3a0wnXbgJ/y+S4Sd8UQvpgADlL93LjRb0m6/8McQnhOu0wNfY/G AOjFd5AOeUVTmGSIM4U4MiOKJrqQ+N3Fqpnx+EFIL+9+ipXDhUgZI7h/RvrJgfxCFN YfXsmyOCnhYmEt+SWLiUptXAjUvBYU6PW7HilikThDJum9VuIKd0KQA2la1gf6RogO s7zqf/nW8Y1LJb7oRFb6N5yMmWFJ8JI6XSEeK1LcWR7fmiv8Ufpo72lI4cbBVecpx7 o+w9K2Cj9I+MZX7Wd+UBJPreRlQCQ9lLDkSalGRp1Wglk9pxiiIm1FsbGmQh1381cl 2ZCoynIRrB8eQ== Date: Sun, 11 Aug 2024 13:20:14 +0800 MIME-Version: 1.0 Content-Language: en-US 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: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz 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 From 6059afbbe3f6a841021193775c1bf1d317dafefe Mon Sep 17 00:00:00 2001 Message-ID: <6059afbbe3f6a841021193775c1bf1d317dafefe.1723353069.git.adam.faiz@disroot.org> In-Reply-To: References: From: AwesomeAdam54321 Date: Sun, 11 Aug 2024 12:50:34 +0800 Subject: [PATCH 4/4] gnu: openclonk: Use gexps and new input style. * gnu/packages/games.scm (openclonk)[arguments]: Use gexps. [source]: Reindent. [native-inputs]: Drop labels. [inputs]: Drop labels. --- gnu/packages/games.scm | 177 +++++++++++++++++++++-------------------- 1 file changed, 90 insertions(+), 87 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 504dfe74de..d8e7dc88fa 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9616,97 +9616,100 @@ (define-public openclonk (package (name "openclonk") (version "8.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://www.openclonk.org/builds/release/" version "/" - "openclonk-" version "-src.tar.bz2")) - (sha256 - (base32 - "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik")) - (modules '((guix build utils))) - (snippet - #~(begin - (delete-file-recursively "thirdparty") - (substitute* "CMakeLists.txt" - (("add_subdirectory\\(thirdparty/.*\\)") "") - (("set_property\\(.*Third-party.*\\)") "") - (("blake2") "b2") - (("thirdparty/timsort/sort\\.h") "") - (("thirdparty/pcg/.*\\.hpp") "")) - (substitute* '("src/lib/C4Random.cpp" - "src/landscape/C4Particles.h") - (("#include ") - "#include ")) - (substitute* "src/script/C4ScriptLibraries.cpp" - (("blake2b.hash_output.get.., raw_output_length, data, data_length, nullptr, 0.") - "blake2b(hash_output.get(), (const void*)raw_output_length, data, data_length, (size_t)(0), 0)")) - (substitute* '("src/script/C4AulParse.cpp" - "src/editor/C4EditCursor.cpp" - "src/gui/C4ScriptGuiWindow.cpp") - (("#include .C4Include\\.h." all) - (string-append "#include \n" all))) - (substitute* "src/lib/StdMesh.cpp" - (("#include .timsort/sort\\.h.") - "#include ")))))) + (source + (origin + (method url-fetch) + (uri (string-append + "https://www.openclonk.org/builds/release/" version "/" + "openclonk-" version "-src.tar.bz2")) + (sha256 + (base32 + "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik")) + (modules '((guix build utils))) + (snippet + #~(begin + (delete-file-recursively "thirdparty") + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(thirdparty/.*\\)") "") + (("set_property\\(.*Third-party.*\\)") "") + (("blake2") "b2") + (("thirdparty/timsort/sort\\.h") "") + (("thirdparty/pcg/.*\\.hpp") "")) + (substitute* '("src/lib/C4Random.cpp" + "src/landscape/C4Particles.h") + (("#include ") + "#include ")) + (substitute* "src/script/C4ScriptLibraries.cpp" + (("blake2b.hash_output.get.., raw_output_length, data, data_length, nullptr, 0.") + "blake2b(hash_output.get(), (const void*)raw_output_length, data, data_length, (size_t)(0), 0)")) + (substitute* '("src/script/C4AulParse.cpp" + "src/editor/C4EditCursor.cpp" + "src/gui/C4ScriptGuiWindow.cpp") + (("#include .C4Include\\.h." all) + (string-append "#include \n" all))) + (substitute* "src/lib/StdMesh.cpp" + (("#include .timsort/sort\\.h.") + "#include ")))))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DAudio_TK=OpenAL") - #:test-target "tests" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'prepare-gmock - (lambda* (#:key inputs #:allow-other-keys) - (mkdir "gmock") - (copy-recursively (assoc-ref inputs "googlemock") "gmock") - (substitute* "tests/CMakeLists.txt" - (("/usr/src/gmock") - (string-append (getcwd) "/gmock/googlemock")) - (("/usr/src/gtest") - (string-append (getcwd) "/gmock/googletest")) - (("PATH_SUFFIXES \"src\" \"gtest\"") - "PATH_SUFFIXES \"src\"")) - #t)) - (add-after 'prepare-gmock 'lax-freealut-requirement - ;; TODO: We provide freealut 1.1.0, but pkg-config somehow detects - ;; it as 1.0.1. Force minimal version. - (lambda _ - (substitute* "cmake/FindAudio.cmake" - (("freealut>=1.1.0") "freealut>=1.0.1")) - #t)) - (add-after 'lax-freealut-requirement 'fix-directories - ;; Prefer "$out/share/openclonk" over - ;; "$out/share/games/openclonk". Also install "openclonk" - ;; binary in "bin/", not "games/". - (lambda _ - (substitute* "CMakeLists.txt" - (("share/games/openclonk") "share/openclonk") - (("TARGETS openclonk DESTINATION games") - "TARGETS openclonk DESTINATION bin")) - #t))))) + (list + #:configure-flags + #~(list "-DAudio_TK=OpenAL") + #:test-target "tests" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-gmock + (lambda* (#:key inputs #:allow-other-keys) + (let ((gmock (search-input-directory inputs "/googlemock")) + (gtest (search-input-directory inputs "/googletest"))) + (mkdir "gmock") + (copy-recursively gmock "gmock/googlemock") + (copy-recursively gtest "gmock/googletest") + (substitute* "tests/CMakeLists.txt" + (("/usr/src/gmock") + (string-append (getcwd) "/gmock/googlemock")) + (("/usr/src/gtest") + (string-append (getcwd) "/gmock/googletest")) + (("PATH_SUFFIXES \"src\" \"gtest\"") + "PATH_SUFFIXES \"src\""))))) + (add-after 'prepare-gmock 'lax-freealut-requirement + ;; TODO: We provide freealut 1.1.0, but pkg-config somehow detects + ;; it as 1.0.1. Force minimal version. + (lambda _ + (substitute* "cmake/FindAudio.cmake" + (("freealut>=1.1.0") "freealut>=1.0.1")))) + (add-after 'lax-freealut-requirement 'fix-directories + ;; Prefer "$out/share/openclonk" over + ;; "$out/share/games/openclonk". Also install "openclonk" + ;; binary in "bin/", not "games/". + (lambda _ + (substitute* "CMakeLists.txt" + (("share/games/openclonk") "share/openclonk") + (("TARGETS openclonk DESTINATION games") + "TARGETS openclonk DESTINATION bin"))))))) (native-inputs - `(("googlemock" ,(package-source googletest)) - ("googletest" ,googletest) - ("pkg-config" ,pkg-config))) + (list (package-source googletest) + googletest + pkg-config)) (inputs - `(("freealut" ,freealut) - ("freetype" ,freetype) - ("glew" ,glew) - ("libb2" ,libb2) - ("libjpeg" ,libjpeg-turbo) - ("libogg" ,libogg) - ("libpng" ,libpng) - ("libvorbis" ,libvorbis) - ("libxrandr" ,libxrandr) - ("mesa" ,mesa) - ("miniupnpc" ,miniupnpc) - ("openal" ,openal) - ("pcg-cpp" ,pcg-cpp) - ("qtbase" ,qtbase-5) - ("readline" ,readline) - ("sdl" ,sdl2) - ("sort-h" ,sort-h) - ("tinyxml" ,tinyxml))) + (list freealut + freetype + glew + libb2 + libjpeg-turbo + libogg + libpng + libvorbis + libxrandr + mesa + miniupnpc + openal + pcg-cpp + qtbase-5 + readline + sdl2 + sort-h + tinyxml)) (home-page "https://www.openclonk.org/") (synopsis "Multiplayer action game where you control small and nimble humanoids")