From patchwork Sun Apr 14 02:54:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 62956 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 2F29727BBEB; Sun, 14 Apr 2024 04:03: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=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,T_PDS_PRO_TLD, URIBL_BLOCKED,URIBL_SBL_A 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 5A25E27BBE9 for ; Sun, 14 Apr 2024 04:03:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvq8t-0000Md-H3; Sat, 13 Apr 2024 23:02:55 -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 1rvq8q-0000MG-Sk for guix-patches@gnu.org; Sat, 13 Apr 2024 23:02:52 -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 1rvq8q-0003vJ-Hp for guix-patches@gnu.org; Sat, 13 Apr 2024 23:02:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rvq90-0006fk-Rj for guix-patches@gnu.org; Sat, 13 Apr 2024 23:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70371] [PATCH] gnu: cutter: Update to 2.3.4. Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Apr 2024 03:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70371@debbugs.gnu.org Cc: Juliana Sims , 63669@debbugs.gnu.org, raingloom@riseup.net, xvilka@gmail.com, zimon.toutoune@gmail.com X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171306377025494 (code B ref -1); Sun, 14 Apr 2024 03:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Apr 2024 03:02:50 +0000 Received: from localhost ([127.0.0.1]:34056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvq8n-0006d5-Ho for submit@debbugs.gnu.org; Sat, 13 Apr 2024 23:02:50 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36964) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvq8k-0006c4-Gb for submit@debbugs.gnu.org; Sat, 13 Apr 2024 23:02:47 -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 1rvq8U-0000LA-Bz for guix-patches@gnu.org; Sat, 13 Apr 2024 23:02:30 -0400 Received: from out-171.mta0.migadu.com ([91.218.175.171]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rvq8R-0003tC-Ki for guix-patches@gnu.org; Sat, 13 Apr 2024 23:02:30 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=key1; t=1713063733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SpVOqvWFFZ2e8B94f/+OS9p4WekWoXYWlvTiIBnhR40=; b=zDY5i45BurUudRHMnSKlbcJj8LhvtSxFtT0cMxb72TcXt12S6HH3tE6B/1M/QrB5sWdvQE IqqbH3SnrtEacd4tLY6Q7v6DzUpBHwwRsd9rFNv2CQoKXoHlWG5gZcfzVycyIG1wH7gMPi ie2WbiMABAqP+icUCqOc13ICvCdvwV4w4p8DuqUMWLvM1S93Wr7YIePjqunpKLGxhNWjox 3NgQDvyR834AMfzV0TkVrWhVe8ma1y2DUgp0z0M2Rj7+9IVw3ojLvlFtV4ytg7h+mIQ+jl 55fKrNxSn6kOEbJy5jNH5AkpdFrPo2rzXswOaNnWMkTexbDTkD39/Wwt3ap14g== Date: Sat, 13 Apr 2024 22:54:56 -0400 Message-ID: <923d0ed1c117a2b934833b455ea414793b4b2e03.1713063296.git.juli@incana.org> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=91.218.175.171; envelope-from=juli@incana.org; helo=out-171.mta0.migadu.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_PDS_PRO_TLD=0.01, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Juliana Sims X-ACL-Warn: , Juliana Sims via Guix-patches X-Patchwork-Original-From: Juliana Sims via Guix-patches via From: Juliana Sims 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 Hello, This patch updates Cutter to the latest version and removes an unneeded radare2 package. It closes issue 63669. Disregard my comments on that issue. I decided against packaging the decompilers so there is no reason to enable all of the other options. This is great because enabling all of them increases the package closure's size by 1.5GB. By contrast, this version's entire closure is more like 1.1GB. I do have patches for both rz-ghidra and the "full" version of Cutter if they prove desirable. I did not manage to resolve the plugin discovery issue, but I did manage to build Cutter with Python plugin support. Thanks, Juli * gnu/packages/engineering.scm (cutter): Update to 2.3.4. (radare2-for-cutter): Delete. --- gnu/packages/engineering.scm | 75 +++++++++++++----------------------- 1 file changed, 26 insertions(+), 49 deletions(-) base-commit: 238e4ec73e4143f3a5a85b56ca00d395cdf60197 diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6f42d674e51..c68c49adf0f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2023 Theofilos Pechlivanis ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 pinoaffe +;;; Copyright © 2024 Juliana Sims ;;; ;;; This file is part of GNU Guix. ;;; @@ -2491,67 +2492,43 @@ (define-public gnucap simulation.") (license license:gpl3+))) -(define-public radare2-for-cutter - (package - (inherit radare2) - (name "radare2") - (version "5.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/radareorg/radare2") - (commit version))) - (sha256 - (base32 - "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420")) - (file-name (git-file-name name version)))))) - (define-public cutter (package (name "cutter") - (version "1.12.0") + (version "2.3.4") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/rizinorg/cutter") - (commit (string-append "v" version)))) + (commit (string-append "v" version)) + (recursive? #t))) + (snippet #~((@ (guix build utils) delete-file-recursively) + "rizin")) (file-name (git-file-name name version)) (sha256 - (base32 "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0")))) - (build-system gnu-build-system) + (base32 "0d10g1wpw8p8hcxvw5q7ymfdxyrp4xqs6a49lf3gdgnmcpb248ad")))) + (build-system qt-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (radare2 (assoc-ref inputs "radare2"))) - ;; Fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib - ;; override `qmake PREFIX=`. - (substitute* "./src/lib_radare2.pri" - (("PREFIX") "R2PREFIX") - (("R2PREFIX=/usr") (string-append "R2PREFIX=" radare2))) - (invoke "qmake" - (string-append "PREFIX=" out) - "./src/Cutter.pro"))))))) - (native-inputs - (list pkg-config)) - (inputs - (list qtbase-5 - qtsvg-5 - openssl - ;; Depends on radare2 4.5.1 officially, builds and works fine with - ;; radare2 5.0.0 but fails to build with radare2 5.1.1. - radare2-for-cutter)) + (list + #:configure-flags #~(list "-DCUTTER_USE_BUNDLED_RIZIN=OFF") + #:tests? #f)) ;no tests + (native-inputs (list pkgconf)) + (inputs (list libzip + openssl + qtsvg-5 + qttools-5 + rizin + zlib)) (home-page "https://cutter.re") - (synopsis "GUI for radare2 reverse engineering framework") - (description "Cutter is a GUI for radare2 reverse engineering framework. -Its goal is making an advanced andcustomizable reverse-engineering platform -while keeping the user experience at mind. Cutter is created by reverse -engineers for reverse engineers.") - (license (list license:cc-by-sa3.0 ;the "Iconic" icon set - license:gpl3+)))) ;everything else + (synopsis "Software reverse engineering platform") + (description + "Cutter is a free and open-source reverse engineering platform powered by +@code{rizin}. It aims to be an advanced and customizable reverse engineering +platform while keeping the user experience in mind. Cutter is created by +reverse engineers for reverse engineers.") + (license (list license:cc-by-sa3.0 ;the "Iconic" icon set + license:gpl3+)))) ;everything else (define-public lib3mf (package