From patchwork Tue Aug 8 01:57:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 52647 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 26A0E27BBEA; Tue, 8 Aug 2023 03:00:19 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 DAB4427BBE2 for ; Tue, 8 Aug 2023 03:00:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qTC0z-0003Jx-U2; Mon, 07 Aug 2023 22:00:05 -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 1qTC0x-0003J5-MH for guix-patches@gnu.org; Mon, 07 Aug 2023 22:00:04 -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 1qTC0x-0004rw-7T for guix-patches@gnu.org; Mon, 07 Aug 2023 22:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qTC0w-00010I-E7 for guix-patches@gnu.org; Mon, 07 Aug 2023 22:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65107] [PATCH v2] gnu: Add gf. References: <20230806055213.29704-1-i@dan.games> In-Reply-To: <20230806055213.29704-1-i@dan.games> Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Aug 2023 02:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65107 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65107@debbugs.gnu.org Received: via spool by 65107-submit@debbugs.gnu.org id=B65107.16914599423753 (code B ref 65107); Tue, 08 Aug 2023 02:00:02 +0000 Received: (at 65107) by debbugs.gnu.org; 8 Aug 2023 01:59:02 +0000 Received: from localhost ([127.0.0.1]:34609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTBzy-0000yT-Ah for submit@debbugs.gnu.org; Mon, 07 Aug 2023 21:59:02 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:44219) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTBzt-0000xw-Sb for 65107@debbugs.gnu.org; Mon, 07 Aug 2023 21:59:01 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 88A9F32002F9 for <65107@debbugs.gnu.org>; Mon, 7 Aug 2023 21:58:51 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 07 Aug 2023 21:58:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to; s=fm1; t=1691459930; x=1691546330; bh=oE kf9gBVig9mCE7o9DK2+nxCch0Wm1KBPlHh71GC/zQ=; b=X0zK8LArKRq48z0m/6 iXaflU0GS237v+mKg0+3wyZGX/w7bb5FVq2JpWLLHUsxB2SSFiOvACCA65+V0qcS 7JX1Vlf87GOBeWh5cLogFavaZtACufSvP8JDAxl6iB50GPpubwL4yhTRsGRgvsQf +jbc7QFThD48e5lLHqMWQWix0dCuXH2CMeyGcEDNNQz5aW23+N1lUeyPsJGH+xtb HuWDPdQgRMpl1l288p78tcnl295Lnw5ukEPxPrF+Jd3dAsoY9dj+xqhlMRYo9w2r A6S4wJs8wCha78vzmLIEXYWdorCly28UB45gkScti/UdrLLiMjIIu2jlyIffgBER c0iQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1691459930; x=1691546330; bh=oEkf9gBVig9mC E7o9DK2+nxCch0Wm1KBPlHh71GC/zQ=; b=xCO1UVgPrt/nPMBsTyCsrrCUyME/J KogvhWi2mSz3pc89APtO3pALRMI32Sr8GA4Cjgaufmz1IKrWHAzosZOZ2uwKCVb6 DHzgx0e88ygQMzhaetQBnm94/MQITrVZH4Hmxk05yXpbEwXAGikRX6/Jc98HruoJ ANJOvO8zQr1blgZeM7/bCav/RmlWMxZ2An2QL+QbONuv9lI+HRe1iewCxz1K/vjg iwZXtDjkwBmqim5uJGIji6EeqTDMTeg+Tyo4eT79RJNB42S3kNDGF1Rd96EzEZ+6 OeA58tWEtIVTZSxPCp8sPIIE96+ifGS2hZPhk4dICYr8FNfaKvIkuP3NQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrledugdehtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpedttddutdejvdegvdetfeeiieevleffteehfffgveeuieetleelveefvdduveejgf enucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <65107@debbugs.gnu.org>; Mon, 7 Aug 2023 21:58:45 -0400 (EDT) From: dan Date: Tue, 8 Aug 2023 09:57:59 +0800 Message-ID: <20230808015808.5485-1-i@dan.games> X-Mailer: git-send-email 2.41.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: , 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 The following is the updated patch changed according to Hilton's suggestion. Note that for the vim version in guix we don't have `--servername' support, but I patched it anyway. --- gnu/packages/debug.scm | 91 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) base-commit: d43b53c476b4e9322b31274b788e851d37e72302 diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index e2a29a3ae9..57d0d3b479 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2022 Matthew James Kraai ;;; Copyright © 2023 Andy Tai ;;; Copyright © 2023 Ricardo Wurmus +;;; Copyright © 2023 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +51,8 @@ (define-module (gnu packages debug) #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages flex) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gawk) #:use-module (gnu packages gdb) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -71,6 +74,7 @@ (define-module (gnu packages debug) #:use-module (gnu packages readline) #:use-module (gnu packages serialization) #:use-module (gnu packages texinfo) + #:use-module (gnu packages vim) #:use-module (gnu packages virtualization) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) @@ -918,3 +922,90 @@ (define-public delve (synopsis "Debugger for the Go programming language") (description "Delve is a debugger for the Go programming language.") (license license:expat))) + +(define-public gf + (let ((commit "77a1f69204ceca5e62936976f97c62085a705126") + (revision "0")) + (package + (name "gf") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nakst/gf") + (commit commit))) + (sha256 + (base32 + "167ykfv7vf5vajxd5m3ggw4avpcim0i0bfmbxb495n8rgpaiizdy")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ; no test + #:make-flags #~(list "-g" + "-O2" + "-lX11" + "-lfreetype" + "-pthread" + (string-append "-I" + #$(this-package-input + "freetype") + "/include/freetype2") + "-DUI_FREETYPE" + "-DUI_NO_COLOR_PICKER" + "-DUI_SSE2" + "-Wall" + "-Wextra" + "-Wno-unused-parameter" + "-Wno-unused-result" + "-Wno-missing-field-initializers" + "-Wno-format-truncation") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "gf2.cpp" + (("\"gdb\";") + (format #f "\"~a\";" + (search-input-file inputs "/bin/gdb"))) + (("\"vim ") + (format #f "\"~a " + (search-input-file inputs "/bin/vim"))) + (("grep") + (format #f "~a" + (search-input-file inputs "/bin/grep"))) + (("fc-list") + (format #f "~a" + (search-input-file inputs + "/bin/fc-list"))) + (("fc-match") + (format #f "~a" + (search-input-file inputs + "/bin/fc-match"))) + (("awk") + (format #f "~a" + (search-input-file inputs "/bin/awk")))))) + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke + #$(cxx-for-target) + "gf2.cpp" + "-o" + "gf2" + make-flags))) + (replace 'install + (lambda* _ + (install-file "gf2" + (string-append #$output "/bin"))))))) + (inputs (list fontconfig + freetype + gawk + gdb + grep + libx11 + libxext + libxcursor + vim)) + (home-page "https://github.com/nakst/gf") + (synopsis "GDB frontend") + (description "A graphical GDB frontend for Linux.") + (license license:expat))))