Brett Cornwall pushed to branch main at Arch Linux / Packaging / Packages /
wlroots
Commits:
76235d16 by Jelle van der Waa at 2023-08-25T17:46:35+02:00
Add phosh specific patch
This allows a minor protocol violation which makes phosh not crash on
startup.
- - - - -
2 changed files:
- PKGBUILD
- + Revert-layer-shell-error-on-0-dimension-without-anch.patch
Changes:
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=wlroots
pkgver=0.16.2
-pkgrel=1
+pkgrel=2
license=('MIT')
pkgdesc='Modular Wayland compositor library'
url='https://gitlab.freedesktop.org/wlroots/wlroots'
@@ -46,15 +46,24 @@ options=(
source=(
"$pkgname-$pkgver.tar.gz::https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz";
"https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz.sig";
+ "Revert-layer-shell-error-on-0-dimension-without-anch.patch"
)
sha256sums=('83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa'
- 'SKIP')
+ 'SKIP'
+ 'd53a62f49334fe15583a951c9e38e7f9f74b19210bdb7f80f16ec0398c3d7b3e')
validpgpkeys=(
'34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # Simon Ser
'9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A' # Drew DeVault
'4100929B33EEB0FD1DB852797BC79407090047CA' # Sway signing key
)
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ # Allow a minor protocol violation until phosh is fixed without this patch
+ # phosh crashes on launch.
+ patch -Np1 -i
"${srcdir}/Revert-layer-shell-error-on-0-dimension-without-anch.patch"
+}
+
build() {
arch-meson "$pkgname-$pkgver" build
ninja -C build
=====================================
Revert-layer-shell-error-on-0-dimension-without-anch.patch
=====================================
@@ -0,0 +1,44 @@
+From 05a740206a73c6aab3762eb449b0733e5b9a4c7a Mon Sep 17 00:00:00 2001
+From: Aleksei Bavshin <[email protected]>
+Date: Sat, 25 Jun 2022 21:22:08 -0700
+Subject: [PATCH] Revert "layer-shell: error on 0 dimension without anchors"
+
+This reverts commit 8dec751a6d84335fb04288b8efab6dd5c90288d3.
+---
+ types/wlr_layer_shell_v1.c | 20 --------------------
+ 1 file changed, 20 deletions(-)
+
+diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c
+index fa054d3c..062fa96d 100644
+--- a/types/wlr_layer_shell_v1.c
++++ b/types/wlr_layer_shell_v1.c
+@@ -316,26 +316,6 @@ static void layer_surface_role_commit(struct wlr_surface
*wlr_surface) {
+ struct wlr_layer_surface_v1 *surface =
+ wlr_layer_surface_v1_from_wlr_surface(wlr_surface);
+
+- const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
+- ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+- if (surface->pending.desired_width == 0 &&
+- (surface->pending.anchor & horiz) != horiz) {
+- wl_resource_post_error(surface->resource,
+- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
+- "width 0 requested without setting left and right
anchors");
+- return;
+- }
+-
+- const uint32_t vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
+- ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
+- if (surface->pending.desired_height == 0 &&
+- (surface->pending.anchor & vert) != vert) {
+- wl_resource_post_error(surface->resource,
+- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
+- "height 0 requested without setting top and bottom
anchors");
+- return;
+- }
+-
+ surface->current = surface->pending;
+ surface->pending.committed = 0;
+
+--
+2.37.3
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/wlroots/-/commit/76235d16a8bb374701e573c5f2a00f6138943a3e
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/wlroots/-/commit/76235d16a8bb374701e573c5f2a00f6138943a3e
You're receiving this email because of your account on gitlab.archlinux.org.
