Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] source-highlight: correct reference to lesspipe.sh
@ 2020-05-18 15:54 ahesford
  2020-05-20 19:46 ` [PR PATCH] [Merged]: " Hoshpak
  0 siblings, 1 reply; 2+ messages in thread
From: ahesford @ 2020-05-18 15:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 646 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages source-highlight
https://github.com/void-linux/void-packages/pull/22088

source-highlight: correct reference to lesspipe.sh
The script `src-hilite-lesspipe.sh` installed by `source-highlight` excpects to find an executable named `lesspipe` as a helper. The `lesspipe` package installs this helper as `lesspipe.sh`, so the `source-highlight` template has been modified to replace the `lesspipe` invocation with `lesspipe.sh`.

A patch file from https://github.com/void-linux/void-packages/pull/22088.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-source-highlight-22088.patch --]
[-- Type: text/x-diff, Size: 1149 bytes --]

From 54069acfd8329de82ce3b7e4538d6b607a648652 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 18 May 2020 11:52:02 -0400
Subject: [PATCH] source-highlight: correct reference to lesspipe.sh

---
 srcpkgs/source-highlight/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template
index 087b8a3ad03..ab56401c64a 100644
--- a/srcpkgs/source-highlight/template
+++ b/srcpkgs/source-highlight/template
@@ -1,7 +1,7 @@
 # Template file for 'source-highlight'
 pkgname=source-highlight
 version=3.1.9
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost=${XBPS_CROSS_BASE}/usr
  --with-bash-completion=/usr/share/bash-completion/completions"
@@ -17,6 +17,11 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="source-highlight"
 fi
 
+post_patch() {
+	# On Void, lesspipe is installed as lesspipe.sh
+	vsed -e 's/\blesspipe\b/&.sh/g' -i src/src-hilite-lesspipe.sh.in
+}
+
 post_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		sed -e 's,SRCHILITEEXE =.*,SRCHILITEEXE = source-highlight,g' -i doc/Makefile

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: source-highlight: correct reference to lesspipe.sh
  2020-05-18 15:54 [PR PATCH] source-highlight: correct reference to lesspipe.sh ahesford
@ 2020-05-20 19:46 ` Hoshpak
  0 siblings, 0 replies; 2+ messages in thread
From: Hoshpak @ 2020-05-20 19:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 484 bytes --]

There's a merged pull request on the void-packages repository

source-highlight: correct reference to lesspipe.sh
https://github.com/void-linux/void-packages/pull/22088

Description:
The script `src-hilite-lesspipe.sh` installed by `source-highlight` excpects to find an executable named `lesspipe` as a helper. The `lesspipe` package installs this helper as `lesspipe.sh`, so the `source-highlight` template has been modified to replace the `lesspipe` invocation with `lesspipe.sh`.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-05-20 19:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-18 15:54 [PR PATCH] source-highlight: correct reference to lesspipe.sh ahesford
2020-05-20 19:46 ` [PR PATCH] [Merged]: " Hoshpak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).