Re: [PR PATCH] [Updated] bootchart2: conflict with bootchart

[voidlinux-github@inbox.vuxu.org]

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

There is an updated pull request by Flex1911 against master on the void-packages repository

https://github.com/Flex1911/void-packages master
https://github.com/void-linux/void-packages/pull/12818

bootchart2: conflict with bootchart
Both packages are sharing multiple files and should never be installed together.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-12818.patch --]
[-- Type: application/text/x-diff, Size: 2315 bytes --]

From e47ef16129bab37c4d6fa1bfd0f55b07e8aa561e Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:51:00 +0400
Subject: [PATCH 1/2] bootchart2: fix wrksrc placement

Signed-off-by: Artem Borisov <dedsa2002@gmail.com>
---
 srcpkgs/bootchart2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 96a48364a45..ac03d7fecb4 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -2,6 +2,8 @@
 pkgname=bootchart2
 version=0.14.8.20170531
 revision=1
+_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
+wrksrc="bootchart-${_gitrev}"
 build_style=gnu-makefile
 make_install_args="EARLY_PREFIX=/usr"
 makedepends="python"
@@ -10,7 +12,5 @@ short_desc="Startup graphing tool"
 maintainer="Benjamin Hoffmeyer <hoffmeyer25@gmail.com>"
 license="GPL-2"
 homepage="https://github.com/xrmx/bootchart"
-_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
 distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
-wrksrc="bootchart-${_gitrev}"

From 52a007e3fb5fb3d0a675f422fe4c4d2a8b696d94 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:29:33 +0400
Subject: [PATCH 2/2] bootchart2: conflict with bootchart

Both packages are sharing multiple files and should never be installed together.

Signed-off-by: Artem Borisov <dedsa2002@gmail.com>
---
 srcpkgs/bootchart2/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index ac03d7fecb4..825eb074e86 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -1,7 +1,7 @@
 # Template file for 'bootchart2'
 pkgname=bootchart2
 version=0.14.8.20170531
-revision=1
+revision=2
 _gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
 wrksrc="bootchart-${_gitrev}"
 build_style=gnu-makefile
@@ -14,3 +14,4 @@ license="GPL-2"
 homepage="https://github.com/xrmx/bootchart"
 distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
+conflicts="bootchart>=0"