[arch-commits] Commit in cage/trunk (PKGBUILD)

[David Runge]

    Date: Saturday, January 25, 2020 @ 20:09:33
  Author: dvzrv
Revision: 555551

upgpkg: cage 0.1.1.r40.gcc1f975-1: Upgrading to 0.1.1.r40.gcc1f975 to be able to build against wlroots >= 0.9. Rebuilding against wlroots 0.10.0.

Modified:
  cage/trunk/PKGBUILD

----------+
 PKGBUILD |   27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-25 20:07:20 UTC (rev 555550)
+++ PKGBUILD	2020-01-25 20:09:33 UTC (rev 555551)
@@ -1,21 +1,29 @@
-# Maintainer: David Runge <dave at sleepmap.de>
+# Maintainer: David Runge <dvzrv at archlinux.org>
 
 pkgname=cage
-pkgver=0.1.1
-pkgrel=2
+pkgver=0.1.1.r40.gcc1f975
+pkgrel=1
 pkgdesc="A kiosk compositor for Wayland"
 arch=('x86_64')
 url="https://www.hjdskes.nl/projects/cage/"
 license=('MIT')
-depends=('glibc' 'libxkbcommon' 'pixman' 'wayland' 'wlroots')
-makedepends=('meson' 'wayland-protocols' 'xorg-server-xwayland')
+depends=('glibc' 'libxkbcommon' 'pixman' 'wayland')
+makedepends=('git' 'meson' 'wayland-protocols' 'wlroots' 'xorg-server-xwayland')
 optdepends=('xorg-server-xwayland: X11 support')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/Hjdskes/${pkgname}/archive/v${pkgver}.tar.gz"
-        "https://github.com/Hjdskes/cage/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz.sig")
-sha512sums=('f071f04f1ff7d2b89ae72238ef1a28fd3fbc389803e4a4fe0c3d938c7a2a1cc962b63929d081d975f98131ff6dd9637762e8036bb320277e2580f0cbeb0c6201'
-            'SKIP')
+# cage 0.1.1 not compatible with wlroots > 0.8.1
+# therefore pinning current HEAD to be able to upgrade wlroots
+# https://github.com/Hjdskes/cage/issues/107
+# source=("$pkgname-$pkgver.tar.gz::https://github.com/Hjdskes/${pkgname}/archive/v${pkgver}.tar.gz"
+#         "https://github.com/Hjdskes/cage/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz.sig")
+source=("${pkgname}-${pkgver}::git+https://github.com/Hjdskes/${pkgname}.git#commit=cc1f975?signed")
+sha512sums=('SKIP')
 validpgpkeys=('13B6A35E9FD677D02CD68DBE37C445296EBC43B1') # Jente Hidskes <dev at hjdskes.nl>
 
+pkgver() {
+  cd "$pkgname-$pkgver"
+  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 build() {
   cd "$pkgname-$pkgver"
   arch-meson --prefix=/usr \
@@ -27,6 +35,7 @@
 }
 
 package() {
+  depends+=('libwlroots.so')
   cd "$pkgname-$pkgver"
   DESTDIR="${pkgdir}" meson install -C build
   #docs