summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian POIDEVIN2023-05-14 19:54:47 +0200
committerJulian POIDEVIN2023-05-14 19:54:47 +0200
commitf5253bc029922fe932af61377446f697c6ee8325 (patch)
treecd5ae655692e4bfc91f977d2ce72cfaa32596e79
parent78ad0f3cb422239199feb7dbf1afe96886b825fa (diff)
downloadaur-f5253bc029922fe932af61377446f697c6ee8325.tar.gz
remove hyprland-git from conflicts list
-rw-r--r--.SRCINFO3
-rwxr-xr-xPKGBUILD4
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5ffa7a5dbb80..b36e80943edf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = hyprland-displaylink-git
pkgdesc = A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks. (DisplayLink patch)
pkgver = 0.25.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/hyprwm/Hyprland
arch = any
license = BSD
@@ -46,7 +46,6 @@ pkgbase = hyprland-displaylink-git
depends = libdisplay-info
provides = hyprland
conflicts = hyprland
- conflicts = hyprland-git
options = !makeflags
options = !buildflags
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 585f5c2ae596..6c1b1967bb0b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname="hyprland"
pkgname="${_pkgname}-displaylink-git"
pkgver="0.25.0"
-pkgrel=1
+pkgrel=2
pkgdesc="A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks. (DisplayLink patch)"
arch=(any)
url="https://github.com/hyprwm/Hyprland"
@@ -51,7 +51,7 @@ makedepends=(
xorgproto)
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/hyprwm/Hyprland/releases/download/v${pkgver}/source-v${pkgver}.tar.gz"
"displaylink.patch")
-conflicts=("${_pkgname}" "${_pkgname}"-git)
+conflicts=("${_pkgname}")
provides=(hyprland)
sha256sums=('0d43297469268457311a916ea3c40bed602c8c8957db81cf862d74c3d5ffbe6b'
'444bcd0f95ea7955a02da1a99481f33da6f7a4c4d0e6b06d3c3bda8133671484')