Commit ebf307b4 authored by Michał Polański's avatar Michał Polański
Browse files

community/wlroots: upgrade to 0.14.0

parent e7629432
Upstream: no
From e43ba0857cb39eae30b5e02cb87723e6456dc61e Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Tue, 10 Nov 2020 20:57:04 +0100
Subject: [PATCH] Revert "layer-shell: error on 0 dimension without anchors"
This reverts commit 8dec751a6d84335fb04288b8efab6dd5c90288d3, which
introduced a consistency check:
https://github.com/swaywm/wlroots/commit/8dec751a6d84335fb04288b8efab6dd5c90288d3
Currently this causes phosh to crash, so let's revert it temporarily:
https://source.puri.sm/Librem5/phosh/-/issues/422
---
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 bc681117..d83b22b8 100644
--- a/types/wlr_layer_shell_v1.c
+++ b/types/wlr_layer_shell_v1.c
@@ -307,26 +307,6 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
return;
}
- const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
- ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
- if (surface->client_pending.desired_width == 0 &&
- (surface->client_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->client_pending.desired_height == 0 &&
- (surface->client_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;
- }
-
if (surface->closed) {
// Ignore commits after the compositor has closed it
return;
--
2.20.1
......@@ -2,18 +2,18 @@
# Contributor: Drew DeVault <sir@cmpwn.com>
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=wlroots
pkgver=0.13.0
pkgver=0.14.0
pkgrel=0
pkgdesc="modular Wayland compositor library"
url="https://github.com/swaywm/wlroots"
arch="all"
arch="all !ppc64le !mips64" # blocked by libseat
license="MIT"
options="!check" # contains no test suite
makedepends="
elogind-dev
eudev-dev
libcap-dev
libinput-dev
libseat-dev
libxcb-dev
libxkbcommon-dev
mesa-dev
......@@ -28,15 +28,11 @@ makedepends="
xkeyboard-config
xwayland-dev
"
subpackages="$pkgname-dev $pkgname-dbg"
source="$pkgname-$pkgver.tar.gz::https://github.com/swaywm/wlroots/archive/$pkgver.tar.gz
0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch
"
subpackages="$pkgname-dbg $pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/swaywm/wlroots/archive/$pkgver.tar.gz"
build() {
abuild-meson \
-Dlogind=enabled \
-Dlogind-provider=elogind \
-Dexamples=false \
. build
meson compile ${JOBS:+-j ${JOBS}} -C build
......@@ -46,5 +42,6 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C build
}
sha512sums="1c942a6b8a628383e2b68cd9096d3525021347c5c363a8239a3b4fb0d5736ffcd3e2c1333fdd7d95ecf214dd04bf01062b4f1b4fbbcd88d1d086a55261ca0c82 wlroots-0.13.0.tar.gz
5547741b35fc8364360dabb93a6f988b6be9299b77ee4adf2c7edfcd4a3c97f2f0cbbd19a41548254fe5d2327ed45300824920ce3c9d0cb0846a3ba5b5a83e02 0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"
sha512sums="
83f001133cb4b11a72bb9532b7321655428826662848f67de8e3220a33d9dff4d37c859602bdc319929949d387d014a257b0347039a6649944d7b084c76bb611 wlroots-0.14.0.tar.gz
"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment