Github messages for voidlinux
 help / color / mirror / Atom feed
From: kruceter <kruceter@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] profile-cleaner: resolve conflict with pc
Date: Thu, 29 Dec 2022 10:51:53 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41342@inbox.vuxu.org> (raw)

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

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

https://github.com/kruceter/void-packages profile-cleaner
https://github.com/void-linux/void-packages/pull/41342

profile-cleaner: resolve conflict with pc
Makefile shipped with the package shortens profile-cleaner to pc, thus causing conflict with the 'pc' package.

Discovered in #41298.

#### Testing the changes
- I tested the changes in this PR: **briefly**

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-profile-cleaner-41342.patch --]
[-- Type: text/x-diff, Size: 1392 bytes --]

From 07ad80adc5e72b699748dc1dbfc4b193cf3b438f Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 29 Dec 2022 12:45:46 +0300
Subject: [PATCH] profile-cleaner: resolve conflict with pc

Makefile shipped with the package shortens profile-cleaner to pc, thus
causing conflict with the 'pc' package.
---
 srcpkgs/profile-cleaner/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/profile-cleaner/template b/srcpkgs/profile-cleaner/template
index 1ed480d7ebd7..7d0df51cb8cb 100644
--- a/srcpkgs/profile-cleaner/template
+++ b/srcpkgs/profile-cleaner/template
@@ -1,7 +1,7 @@
 # Template file for 'profile-cleaner'
 pkgname=profile-cleaner
 version=2.42
-revision=1
+revision=2
 build_style=gnu-makefile
 depends="bash sqlite bc parallel findutils"
 short_desc="Reduces profile size by cleaning their sqlite databases"
@@ -11,6 +11,11 @@ homepage="https://github.com/graysky2/profile-cleaner"
 distfiles="https://github.com/graysky2/profile-cleaner/archive/v${version}.tar.gz"
 checksum=427d3c9aa0ab7cd1031a40e6da507027bd3ce4bc80a504a9dbeee536e864e9e1
 
-post_install() {
+do_install() {
+	# makefile shipped with the package shortens profile-cleaner to pc,
+	# thus causing conflict with the 'pc' package.
+	vbin common/profile-cleaner
+	vcompletion common/zsh-completion zsh
+	vman doc/pc.1 profile-cleaner.1
 	vlicense LICENSE
 }

             reply	other threads:[~2022-12-29  9:51 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-29  9:51 kruceter [this message]
2022-12-29 10:28 ` [PR PATCH] [Updated] " kruceter
2022-12-29 10:31 ` kruceter
2023-01-02 20:33 ` [PR PATCH] [Merged]: " paper42

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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41342@inbox.vuxu.org \
    --to=kruceter@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).