summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedroHLC2021-05-07 13:58:20 -0300
committerPedroHLC2021-05-07 13:58:20 -0300
commit062fd3e28abde28e657b0df4b360124a1f5f4236 (patch)
treec6825d199c44d10244bd879adb19cbd03a0ac725
parent19a132351299b3cf03bf7e62e958b25002d6802d (diff)
downloadaur-062fd3e28abde28e657b0df4b360124a1f5f4236.tar.gz
Add git as source
-rw-r--r--.SRCINFO33
-rw-r--r--PKGBUILD44
2 files changed, 45 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4a8a633eacc6..f8b38a5dbb47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,34 @@
-pkgbase = yambar
- pkgdesc = Modular status panel for X11 and Wayland, inspired by polybar
- pkgver = 1.6.1
+pkgbase = yambar-git
+ pkgdesc = Modular status panel for X11 and Wayland, inspired by polybar (source from git)
+ pkgver = 1.6.1.r60.g18a0920
pkgrel = 1
url = https://codeberg.org/dnkl/yambar
arch = x86_64
+ arch = aarch64
license = MIT
- makedepends = cmake
makedepends = git
+ makedepends = cmake
makedepends = libmpdclient
makedepends = libyaml
makedepends = meson
makedepends = ninja
makedepends = scdoc
- depends = alsa-lib
- depends = fontconfig
- depends = pixman
- depends = wayland
- depends = wayland-protocols
depends = xcb-util-cursor
+ depends = pixman
depends = xcb-util-wm
depends = xorgproto
- provides = yambar
- source = yambar-1.6.1.tar.gz::https://codeberg.org/dnkl/yambar/archive/1.6.1.tar.gz
- sha256sums = 9ddf0bd7a708445697b4bf2f1d6d0fe5c29c5c7cd6df6058a739fe89413bd2c7
+ depends = wayland
+ depends = wayland-protocols
+ depends = fontconfig
+ depends = alsa-lib
+ provides = yambar=1.6.1.r60.g18a0920
+ conflicts = yambar
+ source = git+https://codeberg.org/dnkl/yambar.git
+ source = git+https://codeberg.org/dnkl/tllist.git
+ source = git+https://codeberg.org/dnkl/fcft.git
+ sha256sums = SKIP
+ sha256sums = SKIP
+ sha256sums = SKIP
+
+pkgname = yambar-git
-pkgname = yambar
diff --git a/PKGBUILD b/PKGBUILD
index 5aa33c08deb1..423f9b82d105 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,12 @@
-# Maintainer: Moritz Poldrack <moritz at poldrack dot dev>
-pkgname=yambar
-pkgver=1.6.1
+# Maintainer: PedroHLC <root@pedrohlc.com>
+# Contributor: Moritz Poldrack <moritz at poldrack dot dev>
+
+_pkgname=yambar
+pkgname="${_pkgname}-git"
+pkgver=1.6.1.r60.g18a0920
pkgrel=1
-pkgdesc='Modular status panel for X11 and Wayland, inspired by polybar'
-arch=('x86_64')
+pkgdesc='Modular status panel for X11 and Wayland, inspired by polybar (source from git)'
+arch=('x86_64' 'aarch64')
url='https://codeberg.org/dnkl/yambar'
license=('MIT')
depends=(
@@ -24,31 +27,34 @@ makedepends=(
'ninja'
'scdoc'
)
-provides=('yambar')
-source=("${pkgname}-${pkgver}.tar.gz::https://codeberg.org/dnkl/${pkgname}/archive/${pkgver}.tar.gz")
-sha256sums=('9ddf0bd7a708445697b4bf2f1d6d0fe5c29c5c7cd6df6058a739fe89413bd2c7')
+provides=("${_pkgname}=$pkgver")
+conflicts=("${_pkgname}")
+source=(
+ 'git+https://codeberg.org/dnkl/yambar.git'
+ 'git+https://codeberg.org/dnkl/tllist.git'
+ 'git+https://codeberg.org/dnkl/fcft.git'
+)
+sha256sums=('SKIP' 'SKIP' 'SKIP')
-prepare() {
- rm -rf "${srcdir}"
- mkdir -p "${srcdir}"
- bsdtar -xf "../${pkgname}-${pkgver}.tar.gz" -C "${srcdir}"
+pkgver() {
+ cd yambar
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+prepare() {
cd yambar
- mkdir subprojects
pushd subprojects
- git clone https://codeberg.org/dnkl/tllist.git
- git clone https://codeberg.org/dnkl/fcft.git
+ ln -s ../../tllist ./
+ ln -s ../../fcft ./
popd
-# sed -ie 's/false/true/' meson_options.txt
-
mkdir -p bld/release && cd bld/release
- meson --buildtype=release --prefix=${pkgdir}/usr/ ../..
+ meson --buildtype=release --prefix="${pkgdir}/usr/" ../..
}
build() {
- cd "${srcdir}/yambar/bld/release"
+ cd yambar/bld/release
ninja
}