From unknown Wed Jun 18 23:03:37 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#64983 <64983@debbugs.gnu.org> To: bug#64983 <64983@debbugs.gnu.org> Subject: Status: [PATCH 0/3] gnu: highlight: Update to 4.7 and add GUI package. Reply-To: bug#64983 <64983@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:03:37 +0000 retitle 64983 [PATCH 0/3] gnu: highlight: Update to 4.7 and add GUI package. reassign 64983 guix-patches submitter 64983 gemmaro severity 64983 normal tag 64983 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 19:44:05 2023 Received: (at submit) by debbugs.gnu.org; 31 Jul 2023 23:44:05 +0000 Received: from localhost ([127.0.0.1]:46860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQcYX-0000ro-Di for submit@debbugs.gnu.org; Mon, 31 Jul 2023 19:44:05 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQcYU-0000rD-V1 for submit@debbugs.gnu.org; Mon, 31 Jul 2023 19:44:03 -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 1qQcYP-0004LR-59 for guix-patches@gnu.org; Mon, 31 Jul 2023 19:43:57 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qQcYL-0001g4-68 for guix-patches@gnu.org; Mon, 31 Jul 2023 19:43:56 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-686f1240a22so4661128b3a.0 for ; Mon, 31 Jul 2023 16:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690847030; x=1691451830; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZRE9hXyXJhi5EpW31baHu+tbwPG5/f0SWAo5TcVM4cQ=; b=rNmzuhJRzMz5sc8l9kLibGeQaDuy/08GSfs+kwZlXMI9jvwzP9CGKp/AYBkTNyYwMA gt9qn5L1rmQ78wC63iTcTxm2mrQ+rZrmcRT0pEmM+IcXu7imKhIish8icRoqVuD5+zGh 9vvQany5aRgPzNsgiOGM3hU6PTkKZY0r8f0wHIA38k/DcaIbXIlpJejqJOJ6kTpCeHl2 Bpv79uuo2R/EpE0RU+KScASexioQBtBph7ahr5a+z/tvKHA9m2ap4zJnPKLwYLZAzxMc 6YuxdaeXVT0uzXhcnZ5sTyfm1QJyL7/eI3m/HgQxyZqyM+Vvb8/3vhKtruyS86j9GsYG JMNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690847030; x=1691451830; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZRE9hXyXJhi5EpW31baHu+tbwPG5/f0SWAo5TcVM4cQ=; b=Ivt08k2AsMlLek4ZMSNRemLfjbnJPbx8eRk/VWXyqMGqu4048k2DwF03ieXQKch091 ZWzzwUbyKjm/0bQYuCgwhi+LAxzTaJ+Uum97yLvUiB9+1rDhlivPi/MB00vRyzAPYyN8 ff1UvKVIV65eiPJ/HG06dT1AEiTcoQ5SJqmYxoTadOTwKOBTuDpU+1Hu5twAV/eUwkHe z7nWhrjIqBU2ANJHQMCWtfdG8dyhZUQPbUIj01krCgwrQ3uMXmc3QrSPVKxVp4i1bXnP e4ytWdNb3UKLzjg+J38MpgHEC7fh+KaMHdTqngx6MjLuLd1b3m1L3wcBiUuIuOvb+kLh D9pw== X-Gm-Message-State: ABy/qLYuEvAhIlQ1f7DcyVNWLe/AYhCbbtBGndKJJ7McbKntI4PXUexM 9N4aREUzyPAuWoCliohHPUnBqQ7nk9ApHg== X-Google-Smtp-Source: APBJJlHOoYfAns82UDAC1vNjx16wTtsefL8gK1jh4jTjEdTjLB7YrzcxH07jo0DIoZgiuyF2MzOZYQ== X-Received: by 2002:a05:6a20:3256:b0:132:2f7d:29ca with SMTP id hm22-20020a056a20325600b001322f7d29camr10808756pzc.24.1690847030541; Mon, 31 Jul 2023 16:43:50 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id a9-20020a631a09000000b00563590be25esm8561340pga.29.2023.07.31.16.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 16:43:49 -0700 (PDT) From: gemmaro To: guix-patches@gnu.org Subject: [PATCH 0/3] gnu: highlight: Update to 4.7 and add GUI package. Date: Tue, 1 Aug 2023 08:43:25 +0900 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=gemmaro.dev@gmail.com; helo=mail-pf1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hello, This patchset updates highlight to 4.7 and add highlight's graphical user interface package (as highlight-gui). Thank you, gemmaro. gemmaro (3): gnu: highlight: Update to 4.7. gnu: highlight: Use new package style. gnu: Add highlight-gui. gnu/packages/pretty-print.scm | 137 +++++++++++++++++++++++----------- 1 file changed, 92 insertions(+), 45 deletions(-) base-commit: 55e89da207b95230e5f2a8176acd9cc9b43971ff -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 19:46:11 2023 Received: (at 64983) by debbugs.gnu.org; 31 Jul 2023 23:46:11 +0000 Received: from localhost ([127.0.0.1]:46865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQcaY-0000vk-S1 for submit@debbugs.gnu.org; Mon, 31 Jul 2023 19:46:11 -0400 Received: from mail-ot1-x332.google.com ([2607:f8b0:4864:20::332]:61653) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQcaX-0000vY-ME for 64983@debbugs.gnu.org; Mon, 31 Jul 2023 19:46:10 -0400 Received: by mail-ot1-x332.google.com with SMTP id 46e09a7af769-6bca88c3487so949789a34.2 for <64983@debbugs.gnu.org>; Mon, 31 Jul 2023 16:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690847164; x=1691451964; 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=lXPDOmC0z4DEi2eViKA92CUDWC89M3c+Wona5AQMoZ4=; b=d29K65k7Vlm6a/k7jW3iWZd/xB7++LMlygoBcvn4vmOwPDTJj0sP0bhiRPj6GoonUC BgKP7yB4ECUtNit6Awl+ieVFl4sWixeD98IWrgp8A1mm8FzAXg9wX7NNFyfjwKV848+R 8PLRz41UdM5DAORNB1TWeS5W1Jgdc4Uj/70pjrf/sm3t7pqeP16dSE/3DVIt2YUcX+n2 SyirTBto8nje4kHA/EJnDVdlKK/yEWchiNXQ+knEKrY/4nnLNr5LxQM7eWQy75Mb/L9R GXbL4Tg8poAPT4g/pVRKo7LbjTSiy4F6Aity/vC1ZdFWaZswD9MidVI73YWZ0y+4Zfx6 9gZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690847164; x=1691451964; 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=lXPDOmC0z4DEi2eViKA92CUDWC89M3c+Wona5AQMoZ4=; b=D4XM/ccdzq1AbbhUkUU2kV0+iI25OkcgyNi7rkMzNdUtmRQPu6+LJg0XVz6bR4OS7A uwk8r/U22hRaiH6qe4NMiTs2FS27IablKZt7a/MncXOvR59SrUEs6/ArMKmVxQfuVwf2 O6EAcW/uxkIDyA9wbK09nqziM67O1adNKFNvnSLhwOyYYTU3cDMNjm74WGsrApdRi+pb mDG7ZjdCG5oC+NyEXLnJWFq8iEanD7SorP47jcDyu10rbcKLc+Vu3c87Bd+i2RsKIA9D rPEeDViWszUpeD5KBFZbeLnhL8XOkydITMdyJQRYMgi6eQA0VgpTlJIS7WXc5sEOBG9E FsCg== X-Gm-Message-State: ABy/qLbJ0HWprQ4oFVMNzfTPF+cZgzKy3ARS8RaUGvxlyutpiiluTAyu z9QRdjgFqnIwQAhPGP6ovwKaUUTXScsv/A== X-Google-Smtp-Source: APBJJlHx94qAHKWw8/vS8CT2/25cAoT5QQrlrjTXH5tS/8f6HmqjvyPcO+tSMRhmc9ANnb5fngH1XQ== X-Received: by 2002:a05:6358:5e02:b0:134:f070:d6b8 with SMTP id q2-20020a0563585e0200b00134f070d6b8mr1291824rwn.4.1690847163890; Mon, 31 Jul 2023 16:46:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 16:46:03 -0700 (PDT) From: gemmaro To: 64983@debbugs.gnu.org Subject: [PATCH 1/3] gnu: highlight: Update to 4.7. Date: Tue, 1 Aug 2023 08:45:45 +0900 Message-ID: <1c68e473b909c33d22f6e55a1bf41d990f2d5813.1690846546.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64983 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/pretty-print.scm (highlight): Update to 4.7. --- gnu/packages/pretty-print.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 89e5de6278..9896824f01 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2022, 2023 Maxim Cournoyer +;;; Copyright © 2023 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -350,14 +351,14 @@ (define-public source-highlight (define-public highlight (package (name "highlight") - (version "3.62") + (version "4.7") (source (origin (method url-fetch) (uri (string-append "http://www.andre-simon.de/zip/highlight-" version ".tar.bz2")) (sha256 - (base32 "088di7qxd6b2r22qljllhnly0r9a0lfnwnfqswjn23s09awjbl6p")))) + (base32 "1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 19:46:25 2023 Received: (at 64983) by debbugs.gnu.org; 31 Jul 2023 23:46:25 +0000 Received: from localhost ([127.0.0.1]:46868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQcan-0000wC-7A for submit@debbugs.gnu.org; Mon, 31 Jul 2023 19:46:25 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:42184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQcal-0000vy-2J for 64983@debbugs.gnu.org; Mon, 31 Jul 2023 19:46:24 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1bbc06f830aso32884755ad.0 for <64983@debbugs.gnu.org>; Mon, 31 Jul 2023 16:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690847177; x=1691451977; 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=py2n9f3I1+XI2vucN+p2xhRwa6EexOQaP4JsugfFQC8=; b=VfjdwrUC0Z2vfS8IrakjY0nPFwTuax0WnNj2WAt19c0rQdiqVivBalMHC9a6d/7nvW /B6CQxGlY+g0OWBXjL0EPAPybfoBI9Qdg5iH/rGdME4hW8HOcsmunutaqDZdphnU6k1h Qq2DBCId/bulCS/n6Mq12JVeJS6H40HjrkOtLnWsNSybjVxdQKSwIP6+0XtO1m4ZdBCR 2Eo1TQIO3iMj18QJe3RPEyFAvSHVKr1IFGyLlINuuLa4Yde4uIB/Mkp7bbAzfZa8Ikmq 5TEFkqth6CFQrZeXuy4rF62uGjG7fzNYGE/yADrE2Hot9uNEfb9r/kJIpRsRyj358tvR 0Fmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690847177; x=1691451977; 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=py2n9f3I1+XI2vucN+p2xhRwa6EexOQaP4JsugfFQC8=; b=RY6YFM7glXINLTv47GbtPoR/fuDkNyOieE+7QoQhHWHw4dhCh5sK76q4q7oB31YBwM HWQik+1agN6HAj+5b6HFEc1d536+Ex9EnF0hOGPzk2yXHVxWFdCl2XybVziK2TdGHJdb es0jfcGGR+kY/ecNAjvF4ie7oQAxf39CUP5zXs9THmeR6ZQWck2YJf/bCBq6+hUR9Om7 3AJtH0u0gE08aj9jm07CWEmgND8OwkS9XSNfpsEVlguB3Ya1tyCzJxm+2QjsIW+ZsyND /cCvUW+kwP7PYS4G25LYG0fo7ExjmOgXzsDRIb1Ky8QeUO08TaCPvLCymh9kU1sYadQ1 H7iw== X-Gm-Message-State: ABy/qLa6Q+aRyt0q7PJz733DzJDjn/zbHuklMrIxm2pBe/J/ZIZS7jxW p6HLXqJmKhJLLP9qEPh8sNg7XbdkXyyHtA== X-Google-Smtp-Source: APBJJlEsP9JS86FH4ddtHvwV0GDqsINEy+WdyA2IPBSJCx65teooY3ReyT5luwgaVe6HjIn6WTYmNg== X-Received: by 2002:a17:902:ec90:b0:1bc:edd:e891 with SMTP id x16-20020a170902ec9000b001bc0edde891mr5978686plg.1.1690847177224; Mon, 31 Jul 2023 16:46:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 16:46:16 -0700 (PDT) From: gemmaro To: 64983@debbugs.gnu.org Subject: [PATCH 2/3] gnu: highlight: Use new package style. Date: Tue, 1 Aug 2023 08:45:46 +0900 Message-ID: <7008326f574879d4f79020313fb1bf54605b0cec.1690846546.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64983 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/pretty-print.scm (highlight) Use new package style. [arguments]: Use G-expression. Drop trailing #t from phases. [source, inputs, native-inputs, description]: Reformat with guix style. --- gnu/packages/pretty-print.scm | 89 ++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 9896824f01..1b2cf4becf 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -352,54 +352,55 @@ (define-public highlight (package (name "highlight") (version "4.7") - (source - (origin - (method url-fetch) - (uri (string-append "http://www.andre-simon.de/zip/highlight-" - version ".tar.bz2")) - (sha256 - (base32 "1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1")))) + (source (origin + (method url-fetch) + (uri (string-append "http://www.andre-simon.de/zip/highlight-" + version ".tar.bz2")) + (sha256 + (base32 + "1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests - #:make-flags - (let ((confdir (string-append %output "/share/highlight/config/"))) - (list (string-append "PREFIX=" %output) - (string-append "HL_CONFIG_DIR=" confdir) - (string-append "conf_dir=" confdir))) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'unpack 'fix-search-for-lua - (lambda _ - (substitute* "src/makefile" - (("(LUA_PKG_NAME=).*" _ assignment) - (string-append assignment "lua-" ,(version-major+minor - (package-version lua)) - "\n"))) - (substitute* "extras/swig/makefile" - (("lua") (string-append "lua-" ,(version-major+minor - (package-version lua))))) - #t)) - (add-after 'install 'install-perl-bindings - (lambda* (#:key outputs #:allow-other-keys) - (let* ((perldir (string-append (assoc-ref outputs "out") - "/lib/perl5/site_perl/" - ,(package-version perl))) - (autodir (string-append perldir "/auto/highlight"))) - (with-directory-excursion "extras/swig" - (invoke "make" "perl") - (invoke "perl" "-I" "." "testmod.pl") - (install-file "highlight.pm" perldir) - (install-file "highlight.so" autodir)) - #t)))))) - (inputs - (list lua boost perl)) - (native-inputs - (list pkg-config swig)) + (list #:tests? #f ;no tests + #:make-flags #~(let ((confdir (string-append %output + "/share/highlight/config/"))) + (list (string-append "PREFIX=" %output) + (string-append "HL_CONFIG_DIR=" confdir) + (string-append "conf_dir=" confdir))) + #:phases #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-after 'unpack 'fix-search-for-lua + (lambda _ + (substitute* "src/makefile" + (("(LUA_PKG_NAME=).*" _ assignment) + (string-append assignment "lua-" + #$(version-major+minor (package-version + lua)) + "\n"))) + (substitute* "extras/swig/makefile" + (("lua") + (string-append "lua-" + #$(version-major+minor (package-version + lua))))))) + (add-after 'install 'install-perl-bindings + (lambda* (#:key outputs #:allow-other-keys) + (let* ((perldir (string-append (assoc-ref outputs + "out") + "/lib/perl5/site_perl/" + #$(package-version perl))) + (autodir (string-append perldir + "/auto/highlight"))) + (with-directory-excursion "extras/swig" + (invoke "make" "perl") + (invoke "perl" "-I" "." "testmod.pl") + (install-file "highlight.pm" perldir) + (install-file "highlight.so" autodir)))))))) + (inputs (list lua boost perl)) + (native-inputs (list pkg-config swig)) (home-page "http://www.andre-simon.de/doku/highlight/en/highlight.php") (synopsis "Convert code to documents with syntax highlighting") - (description "Highlight converts source code to HTML, XHTML, RTF, LaTeX, + (description + "Highlight converts source code to HTML, XHTML, RTF, LaTeX, TeX, SVG, BBCode and terminal escape sequences with colored syntax highlighting. Language definitions and color themes are customizable.") (license gpl3+))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 19:46:33 2023 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 To: 64983@debbugs.gnu.org Subject: [PATCH 3/3] gnu: Add highlight-gui. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64983 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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"))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 03 20:43:09 2023 Received: (at 64983) by debbugs.gnu.org; 4 Aug 2023 00:43:09 +0000 Received: from localhost ([127.0.0.1]:53117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRiuL-0006tq-Ix for submit@debbugs.gnu.org; Thu, 03 Aug 2023 20:43:09 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:55645) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRiuJ-0006ta-5M for 64983@debbugs.gnu.org; Thu, 03 Aug 2023 20:43:07 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1bb119be881so13544135ad.3 for <64983@debbugs.gnu.org>; Thu, 03 Aug 2023 17:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691109781; x=1691714581; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=QJYqZpvHmmzVGR+br2bCfhwijlYt2WMK2vPBodQMHM8=; b=OevNDeNA/Etlu6pYP4qG2csx3Ca4ZdwYf/cL1j/xCCjr4ZYjBgKaZfDQlDC32TeTb7 z2Ds6On/RgM8T1ZQytaEemXs5g0v8f5TRkLVSJo3ykX3bfnSxkq0nFClnqtCdGAn4/ZK P/gubSRaI4rvT6Kw6E8ba1YxAkgUAeDPU+iX78uKdOz/qSI+mIyZjvuffvfj2xR4gUCG qbBY67St+jKCNt8mUMaegANLrCeStyeZDROLpEylDoL8jhPc1DSW0zaQHEuqDWNOz+uh BLQnDr0eBOH2z1X0OkNo1i/7czhDuDdRYPnRvOuTnO4Sawp4ZfhNtAWJohgY+Hy4sGtb ighg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691109781; x=1691714581; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QJYqZpvHmmzVGR+br2bCfhwijlYt2WMK2vPBodQMHM8=; b=FNk7QvoB/wXaL0Clee6NodzwNAl2ZGKSwEV9mIvtqZ9zD79LApRWYWwiMj5bPjenYq sxVlLRU9QktEvr8ivXnqoUG78+EXmSW4ShVw00PEdKRV6BtC0CzoC2ngRGo0z+Mtl/u9 ClSIsDtFzcolEOA9zvYgcYVHIoXgzbZwIYQkSvpzBxx9hlkyMwavrEaRpKpRPchQAFhN b7VdWJgzTSxZf+2Oob20YHCxOqDYxWY2luDxFQMz95FqsbsyOutGX2vLHYwyawC3GsB/ Er6GbHweb4vFojxV1jOmPZsj9mUYe0CM25vK3osCGyTjzSh5Zl4IPFzA8WBTeEXnYQKg wJnQ== X-Gm-Message-State: AOJu0YwlP/3rm035wIKig8mFCuBmGK6wyeGeehiemhEVl3ZasRnS26C9 BjAJipTEee2ugBvkOMTuCeOp6Gwqdpg= X-Google-Smtp-Source: AGHT+IEQivBK8slydAj0TX+64HDR0AAfyfyUbNB6+iPw7LvzigH31OV3HS2D/3zj1H1fpZdIFVCFcw== X-Received: by 2002:a17:902:e882:b0:1b0:f8:9b2d with SMTP id w2-20020a170902e88200b001b000f89b2dmr373717plg.29.1691109781194; Thu, 03 Aug 2023 17:43:01 -0700 (PDT) Received: from localhost ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id e6-20020a170902cf4600b001ac5896e96esm423314plg.207.2023.08.03.17.43.00 for <64983@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 17:43:00 -0700 (PDT) From: gemmaro To: 64983@debbugs.gnu.org Subject: [bug#64983] [PATCH 3/3] gnu: Add highlight-gui. In-Reply-To: References: Date: Fri, 04 Aug 2023 09:42:58 +0900 Message-ID: <87leerprhp.fsf@mac.gemmaro.name> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64983 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I noticed that my third patch doesn't configure the GUI path settings well, so I'll send updated patches. I also want to rethink whether it should be a separate package or output. From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 07 10:15:09 2023 Received: (at 64983) by debbugs.gnu.org; 7 Aug 2023 14:15:09 +0000 Received: from localhost ([127.0.0.1]:34035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10m-0004iI-BQ for submit@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:09 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:47250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10i-0004hK-2S for 64983@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:06 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1bbf3da0ea9so29034165ad.2 for <64983@debbugs.gnu.org>; Mon, 07 Aug 2023 07:15:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691417698; x=1692022498; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=x9MpGx+4VgmhINa75T2ebH6AYGM9c/kcJImoRtXr6z4=; b=rJ2xltkIU+V4u8vWRl3IQerZQQl2Sb5MUexQZv8K0pMzU3dor6qJ31NB+40AUHPPF+ +AuQ73hAYljwvleStCNnZ9QYedN6K0VR13d0dl3jhIdHVyc09eqjMhHFJPriYNe8ob80 ny0XTKM+fqE3XIFpTvBNkAmMyObzZRSp6S+jUbZxlYxcwOpWU55S5ZdR0+63MYoHSf8K ru2FFnekbA8xmQ3FSdjF53sQcN3uvcpvJPEuy3cv1TdBEx4stG9xEGlDzuRJ662to8PK 5hvSQ5ri5X/SPztqasfHdk1pj8De29ETf4SIREGnL7r4JpWvR8xKirmv+NWqzk5suMt1 +TBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691417698; x=1692022498; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=x9MpGx+4VgmhINa75T2ebH6AYGM9c/kcJImoRtXr6z4=; b=fGzp2VY7c6Yc2TmhPa57TODiZJJ6DreOmKbWFOcFrqQe45aSWLqf8ELa1mYVtMlAt1 jjDolGJiV0It7QuBvE4SmjxWWubXc5KNogS/nAfCsj5l5Qo/XP8zZoHxJe2b8M2PXiBz CvmA+vBPnrxc82jSAgAZdV3yOET7HzkowwVrLV6f/Z3opaAV4W0iw9BId47QiSqNMv+P IHQ+y29gUF1P4LVcjAvfXsSKf0skF2u/mW4HoVfFU0yDrzODZlvFzZaxQmf3+tkV3/bs VQabha7OPUKS2DJv/FBb/a/APdeqV+uFUybSICip5e2oPNo2x0/03K9XkPH7wEAxhL95 mayA== X-Gm-Message-State: AOJu0YwS8gB7StMhHYlL2sy4G9V7fbW+7mxt/RzjCMQ7tt+UG0TsDQA9 g3+v5fr3Tm5WE1TxBoDpk3Wfiyka8Hg= X-Google-Smtp-Source: AGHT+IHPSmMbdIhD3bx2B34b7q84Nfo6ij0dE02G0FL7A31VUWwixKzSkgijehR1mSJwDO0XtYSqtA== X-Received: by 2002:a17:902:b492:b0:1b9:f7f4:5687 with SMTP id y18-20020a170902b49200b001b9f7f45687mr7251356plr.24.1691417698109; Mon, 07 Aug 2023 07:14:58 -0700 (PDT) Received: from mac.gemmaro.name (ONI-202-70-254-104.oninet.ne.jp. [202.70.254.104]) by smtp.gmail.com with ESMTPSA id ja4-20020a170902efc400b001b8013ed362sm6985191plb.96.2023.08.07.07.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 07:14:57 -0700 (PDT) From: gemmaro To: 64983@debbugs.gnu.org Subject: [PATCH v2 0/4] gnu: highlight: Add gui output. Date: Mon, 7 Aug 2023 23:05:38 +0900 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64983 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I updated from revision 1 so that the highlight package has "gui" output instead of another package, fixed some GUI path settings, and also fixed path settings for Perl bindings. In particular, the second change makes it possible to see the internationalized GUI interface. gemmaro (4): gnu: highlight: Update to 4.7. gnu: highlight: Use new package style. gnu: highlight: Add gui output. gnu: highlight: Fix paths for Perl bindings. .../patches/highlight-gui-data-dir.patch | 51 +++++++ gnu/packages/pretty-print.scm | 135 ++++++++++++------ 2 files changed, 140 insertions(+), 46 deletions(-) create mode 100644 gnu/packages/patches/highlight-gui-data-dir.patch base-commit: 56667ee55cd7f3368cbff169352fe440f4f93da5 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 07 10:15:12 2023 Received: (at 64983) by debbugs.gnu.org; 7 Aug 2023 14:15:12 +0000 Received: from localhost ([127.0.0.1]:34038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10o-0004iY-E5 for submit@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:12 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:48578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10j-0004hN-Do for 64983@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:09 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1bc02bd4eafso39392345ad.1 for <64983@debbugs.gnu.org>; Mon, 07 Aug 2023 07:15:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691417700; x=1692022500; 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=lXPDOmC0z4DEi2eViKA92CUDWC89M3c+Wona5AQMoZ4=; b=cmTxfOR1Rtuj2wAj0YE95hN2wNPaisZm8s0otEw+Fsrzd0LwydRNJ2CLmyYufTWsIJ dk1uZczenuAVRC6sRNXMgiQ96YOyStk5jyrhCIYivxxpLESwoq2Km/imbQnJZ4MQwlME QCJXWqNNrIYCoaDyAoBOvOS4G/8ApFhb2YgFeftd8xaT54MoH5Le/qB/zeNx5LWmNb08 N/JIHkCiGP5ATqW4cLV59y18IMID0Bi3yUjp4D6t+G4ipVfSQofWLHiz27Zlfoy1eTE8 HVNKhaPWzdSuasop8UCKiqFoTTe8GD6Osu110eXk7oqoe0+L8VgXKxoB2p+/6S6ocg6T 3cMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691417700; x=1692022500; 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=lXPDOmC0z4DEi2eViKA92CUDWC89M3c+Wona5AQMoZ4=; b=CIS69QuzoHxU+JcC4bKTwwrAqflAveqoojaE+wxMM3bZp85V9hT1jp0ZezFKgG08dq QQG0Vb40zLcUkpJSMTjwnteeqC9OwMSwRKOybrN3EanChahegQnH6tlLx9DcfV2uXUsy bx2DjzRG8Yl+bDZ5x5gRUdWpeggcE4vgpnZegZU0oc2wimpDqDxB/09hoaLcEs6CS5XT ExkLRDOFa/lxDwH8qlvoFW5ZltRdORYs6mAedFQje3T5/TBiXxEpooW3AmHl/RrCUlbD DUru5WO1jPy4VLqAEpSniQvG+rY+fFeehKmPfkQJYBOgM2O8Uu1/cX8DB+KXMHVztjyc czSQ== X-Gm-Message-State: AOJu0YzpG0BZReRZCuowXmvv0smCQ6o90f1cVKraYkq5HRdT6FadEhSS b4vSsmo4pyTUXpi6GuNlTLvBOXk49DU= X-Google-Smtp-Source: AGHT+IEJ047RYrPyvHlQd2Gonq0cATWIi+9oAUHIJCr90cr7j6AzaNJfRs+McG6kah+a/PicVYmeEg== X-Received: by 2002:a17:902:7615:b0:1b8:987f:3f34 with SMTP id k21-20020a170902761500b001b8987f3f34mr9225163pll.25.1691417699805; Mon, 07 Aug 2023 07:14:59 -0700 (PDT) Received: from mac.gemmaro.name (ONI-202-70-254-104.oninet.ne.jp. [202.70.254.104]) by smtp.gmail.com with ESMTPSA id ja4-20020a170902efc400b001b8013ed362sm6985191plb.96.2023.08.07.07.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 07:14:59 -0700 (PDT) From: gemmaro To: 64983@debbugs.gnu.org Subject: [PATCH v2 1/4] gnu: highlight: Update to 4.7. Date: Mon, 7 Aug 2023 23:05:39 +0900 Message-ID: <2fbe0ccbb0c580a3bf0af84720585c6cd6d6d8f1.1691417142.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64983 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/pretty-print.scm (highlight): Update to 4.7. --- gnu/packages/pretty-print.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 89e5de6278..9896824f01 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2022, 2023 Maxim Cournoyer +;;; Copyright © 2023 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -350,14 +351,14 @@ (define-public source-highlight (define-public highlight (package (name "highlight") - (version "3.62") + (version "4.7") (source (origin (method url-fetch) (uri (string-append "http://www.andre-simon.de/zip/highlight-" version ".tar.bz2")) (sha256 - (base32 "088di7qxd6b2r22qljllhnly0r9a0lfnwnfqswjn23s09awjbl6p")))) + (base32 "1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 07 10:15:14 2023 Received: (at 64983) by debbugs.gnu.org; 7 Aug 2023 14:15:14 +0000 Received: from localhost ([127.0.0.1]:34041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10r-0004ix-LH for submit@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:14 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]:55691) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10l-0004hx-BD for 64983@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:10 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1bc6624623cso13169905ad.3 for <64983@debbugs.gnu.org>; Mon, 07 Aug 2023 07:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691417701; x=1692022501; 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=py2n9f3I1+XI2vucN+p2xhRwa6EexOQaP4JsugfFQC8=; b=FeNugh+1FiYwEL+X9MMxi24M1vft4e/xoseYgoz3pY1ujfv1Esoowm20Sm692JQXpW 4eaahn7L78ow+ZgC2I4fuiumbpQrsr+8vsT8n+1719ReDYhVvbgWappEgnb0CpJkltvE 478bXF3pPaKf0Lnq34IgrXz2sD6RRSO760GoiiNs03cn5ZWN/fJ6bqjUgpEZFhwkOKLL lEPWCOuAovzUSaIK7/zorq7Ld8Wrs5g3ljIQoW9sUxUv0aePv2SQQut4AMB7WRka3fEA tCHpLrv1tL6Gb2ohsPV/2kwI3kUnWHaqgFQli8yzcwow34DiHK31P2dhPWU4AMEsNvzm +puw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691417701; x=1692022501; 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=py2n9f3I1+XI2vucN+p2xhRwa6EexOQaP4JsugfFQC8=; b=JljdKGHyYGqlSB9mQeh/KrGHxeKzIVBX90Pp4Ndp+9WsRWY5+eshztzN96SUd8tWck ZxlpdEwO1yaSbuVnpy2AxXPBRNl8gvNVjhB+qCRzqis22/+WhQWWO/kUjWWBkzKtyL22 H+UabtBkS+ORpRMPRn+S6aOlajalOuLLejSiqw8Qu+euhXhXYd3ApTkd7o+DW6gPxak5 BTwR3YHGLmLmxBR4iPASOtLbqsYhPhlQT/29yh0ZpD/5y/Y1QPsWuWqIBl/uxFfhsuc4 7k/my31sEHJUOr/2XXPP8k7w6j1LPGJIWwHTquMv9D9RYcsxQPC1UBJDr9CBSoUUAvD3 IQqA== X-Gm-Message-State: AOJu0YynnryMG5SPC7G0bDdoPWWdQz1rreHXY2QS5LGMYsi7+OtAfYMF y5HaKC52DYFDWsfiNnzM24mwG/fgzTg= X-Google-Smtp-Source: AGHT+IGI58U33h52abDliLLwjRT05Ng1RlO6XSW4gzGDIhT32RsHvJTjRxgfCbJar9L/LLeaqiyARw== X-Received: by 2002:a17:903:18c:b0:1bc:532f:1bf8 with SMTP id z12-20020a170903018c00b001bc532f1bf8mr9943398plg.45.1691417701473; Mon, 07 Aug 2023 07:15:01 -0700 (PDT) Received: from mac.gemmaro.name (ONI-202-70-254-104.oninet.ne.jp. [202.70.254.104]) by smtp.gmail.com with ESMTPSA id ja4-20020a170902efc400b001b8013ed362sm6985191plb.96.2023.08.07.07.15.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 07:15:01 -0700 (PDT) From: gemmaro To: 64983@debbugs.gnu.org Subject: [PATCH v2 2/4] gnu: highlight: Use new package style. Date: Mon, 7 Aug 2023 23:05:40 +0900 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64983 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/pretty-print.scm (highlight) Use new package style. [arguments]: Use G-expression. Drop trailing #t from phases. [source, inputs, native-inputs, description]: Reformat with guix style. --- gnu/packages/pretty-print.scm | 89 ++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 9896824f01..1b2cf4becf 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -352,54 +352,55 @@ (define-public highlight (package (name "highlight") (version "4.7") - (source - (origin - (method url-fetch) - (uri (string-append "http://www.andre-simon.de/zip/highlight-" - version ".tar.bz2")) - (sha256 - (base32 "1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1")))) + (source (origin + (method url-fetch) + (uri (string-append "http://www.andre-simon.de/zip/highlight-" + version ".tar.bz2")) + (sha256 + (base32 + "1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests - #:make-flags - (let ((confdir (string-append %output "/share/highlight/config/"))) - (list (string-append "PREFIX=" %output) - (string-append "HL_CONFIG_DIR=" confdir) - (string-append "conf_dir=" confdir))) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'unpack 'fix-search-for-lua - (lambda _ - (substitute* "src/makefile" - (("(LUA_PKG_NAME=).*" _ assignment) - (string-append assignment "lua-" ,(version-major+minor - (package-version lua)) - "\n"))) - (substitute* "extras/swig/makefile" - (("lua") (string-append "lua-" ,(version-major+minor - (package-version lua))))) - #t)) - (add-after 'install 'install-perl-bindings - (lambda* (#:key outputs #:allow-other-keys) - (let* ((perldir (string-append (assoc-ref outputs "out") - "/lib/perl5/site_perl/" - ,(package-version perl))) - (autodir (string-append perldir "/auto/highlight"))) - (with-directory-excursion "extras/swig" - (invoke "make" "perl") - (invoke "perl" "-I" "." "testmod.pl") - (install-file "highlight.pm" perldir) - (install-file "highlight.so" autodir)) - #t)))))) - (inputs - (list lua boost perl)) - (native-inputs - (list pkg-config swig)) + (list #:tests? #f ;no tests + #:make-flags #~(let ((confdir (string-append %output + "/share/highlight/config/"))) + (list (string-append "PREFIX=" %output) + (string-append "HL_CONFIG_DIR=" confdir) + (string-append "conf_dir=" confdir))) + #:phases #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-after 'unpack 'fix-search-for-lua + (lambda _ + (substitute* "src/makefile" + (("(LUA_PKG_NAME=).*" _ assignment) + (string-append assignment "lua-" + #$(version-major+minor (package-version + lua)) + "\n"))) + (substitute* "extras/swig/makefile" + (("lua") + (string-append "lua-" + #$(version-major+minor (package-version + lua))))))) + (add-after 'install 'install-perl-bindings + (lambda* (#:key outputs #:allow-other-keys) + (let* ((perldir (string-append (assoc-ref outputs + "out") + "/lib/perl5/site_perl/" + #$(package-version perl))) + (autodir (string-append perldir + "/auto/highlight"))) + (with-directory-excursion "extras/swig" + (invoke "make" "perl") + (invoke "perl" "-I" "." "testmod.pl") + (install-file "highlight.pm" perldir) + (install-file "highlight.so" autodir)))))))) + (inputs (list lua boost perl)) + (native-inputs (list pkg-config swig)) (home-page "http://www.andre-simon.de/doku/highlight/en/highlight.php") (synopsis "Convert code to documents with syntax highlighting") - (description "Highlight converts source code to HTML, XHTML, RTF, LaTeX, + (description + "Highlight converts source code to HTML, XHTML, RTF, LaTeX, TeX, SVG, BBCode and terminal escape sequences with colored syntax highlighting. Language definitions and color themes are customizable.") (license gpl3+))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 07 10:15:15 2023 Received: (at 64983) by debbugs.gnu.org; 7 Aug 2023 14:15:15 +0000 Received: from localhost ([127.0.0.1]:34043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10s-0004iz-CI for submit@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:15 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:48581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10m-0004i2-SV for 64983@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:12 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1bc02bd4eafso39393155ad.1 for <64983@debbugs.gnu.org>; Mon, 07 Aug 2023 07:15:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691417703; x=1692022503; 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=X/w5zGGD6SHkOP7v5SHS3xtl4KTjeE4lZxWSUPY+4gA=; b=jp9UUqZZvOS0LHo44PkYoeD0hauPUSTTum6KX1P78/uXM7f0XV0DrR8TJhTWFs0upR 0WNySH7ICK0XIxQlRxP5WiyLUtI/rffCrNVED5PlBisd9wbCNBKxkpFK8f9klvZT3aa0 PLuXy70VJ75OqM7WXyKy4RfQ9IB4WHIpIjM09LjU7yNSfb8UnBYxlIMIZNfUUhkxZdpS TdKPygkAJbMVzxlpLL82Vgq4rNrxvCzgcXGMGL0WfwG+nelsZ+8hiHRqaXqdVtohjjxA 3PoSImN5oWTaXevXQLdM6PuCQXxd3vA/AXNGzhJg1xVFgHqDrllG+c+2ZCPlOUNVP+yl 2UrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691417703; x=1692022503; 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=X/w5zGGD6SHkOP7v5SHS3xtl4KTjeE4lZxWSUPY+4gA=; b=a50QoFeQOoA0ejt2LM3THUssUuofYZVVtYpZ4jHih0k80V2i2ul78bQg3AuvLwmHwa of1AyJ6PxFZjnjPlxpgv6E2bDPWJTVI9+pWMszjIfEOSb7dzhsQGmbO7+a6vBLH0xRe1 K5JMH5xNCM1ICms5gg+OgCF1A1RT38saMGpCD6g8NGAgDEj6I25VYt7q439IdkrF8V1p PVq4JiDxq2ItZX7j64QyUExwLxVnWkcxzG3t6UCu+g81x5AjGq3D+vZ7IW1AZ8qticW9 bWXiNFrJy6pB8KxIy1wXIBIzBc8JvdirWznuGbT9yHRi38ZVXIyCBJUpH/PWtZHZ75Tx NgSQ== X-Gm-Message-State: AOJu0YwoeEhSCqhBTp2QGSHNMY4/1U7pIba1Pqjc2bNrJCeHBt9EvzIO a+Z1gw4vcyIoh+Dhg170+rhkwWWsR7c= X-Google-Smtp-Source: AGHT+IGdGqmo5E8rqL1JQq4EXMSsnUw6KYyMAJFuyeOTKeOFPRQz6vFUOdjww15wZzz/sGa5kMNmcg== X-Received: by 2002:a17:902:db06:b0:1b2:1a79:147d with SMTP id m6-20020a170902db0600b001b21a79147dmr10846789plx.2.1691417703209; Mon, 07 Aug 2023 07:15:03 -0700 (PDT) Received: from mac.gemmaro.name (ONI-202-70-254-104.oninet.ne.jp. [202.70.254.104]) by smtp.gmail.com with ESMTPSA id ja4-20020a170902efc400b001b8013ed362sm6985191plb.96.2023.08.07.07.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 07:15:02 -0700 (PDT) From: gemmaro To: 64983@debbugs.gnu.org Subject: [PATCH v2 3/4] gnu: highlight: Add gui output. Date: Mon, 7 Aug 2023 23:05:41 +0900 Message-ID: <86cfa707151d8ed32b9acaff3894c182747b8e3f.1691417142.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64983 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/pretty-print.scm (highlight): Add gui output. [source]: Add patch for GUI data directory. [outputs]: Add gui. [arguments]{fix-search-for-lua}: Fix Lua package name for GUI. {build-gui}: Add phase to build GUI. {install}: Set PREFIX variable. {install-gui}: Add phase to install GUI. [inputs]: Add qtbase-5. * gnu/packages/patches/highlight-gui-data-dir.patch: Add patch for GUI data directory. --- .../patches/highlight-gui-data-dir.patch | 51 ++++++++++++++ gnu/packages/pretty-print.scm | 66 ++++++++++++++----- 2 files changed, 102 insertions(+), 15 deletions(-) create mode 100644 gnu/packages/patches/highlight-gui-data-dir.patch diff --git a/gnu/packages/patches/highlight-gui-data-dir.patch b/gnu/packages/patches/highlight-gui-data-dir.patch new file mode 100644 index 0000000000..33f40d309c --- /dev/null +++ b/gnu/packages/patches/highlight-gui-data-dir.patch @@ -0,0 +1,51 @@ +This patch distinguishes between the data directory path for GUI and the one +for non-GUI by allowing to set the former path. + +highlight package has two outputs: out and gui. Both outputs have files which +will be in the same directory /share/highlight/ without this patch (see also +install and install-gui tasks in makefile). In the gui's data directory, +there are GUI specific files in /share/highlight/gui-files/{l10n,ext}/. + +diff --git a/src/gui-qt/main.cpp b/src/gui-qt/main.cpp +index 4700dc1..3567745 100644 +--- a/src/gui-qt/main.cpp ++++ b/src/gui-qt/main.cpp +@@ -47,8 +47,8 @@ int main(int argc, char *argv[]) + { + QApplication app(argc, argv); + QTranslator translator; +-#ifdef DATA_DIR +- translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(DATA_DIR).arg(QLocale::system().name())); ++#ifdef GUI_DATA_DIR ++ translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(GUI_DATA_DIR).arg(QLocale::system().name())); + #else + translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(QDir::currentPath()).arg(QLocale::system().name())); + #endif +diff --git a/src/gui-qt/mainwindow.cpp b/src/gui-qt/mainwindow.cpp +index 3a21ad2..f060431 100644 +--- a/src/gui-qt/mainwindow.cpp ++++ b/src/gui-qt/mainwindow.cpp +@@ -2131,8 +2131,8 @@ QString MainWindow::getDistFileFilterPath(){ + #ifdef Q_OS_OSX + return QCoreApplication::applicationDirPath()+"/../Resources/gui_files/ext/fileopenfilter.conf"; + #else +- #ifdef DATA_DIR +- return QString(DATA_DIR) + "/gui_files/ext/fileopenfilter.conf"; ++ #ifdef GUI_DATA_DIR ++ return QString(GUI_DATA_DIR) + "/gui_files/ext/fileopenfilter.conf"; + #else + return QDir::currentPath()+"/gui_files/ext/fileopenfilter.conf"; + #endif +diff --git a/src/makefile b/src/makefile +index b1d7988..2963105 100644 +--- a/src/makefile ++++ b/src/makefile +@@ -118,7 +118,7 @@ gui-qt: highlight-gui + + highlight-gui: libhighlight.a ${GUI_OBJECTS} + cd gui-qt && \ +- ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \ ++ ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" GUI_DATA_DIR=\\\"${GUI_DATA_DIR}\\\" ' && \ + $(MAKE) + + $(OBJECTFILES) : makefile diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 1b2cf4becf..f8763b7b74 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -52,7 +52,8 @@ (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 swig)) + #:use-module (gnu packages swig) + #:use-module (gnu packages qt)) (define-public a2ps (package @@ -352,13 +353,15 @@ (define-public highlight (package (name "highlight") (version "4.7") + (outputs (list "out" "gui")) (source (origin (method url-fetch) (uri (string-append "http://www.andre-simon.de/zip/highlight-" version ".tar.bz2")) (sha256 (base32 - "1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1")))) + "1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1")) + (patches (search-patches "highlight-gui-data-dir.patch")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;no tests @@ -371,17 +374,44 @@ (define-public highlight (delete 'configure) ;no configure script (add-after 'unpack 'fix-search-for-lua (lambda _ - (substitute* "src/makefile" - (("(LUA_PKG_NAME=).*" _ assignment) - (string-append assignment "lua-" - #$(version-major+minor (package-version - lua)) - "\n"))) - (substitute* "extras/swig/makefile" - (("lua") - (string-append "lua-" - #$(version-major+minor (package-version - lua))))))) + (let ((ver #$(version-major+minor (package-version + lua)))) + (substitute* "src/makefile" + (("(LUA_PKG_NAME=).*" _ assignment) + (string-append assignment "lua-" ver "\n"))) + (substitute* "src/gui-qt/highlight.pro" + (("(PKGCONFIG \\+= lua)" _ assignment) + (string-append assignment "-" ver))) + (substitute* "extras/swig/makefile" + (("lua") + (string-append "lua-" ver)))))) + (add-after 'build 'build-gui + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (data (string-append out + "/share/highlight/")) + (conf (string-append out "/etc/highlight/")) + (doc (string-append out + "/share/doc/highlight/")) + (gui (assoc-ref outputs "gui")) + (gui-data (string-append gui + "/share/highlight/"))) + ;; modified version of gui task in makefile + (invoke "make" + "-C" + "./src" + "-f" + "./makefile" + (string-append "HL_DATA_DIR=" data) + (string-append "HL_CONFIG_DIR=" conf) + (string-append "HL_DOC_DIR=" doc) + (string-append "GUI_DATA_DIR=" gui-data) + "gui-qt")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "make" "install" + (string-append "PREFIX=" out))))) (add-after 'install 'install-perl-bindings (lambda* (#:key outputs #:allow-other-keys) (let* ((perldir (string-append (assoc-ref outputs @@ -394,8 +424,14 @@ (define-public highlight (invoke "make" "perl") (invoke "perl" "-I" "." "testmod.pl") (install-file "highlight.pm" perldir) - (install-file "highlight.so" autodir)))))))) - (inputs (list lua boost perl)) + (install-file "highlight.so" autodir))))) + (add-after 'install 'install-gui + (lambda* (#:key outputs #:allow-other-keys) + (let ((gui (assoc-ref outputs "gui"))) + (mkdir-p (string-append gui "/bin")) + (invoke "make" "install-gui" + (string-append "PREFIX=" gui)))))))) + (inputs (list lua boost perl qtbase-5)) (native-inputs (list pkg-config swig)) (home-page "http://www.andre-simon.de/doku/highlight/en/highlight.php") (synopsis "Convert code to documents with syntax highlighting") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 07 10:15:16 2023 Received: (at 64983) by debbugs.gnu.org; 7 Aug 2023 14:15:16 +0000 Received: from localhost ([127.0.0.1]:34045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10u-0004jF-2b for submit@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:16 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:55681) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10o-0004i6-JB for 64983@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:13 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1bc6624623cso13170605ad.3 for <64983@debbugs.gnu.org>; Mon, 07 Aug 2023 07:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691417705; x=1692022505; 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=bPNvXKWLEeZRjRG1IRFUOTOq92j4GtqqoHdo3KWOvyc=; b=WP0hlk3bs0yCSxIfilohLup6892udWsvG/cc4w1H4a/VsjU9aj0l0H9IloCgW4bxd3 qh8zaIiu9bvtGn4227wnC5HaijpTA8ii/XpFA56c7imGNo8k1vJP4U1XS/qldi/gr5Zg 594DYnp3uk8qaf6ilZWhe0HGut3h/LNAv1FGK2OjF/W9VLPv0fNcdj/JWocQVmo1Bq+G 5buEGaIOw0Op8TjV/LmXYmqQ+AUDBZpnkUSAS/ckQd589VFq5TsRC+tv+9b6mv37FQa+ HMfYWPs/3MhJewZLYyZDE35etZftQDSLcYTI8WTelp/6yhKbB4wv7q7CsP4x9AbFvNYY eDFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691417705; x=1692022505; 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=bPNvXKWLEeZRjRG1IRFUOTOq92j4GtqqoHdo3KWOvyc=; b=Ab+yn9aeCa4+qiJHdH9jBb3d0fYyRKHP7jvpgVDEiOgCHPx8M96uFnc3ktG5eXhIFp +zUrq6VCOocB6Bdfse2PhlX2gBJDKFJ/zOcE++ZbDKpAkAE+oNuVqHAtgV26zhYg3YAk vf1G+xnUc/mF+RgxlIVbk+A6fh+bqHtaiE5Px6EVKqJugxs1X1Kz0pdvasrOBx8WYodS CP76GnMziYMlxiWrkhtIHGWE6erTXejKBItR4CK4Kq2CiwaEhFXSFkTUKRz343IDusVQ LyNfcUkfzJ/7oPt+CKk9M4OSH5QLQWvbfoApJHVFnfgCsMRyo+SsPG/jB8SncPzHmca+ 2+bg== X-Gm-Message-State: AOJu0Yw5WqLuW4Tz5K5xq3b02OhdmRACvy/GCwz+FDoue2nF3HqOUU8D vwbRX2qYGvLo0SmBYQbzCFW4U4yYv/o= X-Google-Smtp-Source: AGHT+IGOJvzC1W26Zzk+tAKS7NjbmZudM1D7/dxlDsCU9VWpCN9cc9QA7USqGjZCiamRSMOgJLR7Rw== X-Received: by 2002:a17:902:bb82:b0:1b8:8223:8bdd with SMTP id m2-20020a170902bb8200b001b882238bddmr8778212pls.59.1691417704824; Mon, 07 Aug 2023 07:15:04 -0700 (PDT) Received: from mac.gemmaro.name (ONI-202-70-254-104.oninet.ne.jp. [202.70.254.104]) by smtp.gmail.com with ESMTPSA id ja4-20020a170902efc400b001b8013ed362sm6985191plb.96.2023.08.07.07.15.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 07:15:04 -0700 (PDT) From: gemmaro To: 64983@debbugs.gnu.org Subject: [PATCH v2 4/4] gnu: highlight: Fix paths for Perl bindings. Date: Mon, 7 Aug 2023 23:05:42 +0900 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64983 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/pretty-print.scm (highlight): Fix paths for Perl bindings. [arguments]: Set hl_data_dir and hl_conf_dir in install-perl-bindings phase. --- gnu/packages/pretty-print.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index f8763b7b74..5d15b160f3 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -414,14 +414,19 @@ (define-public highlight (string-append "PREFIX=" out))))) (add-after 'install 'install-perl-bindings (lambda* (#:key outputs #:allow-other-keys) - (let* ((perldir (string-append (assoc-ref outputs - "out") + (let* ((out (assoc-ref outputs "out")) + (data (string-append out + "/share/highlight/")) + (conf (string-append out "/etc/highlight/")) + (perldir (string-append out "/lib/perl5/site_perl/" #$(package-version perl))) (autodir (string-append perldir "/auto/highlight"))) (with-directory-excursion "extras/swig" - (invoke "make" "perl") + (invoke "make" "perl" + (string-append "hl_data_dir=" data) + (string-append "hl_conf_dir=" conf)) (invoke "perl" "-I" "." "testmod.pl") (install-file "highlight.pm" perldir) (install-file "highlight.so" autodir))))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 14 18:26:30 2023 Received: (at 64983-done) by debbugs.gnu.org; 14 Aug 2023 22:26:30 +0000 Received: from localhost ([127.0.0.1]:34548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVg18-0004xT-GB for submit@debbugs.gnu.org; Mon, 14 Aug 2023 18:26:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVg16-0004xH-WA for 64983-done@debbugs.gnu.org; Mon, 14 Aug 2023 18:26:29 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qVg11-0006x2-Oy; Mon, 14 Aug 2023 18:26:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=Hgvh0HTcYTvWdzbLtrtdfdXvKmtBJHVjnHcKnrvfxdU=; b=ALTDYi7J0B67oYCHcGHY ifcOj6OHOMSDRUZwRN5nmixG/gcYz/5/TCXIdUq1GglBTfu2WPy0jAjio3WhQ5V61msEdSXQ3V8ms yA79C7lQWahtf+n06ae1o8dvGgoGqmjQyLuhkOJaysHytEpChJXh/llB1VKxWcQ5dYQiP3A+jcvc7 rGYZd0udeJMRWYPcwbUkOM1a5XrUJOJapZO5vDMRKSiM/RsqDQXv0ukRfOcYVChdi2cA11Ygwkyj6 02f6SU4vnZgqgMASnvmP/WC8cVdZ5OBObqnOv51BJqyD4x106rSDhiKhgHLv/3u8DGSdVP4WBIz0r /sYz+46sJm2Ccw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: gemmaro Subject: Re: bug#64983: [PATCH 0/3] gnu: highlight: Update to 4.7 and add GUI package. References: Date: Tue, 15 Aug 2023 00:26:21 +0200 In-Reply-To: (gemmaro's message of "Mon, 7 Aug 2023 23:05:38 +0900") Message-ID: <87o7j99s6q.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64983-done Cc: 64983-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, gemmaro skribis: > gnu: highlight: Update to 4.7. > gnu: highlight: Use new package style. > gnu: highlight: Add gui output. > gnu: highlight: Fix paths for Perl bindings. I applied the whole series, adding the patch to =E2=80=98gnu/local.mk=E2=80= =99. Thanks, Ludo=E2=80=99. From unknown Wed Jun 18 23:03:37 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 12 Sep 2023 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator