From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Fix imv and renameutils man page conflict
Date: Fri, 11 Dec 2020 19:41:03 +0100 [thread overview]
Message-ID: <20201211184103.lW5sccHF43Eh_N9f3BiCeXCQzESkrwXRWaoCP0hPg6g@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22872@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages imv-man
https://github.com/void-linux/void-packages/pull/22872
Fix imv and renameutils man page conflict
Unfortunately the packages have the `imv` binary in common, so we can't make them not conflict at all. This fix is for man.voidlinux.org, instead.
Fixes #22856
A patch file from https://github.com/void-linux/void-packages/pull/22872.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imv-man-22872.patch --]
[-- Type: text/x-diff, Size: 1209 bytes --]
From 8e38c9bcc1c7dfe8aa3499b58a8e26086ed344fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 13 Jun 2020 12:26:20 -0300
Subject: [PATCH] imv: create symlinks for man pages.
imv-x11.1: copy of imv.1, to avoid man.voidlinux.org issues where it's
clobbered by imv.1 from renameutils.
imv-wayland.1: symlink to imv-x11.1.
---
srcpkgs/imv/template | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index ab5c45cd3a2..9e57c24dac4 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
# Template file for 'imv'
pkgname=imv
version=4.1.0
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="asciidoc pkg-config"
makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libxkbcommon-devel
@@ -18,5 +18,8 @@ checksum=8c2f1baa4dce8bf1f6d1fb9dea8cf1da09fdf2c6de0f7030e91714df2ebcdf50
conflicts="renameutils>=0"
post_install() {
+ # copy the man page so it isn't clobbered by renameutils in man.voidlinux.org
+ vman "${DESTDIR}/usr/share/man/man1/imv.1" imv-x11.1
+ ln -s imv-x11.1 "${DESTDIR}/usr/share/man/man1/imv-wayland.1"
vlicense LICENSE
}
next prev parent reply other threads:[~2020-12-11 18:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22872@inbox.vuxu.org>
2020-07-14 0:35 ` [PR REVIEW] " ericonr
2020-12-11 18:41 ` ericonr [this message]
2020-12-11 18:52 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201211184103.lW5sccHF43Eh_N9f3BiCeXCQzESkrwXRWaoCP0hPg6g@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).