From patchwork Mon Aug 26 22:01:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Sergio_Pastor_P=C3=A9rez?= X-Patchwork-Id: 30362 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 B118627BBE9; Mon, 26 Aug 2024 23:06:18 +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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,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 C5E9927BBE2 for ; Mon, 26 Aug 2024 23:06:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sihpz-00081F-TD; Mon, 26 Aug 2024 18:05:23 -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 1sihpp-0007zr-CL for guix-patches@gnu.org; Mon, 26 Aug 2024 18:05:14 -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 1sihpo-0000MK-Hq for guix-patches@gnu.org; Mon, 26 Aug 2024 18:05:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=qoFaXzjvw4NQxfvZBF+hs5qf1DcWWaT+XwzfkfO86JM=; b=Pr8wjNLsSZhgGvUFqG+7nzWWVRYb6ExZwRHL1EjI/oJv+d0h/aQjqCvgOt93q4+1daL1rN7mWVrk8HPeQ9HxdoEWKempN4ryOdzKAAYYhOccEP7ZNB3Bz5XBOfNRRSMd3m9uMvYq+JXmyK4S4SdMuxR94CAJB5cmWvtRqNchXhTTOVuEvP/b+gZNY2rejZqlLA8W1GiBWIW6vHw/QZg4U2pooYkMlERDujqvMDl2fbtGAN8gQDskbfVTrQX4FaxAniiZvC6UaYADrFK4CdOPxb/pSBmmlXO4X6pOOvqOKEwhyGGmIaSBf477o0i7/3Ao8S2yczlGyVN58YzT8guWLQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sihqe-00032h-8O for guix-patches@gnu.org; Mon, 26 Aug 2024 18:06:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#67755] [PATCH v4 7/8] gnu: Add imhex-pattern-language. Resent-From: Sergio Pastor =?utf-8?b?UMOpcmV6?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 22:06:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67755 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67755@debbugs.gnu.org Cc: Sergio Pastor =?utf-8?b?UMOpcmV6?= Received: via spool by 67755-submit@debbugs.gnu.org id=B67755.172470990911564 (code B ref 67755); Mon, 26 Aug 2024 22:06:04 +0000 Received: (at 67755) by debbugs.gnu.org; 26 Aug 2024 22:05:09 +0000 Received: from localhost ([127.0.0.1]:45356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sihpk-00030L-K9 for submit@debbugs.gnu.org; Mon, 26 Aug 2024 18:05:09 -0400 Received: from mail-am7eur03olkn2085.outbound.protection.outlook.com ([40.92.59.85]:11584 helo=EUR03-AM7-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sihpf-0002ya-7C for 67755@debbugs.gnu.org; Mon, 26 Aug 2024 18:05:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UzNIiPtksmsF0BOz4IMneUHa0s1e/zbu/hx1jrPUDWaQZOfdnVhY2N61m3d9wD/291ruAfHBHcYVb/ezdAbsdEX1OSHR1+c5bgaDYWbr7sh1AVVsq0sfY003Q2FjLviDCkadtceRj5HnQrpKZErIG8b2dhK3TUJdU90oCbYew+o38jvx/8k6D63WTOJgfEZwEgBfTntv32yOofAA1mMea4HL9Q5u4BzH7N8K3sxh6YVJC00Q5SHON9CvdDEnT7FSEvZEViiGzh+sCHYUgSMrOxX6Tcit1Bp6Q5LKSpXS6HG6EHC7uwmsLFw3xf3h2eeWcdll0TK8dPVsz7pQEKuKOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qoFaXzjvw4NQxfvZBF+hs5qf1DcWWaT+XwzfkfO86JM=; b=UC0my7YBvO9w3XjHkg1XsIGf19D6fPHbYW8KPFayOJPY6RRVKwUFM2n7FgmncdHszCffaYDC6QCIQ/OnPdXZF4OVg4fNhn1HwAF479lCW1GkHxkLwYf1Y7s969TaXOAD/wxEvKCPFdEEO2Pp5IXvXHZ59TBYrkErIJzTtqrw19FHZrGNOGwEvxoleBS5wPxJsI5zMORDSeRS/V8vY6w793M1DrEWzXtoB/rJX3Xj75PJlKdZsbjxqZTHA6wh2fG2VP29GiF/0twpW+wVZCLW/pD+4TfOAb7cMZzmK1EWJ3cKNbqfXIl/2p5ZRSn4Ioj5hsX75hVxaNxU03juWPqqaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=OUTLOOK.ES; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qoFaXzjvw4NQxfvZBF+hs5qf1DcWWaT+XwzfkfO86JM=; b=mOeVBqBtb0L4fM6BH8Ht3pG6V4qVxfs3RXkW7HW7BbY3L0gqfhXUWbnFtHBsrrIzCz0dQboWsrj35LE1W8oDn2F9OUORsoBhExjWw86potojhPP87wYDWwkLQois3wyvGgRzpGmfWJtmyRGPJTLPW2UWR+NaM33q7fbMm3X2J/OYC8dPc/AiOYqZgS/UjI3wOxiSQ3RDhLfSJUYPTdHoJYt5mLKtvpe/thHgY451C+J5FUr7yfWTp7rZDJ9hlU07hPx99edPvcSgqU19k25BVS1YowL/VoiDnB6AaEk1OGCywgDBIY9xoUu/906E1yT/J8HAIn8giiIGiYWTXlOjUg== Received: from PAXP251MB0348.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:20b::10) by AS4P251MB0561.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:4bb::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.25; Mon, 26 Aug 2024 22:04:00 +0000 Received: from PAXP251MB0348.EURP251.PROD.OUTLOOK.COM ([fe80::1f4f:1f6b:1817:f03f]) by PAXP251MB0348.EURP251.PROD.OUTLOOK.COM ([fe80::1f4f:1f6b:1817:f03f%7]) with mapi id 15.20.7897.021; Mon, 26 Aug 2024 22:04:00 +0000 From: Sergio Pastor =?utf-8?b?UMOpcmV6?= Date: Tue, 27 Aug 2024 00:01:09 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <01e5d15a71a605dd55df3cac5b7d30e15520f8ea.1724709670.git.sergio.pastorperez@outlook.es> References: <01e5d15a71a605dd55df3cac5b7d30e15520f8ea.1724709670.git.sergio.pastorperez@outlook.es> X-TMN: [dyeajAIA2B4pA0rpbd1KrTpw8ZHgJmEU] X-ClientProxiedBy: MA3P292CA0006.ESPP292.PROD.OUTLOOK.COM (2603:10a6:250:2c::14) To PAXP251MB0348.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:20b::10) X-Microsoft-Original-Message-ID: <3330b56355a02d9b9b6e0ca8b8ecef4ec64c7afd.1724709670.git.sergio.pastorperez@outlook.es> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXP251MB0348:EE_|AS4P251MB0561:EE_ X-MS-Office365-Filtering-Correlation-Id: 890c6f80-4a59-4780-7274-08dcc61afd63 X-Microsoft-Antispam: BCL:0; ARA:14566002|15080799006|461199028|5072599009|19110799003|8060799006|1602099012|440099028|4302099013|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: VRSnJOV9nWSWPKdG60SMAdiMMjWq6mr3+XvfTCl3LhNqPFQRO9kAjA2ABQObjOUtuPSyBUOtRzQvGgpk2xvaj6ihQq6nv1yDsWqUOhGs0q3Yt4Sy2QrDG14Rd70Lu+PMMUIRlcCswUlc+qsd5tSwyUbev/w6Zy9s9FLwwTH1Pj85W9ucRRnn7HT8Qk9XEdgoD9Dlnk+c8yTbCbBgIiTZjVZnMzDUstcbKpqWt+xdyl9SE86zQaJEvQE8l2yHAJIe6npAR4FNUlB9Q2rnStrrj4NbcRS6ghpXyetRgFxWCtXlUZCD7WsNjBvJaunIF8Re1goZsbUTAXr44bMZs2AxlX/PxEnh3rCqrIRKKUbw4BktQ/fUY17AxdA/srplZgL63z2vFSuh0ya5WNbljr6nplZFPpy3aU/qzeTF3veY7q3druBRdft0JV0jvvwX6Hdfrej5JuyvVnvhObywr5eww97XHMq7osB+2yIZVQRF0JpEwMMRizv5PjZvCc34txneYa56HnIb7zkC44FqokA6sWcrsPYM2usQz2wadlpAPGBR2rOpN8VGbsa6XyKxiQQoAguHcyycyGerYxLrBPgMYJHZrU1NTP6ghYPr26+s7B96ak8/OQ5g3vc1iLhIZqhBvJ9rNdW1TkAxeCjUi+JJ3+U0t9eiUL31LaLYN+lVKpAzrfsUnBXIpzlGlfhAvtpVPLM72t7l4P27Jrbbxg479kZHTqrhasQ+wJATZK3iLNLr/A33M5BGcf8wF0fV5vEas/raps5cgkQ7n8idigFvaPTzv8huuAr6GA3ZArG9y028s9sf9R7AE08Gm5L/mXXPfMzlmGEBZpEoADxYrb9pyg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fFCWfAOKmallNexlrYeWORJZmveClZ15XFT3rMFlAwNy030mXHiSbl26qs3Bj2+AFEURq6aXEtWB/43dGvLSWMAxpbDxEPoM+GLnszfQPVfXTizQPdTHpzhD/TUwdOYsjShAOXivCIkmUhsr4j0IUuN6Nmq5uZkl+t46M8ABswhvgkOJGwv9JS7WqPIe+lG/7WnRdkiCTsypNzUTFL4fza/+DIo53gBwJYTpVdzeBeWdQm2qQYUZiG+5pBUe+I8pS9ar3MceEhK8iD6nos6lJ5Wnz7bfjcvBfHyc31g0LKwvUpiFDPDa3whiAZg3/2NmDPtgCGK1x9+ikCqb0m105UEc2yTB4smUIysrkDX9AMu2iUatnvwOfo2gx0X1oCdmPsT2lG83bD4wGCHqNdmn/BeiyJ+BlffVfQSEZ2QLyMRar3adCUP2hbTgaZzX/mgLZ1IXjctUGyWYm+fO5L0EN5TM8xCUHk2wUkKJ8550ylvaa6ufNKMhu0MUvngOtiffnT5T/ey2wJaA0ZL4Ds/S1Hjx/zfeFJdYEQ4xAvNFDuxp2gi43bUb86bTbvtJ80vIJYzAUAsihtABDvM8pexde7pw7ryQo80CEaJkJtLqxUnZzOfQcvIGiTF3WRUAFrZlILhyRXdxl58fz9kLb/290cAD6bnYdvxIBYWFYAiWpvZq+SkDPC72AM+bLSooTYbE1+dyeUX1ETO/OU+eSZVR9W3Zf1cuHudh1YUPiLTc7U9Og0tut94yyU+Yll0G7XxmC99nuOZ3wQ6f+PmT9hxcUa0SOjh9L0wPtpaCklSGQHqU7oFNS4eKcn7eyfpzEa5SGPCAjRqMszO1gXnSgyHHMAAW36CFnxMXAk5wVao1XS/NwpXqw1c5cOUsCADKXY3KACEOvf2GCl2hxyCqVL7TEVKhEpYB5OQfWwrBfBU12GSbD2gMTnyHbdTYFxQURb8wcpkBUNFU+Xel7cpP3yPehKIYpLfmNqH17f1dPHZS1H6zl+BksHaZY3w7GsEMmyMV7MaJzEb7PaoyqDcdRX1QN+mmkakyZw/5q1NN4+4itggkmqtmBTlbZQ79ppdKgr+hHPZm6dbf1DuHYmGC3NhbubKiqTk+LYtKSIn2bOnXPaVK+0QZpakh9H8YFGXrlvvRicF3NOCZutz8KmMvw4s9JDiIzgjr0SpBPRf0hhUy7+06l2gKcv0/bwQGGZY6OyFnmrnjtfqeDtucG6ciFCwKDugCMpSagSoq+AkRdsa9yZZMkVzLGfWGISEsvN5+R8pj X-OriginatorOrg: sct-15-20-7741-18-msonline-outlook-53ebb.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 890c6f80-4a59-4780-7274-08dcc61afd63 X-MS-Exchange-CrossTenant-AuthSource: PAXP251MB0348.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2024 22:04:00.4035 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4P251MB0561 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/hexedit.scm (imhex-pattern-language): New variable. Change-Id: I641bebed0bea9b2c8aca87f54d0fb457064a07d7 --- gnu/packages/hexedit.scm | 74 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm index 668699a28c..e5f58fcce0 100644 --- a/gnu/packages/hexedit.scm +++ b/gnu/packages/hexedit.scm @@ -22,15 +22,20 @@ (define-module (gnu packages hexedit) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages man) + #:use-module (gnu packages cpp) + #:use-module (gnu packages gcc) + #:use-module (gnu packages python) #:use-module (gnu packages ncurses) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake)) (define-public hexedit (package @@ -94,6 +99,73 @@ (define-public ht (home-page "https://hte.sourceforge.net/") (license license:gpl2))) +;; NOTE: `imhex-pattern-language' should improve it's build system to be used +;; easily outside of ImHex. It should update it's shared library install target +;; to deploy the header files and it should create the pertinent +;; 'libpl-config.cmake' and 'libpl-config-version.cmake' files. +(define-public imhex-pattern-language + (package + (name "imhex-pattern-language") + (version "1.35.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/WerWolv/PatternLanguage") + (commit (string-append "ImHex-v" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0riphslp3rca6z6f5zfvsisdh94apijfi03s7yap1vjnf6i93pks")) + (snippet + #~(begin + (use-modules (guix build utils)) + ;; NOTE: the `throwing-ptr' hasn't been updated in 6 years and + ;; the testsuite expects to use an outdated version of Conan, + ;; since this library if not interesting to have it in Guix + ;; it will remain bundled. + ;; NOTE: `libwolf' does not have an install target. Until the + ;; maintainers create one, it will be bundled. + (with-directory-excursion "external" + (for-each (lambda (path) + (delete-file-recursively path)) + '("nlohmann_json" "cli11"))))))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + ''("-DLIBPL_SHARED_LIBRARY=ON" + "-DLIBPL_ENABLE_TESTS=ON" + + "-DUSE_SYSTEM_NLOHMANN_JSON=ON" + "-DUSE_SYSTEM_CLI11=ON" + ;; NOTE: the `fmt' package is vendored since it needs + ;; a specific commit. Until there is a compatible + ;; release, there is no interest in creating a Guix + ;; package for it. + "-DUSE_SYSTEM_FMT=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-rel-paths + (lambda _ + (substitute* "tests/include/test_patterns/test_pattern_format.hpp" + (("../tests/files/export/") + "../source/tests/files/export/")))) + (add-after 'build 'build-tests + (lambda _ + (invoke "make" "pattern_language_tests" "plcli"))) + (add-before 'check 'plcli-integration-tests + (lambda _ + (with-directory-excursion "../source" + (invoke "python3" + "tests/integration/integration.py" + "../build/cli/plcli"))))))) + (native-inputs (list cli11 gcc-14 nlohmann-json python)) + (home-page "https://imhex.werwolv.net") + (synopsis "The Pattern Language used by the ImHex Hex Editor") + (description "The Pattern Language used by the ImHex Hex Editor.") + (license license:lgpl2.1))) + (define-public bvi (package (name "bvi")