Andreas Radke pushed to branch main at Arch Linux / Packaging / Packages / cage
Commits:
3a0a0ef2 by Andreas Radke at 2024-06-27T16:30:29+02:00
upgpkg: 0.1.5+r36+ge7d8780-1;
- build last git commit - updates to wlroots 0.17 support
- add virtual provider "wayland-compositor" to allow easy replacements
in use with reetd-regreet (regreet issue #1)
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = cage
pkgdesc = A kiosk compositor for Wayland
- pkgver = 0.1.5
- pkgrel = 2
+ pkgver = 0.1.5+r36+ge7d8780
+ pkgrel = 1
url = https://www.hjdskes.nl/projects/cage/
install = cage.install
arch = x86_64
@@ -9,16 +9,16 @@ pkgbase = cage
makedepends = git
makedepends = libxkbcommon
makedepends = meson
- makedepends = pixman
makedepends = scdoc
makedepends = wayland-protocols
makedepends = xorg-server-xwayland
depends = glibc
depends = wayland
- depends = wlroots0.16
+ depends = wlroots
optdepends = polkit: System privilege control. Required if not using
seatd service
optdepends = xorg-server-xwayland: X11 support
- source = cage::git+https://github.com/Hjdskes/cage.git#tag=v0.1.5?signed
+ provides = wayland-compositor
+ source =
git+https://github.com/cage-kiosk/cage.git#commit=e7d8780f46277af87881e0be91cb2092541bb1d5
validpgpkeys = 13B6A35E9FD677D02CD68DBE37C445296EBC43B1
validpgpkeys = 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
sha512sums = SKIP
@@ -26,7 +26,6 @@ pkgbase = cage
pkgname = cage
depends = glibc
depends = wayland
- depends = wlroots0.16
- depends = libwlroots.so=11
+ depends = wlroots
+ depends = libwlroots.so
depends = libxkbcommon.so
- depends = libpixman-1.so
=====================================
PKGBUILD
=====================================
@@ -2,20 +2,23 @@
# Contributor: David Runge <[email protected]>
pkgname=cage
-pkgver=0.1.5
-pkgrel=2
+pkgver=0.1.5+r36+ge7d8780
+_commit=e7d8780f46277af87881e0be91cb2092541bb1d5 # master # 2024-02-26
+pkgrel=1
pkgdesc="A kiosk compositor for Wayland"
arch=(x86_64)
url="https://www.hjdskes.nl/projects/cage/";
license=(MIT)
-depends=(glibc wayland wlroots0.16)
-makedepends=(git libxkbcommon meson pixman scdoc wayland-protocols
-xorg-server-xwayland)
+depends=('glibc' 'wayland' 'wlroots')
+makedepends=(git libxkbcommon meson scdoc wayland-protocols
xorg-server-xwayland)
+provides=('wayland-compositor')
optdepends=(
'polkit: System privilege control. Required if not using seatd service'
'xorg-server-xwayland: X11 support'
)
-source=("${pkgname}::git+https://github.com/Hjdskes/${pkgname}.git#tag=v${pkgver}?signed";)
+source=(#"${pkgname}::git+https://github.com/Hjdskes/${pkgname}.git#tag=v${pkgver}?signed";
+ "git+https://github.com/cage-kiosk/cage.git#commit=$_commit";
+)
install=cage.install
sha512sums=('SKIP')
validpgpkeys=(
@@ -23,9 +26,17 @@ validpgpkeys=(
'34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # Simon Ser
<[email protected]>
)
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^v//;s/-/+r/;s/-/+/'
+}
+
+
build() {
- export PKG_CONFIG_PATH='/usr/lib/wlroots0.16/pkgconfig'
- arch-meson -Dxwayland=true build "$pkgname"
+ arch-meson "$pkgname" build \
+ -Dxwayland=enabled
+ # Print config
+ meson configure build
ninja -C build
}
@@ -34,9 +45,10 @@ check() {
}
package() {
- depends+=(libwlroots.so=11 libxkbcommon.so libpixman-1.so)
+ depends+=(libwlroots.so libxkbcommon.so)
- DESTDIR="${pkgdir}" meson install -C build
+ # DESTDIR="${pkgdir}" meson install -C build
+ DESTDIR="${pkgdir}" ninja -C build install
install -vDm 644 "$pkgname/README.md" -t "${pkgdir}/usr/share/doc/${pkgname}"
install -vDm 644 "$pkgname/LICENSE" -t
"${pkgdir}/usr/share/licenses/${pkgname}"
}
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cage/-/commit/3a0a0ef2824e21117f7c36ac778fae041b0a635d
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cage/-/commit/3a0a0ef2824e21117f7c36ac778fae041b0a635d
You're receiving this email because of your account on gitlab.archlinux.org.
