[arch-commits] Commit in cage/trunk (PKGBUILD cage-0.1.1-wlroots-0.11.0.patch)

[David Runge]

    Date: Thursday, July 16, 2020 @ 11:11:17
  Author: dvzrv
Revision: 664110

upgpkg: cage 0.1.1.r68.g27391f1-1: Rebuilding against wlroots 0.11.0.

Adding patch for wlroots >= 0.11.0 compatibility on top of the last signed commit available on upstream.

Added:
  cage/trunk/cage-0.1.1-wlroots-0.11.0.patch
Modified:
  cage/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   16 +++++++---
 cage-0.1.1-wlroots-0.11.0.patch |   59 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-16 11:04:46 UTC (rev 664109)
+++ PKGBUILD	2020-07-16 11:11:17 UTC (rev 664110)
@@ -1,9 +1,10 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
 # Maintainer: Brett Cornwall <ainola at archlinux.org>
 
+_commit='27391f174a1fe385899074f13453667b98af8621'
 pkgname=cage
-pkgver=0.1.1.r40.gcc1f975
-pkgrel=2
+pkgver=0.1.1.r68.g27391f1
+pkgrel=1
 pkgdesc="A kiosk compositor for Wayland"
 arch=('x86_64')
 url="https://www.hjdskes.nl/projects/cage/"
@@ -16,8 +17,10 @@
 # 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')
+source=("${pkgname}-${pkgver}::git+https://github.com/Hjdskes/${pkgname}.git#commit=${_commit}?signed"
+        "${pkgname}-0.1.1-wlroots-0.11.0.patch")
+sha512sums=('SKIP'
+            '4273fb848309c329496a61ecc68018e302ec6b7b4b65c8d3a57304b2e1dd95822d08043cf3ec6c6e1673e16d276edb3b7d0c2566da72689e0f6cabe86f2bf96a')
 validpgpkeys=('13B6A35E9FD677D02CD68DBE37C445296EBC43B1') # Jente Hidskes <dev at hjdskes.nl>
 
 pkgver() {
@@ -25,6 +28,11 @@
   git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i "../${pkgname}-0.1.1-wlroots-0.11.0.patch"
+}
+
 build() {
   cd "$pkgname-$pkgver"
   arch-meson --prefix=/usr \

Added: cage-0.1.1-wlroots-0.11.0.patch
===================================================================
--- cage-0.1.1-wlroots-0.11.0.patch	                        (rev 0)
+++ cage-0.1.1-wlroots-0.11.0.patch	2020-07-16 11:11:17 UTC (rev 664110)
@@ -0,0 +1,59 @@
+From 6a12da196068189a6ba390ca5ca3473454a90da7 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich at FreeBSD.org>
+Date: Sat, 9 May 2020 11:39:00 +0000
+Subject: [PATCH 1/3] output: unbreak with wlroots 0.11.0
+
+Port changes changes from
+https://github.com/swaywm/sway/commit/9d0aa0cb8396
+https://github.com/swaywm/sway/commit/40e87fa98afd
+---
+ output.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/output.c b/output.c
+index d6e34aa..96f915c 100644
+--- a/output.c
++++ b/output.c
+@@ -232,10 +232,7 @@ scan_out_primary_view(struct cg_output *output)
+ 		return false;
+ 	}
+ 
+-	if (!wlr_output_attach_buffer(wlr_output, surface->buffer)) {
+-		return false;
+-	}
+-
++	wlr_output_attach_buffer(wlr_output, &surface->buffer->base);
+ 	return wlr_output_commit(wlr_output);
+ }
+ 
+
+From 3575c9180bc09d72545b8c832b5278905fa0b006 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich at FreeBSD.org>
+Date: Wed, 15 Jul 2020 23:30:48 +0000
+Subject: [PATCH 2/3] meson: require wlroots 0.11.0 after 6a12da196068
+
+../output.c:235:57: error: no member named 'base' in 'struct wlr_buffer'
+        wlr_output_attach_buffer(wlr_output, &surface->buffer->base);
+                                              ~~~~~~~~~~~~~~~  ^
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 90bc400..ee6d4c7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -34,7 +34,7 @@ if is_freebsd
+   )
+ endif
+ 
+-wlroots        = dependency('wlroots', version: '>= 0.9.1')
++wlroots        = dependency('wlroots', version: '>= 0.11.0')
+ wayland_protos = dependency('wayland-protocols', version: '>=1.14')
+ wayland_server = dependency('wayland-server')
+ pixman         = dependency('pixman-1')
+
+From c9cef876c05d5412c412774f58926d3b38ae594a Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich at FreeBSD.org>
+Date: Sat, 9 May 2020 11:46:10 +0000
+Subject: [PATCH 3/3] CI: bump wlroots version to 0.11.0