From 7722c6c650a1839e2c3d16d39959c149d3e448b0 Mon Sep 17 00:00:00 2001 From: KF-Art Date: Fri, 26 Aug 2022 11:27:32 -0400 Subject: [PATCH] Update all picom forks templates Now all picom forks conflicts between them in order to avoid installing two or more at the same time. --- srcpkgs/picom-dccsillag/template | 3 ++- srcpkgs/picom-ibhagwan/template | 5 +++-- srcpkgs/picom-jonaburg-fix/template | 7 +++++-- srcpkgs/picom-jonaburg/template | 7 +++++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/srcpkgs/picom-dccsillag/template b/srcpkgs/picom-dccsillag/template index 6f41b92..8f103fb 100644 --- a/srcpkgs/picom-dccsillag/template +++ b/srcpkgs/picom-dccsillag/template @@ -1,6 +1,6 @@ # Template file for 'picom-dccsillag' pkgname=picom-dccsillag -version=20220413 +version=20220529 revision=1 build_style=meson configure_args="-Dwith_docs=true" @@ -15,6 +15,7 @@ maintainer="Kevin F. " license="MIT, MPL-2.0" repository="cereus-extra" homepage="https://github.com/dccsillag/picom/" +provides="picom" conflicts="picom picom-jonaburg picom-jonaburg-fix picom-ibhagwan" replaces="picom picom-jonaburg picom-jonaburg-fix picom-ibhagwan" distfiles="https://github.com/dccsillag/picom/archive/refs/heads/implement-window-animations.zip" diff --git a/srcpkgs/picom-ibhagwan/template b/srcpkgs/picom-ibhagwan/template index a76f1df..3401c01 100644 --- a/srcpkgs/picom-ibhagwan/template +++ b/srcpkgs/picom-ibhagwan/template @@ -1,7 +1,7 @@ # Template file for 'picom-ibhagwan' pkgname=picom-ibhagwan version=20220417 -revision=2 +revision=3 wrksrc=picom build_style=meson repository="cereus-extra" @@ -16,7 +16,8 @@ maintainer="Kevin F. " license="MIT, MPL-2.0" homepage="https://github.com/ibhagwan/picom/" provides="picom" -conflicts="picom, picom-jonaburg" +conflicts="picom picom-jonaburg picom-jonaburg-fix picom-dccsillag" +replaces="picom picom-jonaburg picom-jonaburg-fix picom-dccsillag" do_fetch() { git clone --single-branch --branch next-rebase --depth=1 ${homepage} ${wrksrc} diff --git a/srcpkgs/picom-jonaburg-fix/template b/srcpkgs/picom-jonaburg-fix/template index 569c6cd..128f263 100644 --- a/srcpkgs/picom-jonaburg-fix/template +++ b/srcpkgs/picom-jonaburg-fix/template @@ -1,7 +1,7 @@ # Template file for 'picom-jonaburg-fix' pkgname=picom-jonaburg-fix version=20220417 -revision=1 +revision=2 wrksrc=picom build_style=meson repository="cereus-extra" @@ -15,9 +15,12 @@ short_desc="Picom fork which includes rounded corners, animations and blur suppo maintainer="Kevin F. " license="MIT, MPL-2.0" homepage="https://github.com/Arian8j2/picom-jonaburg-fix" +provides="picom" +conflicts="picom picom-jonaburg picom-dccsillag picom-ibhagwan" +replaces="picom picom-jonaburg picom-dccsillag picom-ibhagwan" case "$XBPS_TARGET_MACHINE" in - *-musl) broken="For Musl platforms it's recommended to use picom-ibhagwan fork instead";; + *-musl) broken="Cannot build on musl. It's recommended to use picom-dccsillag instead" ;; esac do_fetch() { diff --git a/srcpkgs/picom-jonaburg/template b/srcpkgs/picom-jonaburg/template index 38feb69..40ab0a6 100644 --- a/srcpkgs/picom-jonaburg/template +++ b/srcpkgs/picom-jonaburg/template @@ -1,7 +1,7 @@ # Template file for 'picom-jonaburg' pkgname=picom-jonaburg version=2022.03.19 -revision=1 +revision=2 wrksrc=picom build_style=meson repository="cereus-extra" @@ -15,9 +15,12 @@ short_desc="Picom fork which includes rounded corners, basic animations and blur maintainer="Kevin F. " license="MIT, MPL-2.0" homepage="https://github.com/jonaburg/picom" +provides="picom" +conflicts="picom picom-dccsillag picom-jonaburg-fix picom-ibhagwan" +replaces="picom picom-dccsillag picom-jonaburg-fix picom-ibhagwan" case "$XBPS_TARGET_MACHINE" in - *-musl) broken="For Musl platforms it's recommended to use picom-ibhagwan fork instead";; + *-musl) broken="Cannot build on musl. It's recommended to use picom-dccsillag instead" ;; esac do_fetch() {