From patchwork Mon Jul 31 23:45:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 52444 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 B69DF27BBEC; Tue, 1 Aug 2023 00:47: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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,T_PDS_PRO_TLD 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 9D64C27BBE9 for ; Tue, 1 Aug 2023 00:47:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qQcbS-0004fW-Ba; Mon, 31 Jul 2023 19:47:06 -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 1qQcbP-0004ez-CS for guix-patches@gnu.org; Mon, 31 Jul 2023 19:47:03 -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 1qQcbP-00044N-4j for guix-patches@gnu.org; Mon, 31 Jul 2023 19:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qQcbP-0000xW-1Q for guix-patches@gnu.org; Mon, 31 Jul 2023 19:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64983] [PATCH 3/3] gnu: Add highlight-gui. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Jul 2023 23:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64983 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64983@debbugs.gnu.org Cc: gemmaro Received: via spool by 64983-submit@debbugs.gnu.org id=B64983.16908471933632 (code B ref 64983); Mon, 31 Jul 2023 23:47:03 +0000 Received: (at 64983) by debbugs.gnu.org; 31 Jul 2023 23:46:33 +0000 Received: from localhost ([127.0.0.1]:46871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQcau-0000wW-Ne for submit@debbugs.gnu.org; Mon, 31 Jul 2023 19:46:33 -0400 Received: from mail-ot1-x32b.google.com ([2607:f8b0:4864:20::32b]:57374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQcas-0000wB-AH for 64983@debbugs.gnu.org; Mon, 31 Jul 2023 19:46:30 -0400 Received: by mail-ot1-x32b.google.com with SMTP id 46e09a7af769-6bc93523162so2140465a34.2 for <64983@debbugs.gnu.org>; Mon, 31 Jul 2023 16:46:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690847185; x=1691451985; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lir8SqxvU846Ho1ukckzrf2HpAbCKQHqqgSqJfp+IK4=; b=LHNnAcbhy+OVfwXcYN3C/gMMYvqdTfmVLCMEcB1WB+ZBFGrTbmsvL22pxpymVicSv0 BUXBPn/q2g3tCrwnFEC9iN+V22URegsi6cGwnCwM1fFWRlzPfEP5I6vhVreVg0x3ynCS dhaAWaydVhtjbCrVs9ZtogEQrq7242QTozhvrDqHDxuLSRndMOdC++lXKwJryuoZg/mu GA8UlXAmmHwJCI9cHQSo5XPjzA/L14ewpfB7XFk4fkWDYjCqipuh+9ba8jZ/zDTo02yS iuqXiB9yrR+JM+gT7dRynt7hgKIAZvobxlY/tDPlPFP6BK/wZrBrWSIrUtLq4zc3X7Q/ sucA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690847185; x=1691451985; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lir8SqxvU846Ho1ukckzrf2HpAbCKQHqqgSqJfp+IK4=; b=XQBp179JLiEJVx+zFZgmzoWf/fbvrL3G8EOkHXqNX7nv2ILu/VLqUhvE34wCB3IPgn HQrXnAi+Kq5poRjXeO5nhS74DbYNi7xIrg2mEU2ND7m6IQm0D1XVhx94SD8UDiX53Qxe ECiI60SCGshkX/3nGZyRckT0+kDGfBHTbGhAKMH6MmhFd/hRG22/ZCsIdZ8Us3O9VBPn bgGpL+oiQ9X+YZ9aobFy0w8IXFx4uDq4gdHoQRebVIhf03PFDGfSPE1z6sMUWno0KNGC OZwAXPypok+mIg1xgHzbrFD4498ugMCAtEmfiJ+WVFwbm4CzGcq5u4FIb1JDLnZ1VQho eFQg== X-Gm-Message-State: ABy/qLZkaEcBDoR51EKFtmQ46TNjkaSBoRp8pXm6tXDUarIbnW2YIH8L dNzhz1BLQDC1hJucdWezX/+zOeQyv7pKmA== X-Google-Smtp-Source: APBJJlHFRhQo4NOo/jZOMNIk3r9rU89WEd8y4Ajxo5khNQ8ZMz+Ta9baXxUNizG/YNyPcSEhgJNFWg== X-Received: by 2002:a05:6358:9925:b0:134:d4c3:c47d with SMTP id w37-20020a056358992500b00134d4c3c47dmr1511371rwa.6.1690847184602; Mon, 31 Jul 2023 16:46:24 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id s24-20020a63af58000000b0056368adf5e2sm3047837pgo.87.2023.07.31.16.46.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 16:46:24 -0700 (PDT) From: gemmaro Date: Tue, 1 Aug 2023 08:45:47 +0900 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/pretty-print.scm (highlight-gui): New variable. --- gnu/packages/pretty-print.scm | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 1b2cf4becf..1ec4df50a9 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -52,6 +52,7 @@ (define-module (gnu packages pretty-print) #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt) #:use-module (gnu packages swig)) (define-public a2ps @@ -404,3 +405,47 @@ (define-public highlight TeX, SVG, BBCode and terminal escape sequences with colored syntax highlighting. Language definitions and color themes are customizable.") (license gpl3+))) + +(define-public highlight-gui + (package + (inherit highlight) + (name "highlight-gui") + (build-system gnu-build-system) + (arguments + (substitute-keyword-arguments (package-arguments highlight) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let* ((highlight:out (assoc-ref inputs "highlight")) + (data (string-append highlight:out "/share/highlight/")) + (conf (string-append highlight:out "/etc/highlight/")) + (doc (string-append highlight:out + "/share/doc/highlight/"))) + (substitute* "makefile" + (("HL_DATA_DIR=.* HL_CONFIG_DIR=.* HL_DOC_DIR=.* gui-qt") + (string-append "HL_DATA_DIR=\"" + data + "\" HL_CONFIG_DIR=\"" + conf + "\" HL_DOC_DIR=\"" + doc + "\" gui-qt")))))) + (add-after 'fix-search-for-lua 'fix-search-for-lua/GUI + (lambda _ + (substitute* "src/gui-qt/highlight.pro" + (("PKGCONFIG \\+= lua") + (string-append "PKGCONFIG += lua-" + #$(version-major+minor (package-version lua))))))) + (replace 'build + (lambda _ + (invoke "make" "gui"))) + (delete 'install-perl-bindings) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/bin")) + (invoke "make" "install-gui")))))))) + (native-inputs (list pkg-config)) + (inputs (list highlight lua boost qtbase-5)) + (synopsis "Graphical user interface for highlight")))