Skip to content
Snippets Groups Projects
Commit e4aaf25b authored by Michał Polański's avatar Michał Polański
Browse files

community/wdisplays: fix segfault

parent 8231c684
No related branches found
No related tags found
5 merge requests!202783.13 vala,!192543.13 gptfdisk,!191533.13 privoxy,!190083.13 openjpeg,!18454[3.13] community/wdisplays: fix segfault
......@@ -2,14 +2,16 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=wdisplays
pkgver=1.0
pkgrel=1
pkgrel=2
pkgdesc="GUI display configurator for wlroots compositors"
url="https://cyclopsian.github.io/wdisplays/"
options="!check" # no test suite
arch="all"
license="GPL-3.0-or-later"
arch="all"
options="!check" # no test suite
makedepends="meson wayland-dev libepoxy gtk+3.0-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/cyclopsian/wdisplays/archive/$pkgver.tar.gz"
source="https://github.com/cyclopsian/wdisplays/archive/$pkgver/wdisplays-$pkgver.tar.gz
use-correct-versions-when-binding-globals.patch
"
build() {
abuild-meson . build
......@@ -20,4 +22,5 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C build
}
sha512sums="876e883747331cf67d351b7afec963d6d52b6fa3870a57ed147acf898a662fb41407b3e835acc167d32de969d4001dbe8429340849ad09a7f7b8bfdabee61e3e wdisplays-1.0.tar.gz"
sha512sums="876e883747331cf67d351b7afec963d6d52b6fa3870a57ed147acf898a662fb41407b3e835acc167d32de969d4001dbe8429340849ad09a7f7b8bfdabee61e3e wdisplays-1.0.tar.gz
078b73425dc8a90ec9d00eb64226a8fa7f7753470179e094c668171ae3dd5d7e99b2f2b11c7828de3141705ef2445a69c0b544f4648a39ddd66e02dd0d2077f3 use-correct-versions-when-binding-globals.patch"
From 5198a9c94b40ff157c284df413be5402f1b75118 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 8 Jul 2020 11:57:35 +0200
Subject: [PATCH] Use correct versions when binding globals
Changes to protocols aren't forward-compatible. It's not possible to use
version n+1 when a client has been designed to work with version n. For
instance in wlr-screencopy v5 a new event has been added. Binding to
version 5 without upgrading the client leads to libwayland errors
because libwayland doesn't know how to handle the event.
The client needs to maintain its own version requirements.
Closes: https://github.com/cyclopsian/wdisplays/issues/18
---
src/outputs.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/outputs.c b/src/outputs.c
index 9ebf7e5..a5007e8 100644
--- a/src/outputs.c
+++ b/src/outputs.c
@@ -534,20 +534,20 @@ static void registry_handle_global(void *data, struct wl_registry *registry,
if (strcmp(interface, zwlr_output_manager_v1_interface.name) == 0) {
state->output_manager = wl_registry_bind(registry, name,
- &zwlr_output_manager_v1_interface, version);
+ &zwlr_output_manager_v1_interface, 1);
zwlr_output_manager_v1_add_listener(state->output_manager,
&output_manager_listener, state);
} else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
state->xdg_output_manager = wl_registry_bind(registry, name,
- &zxdg_output_manager_v1_interface, version);
+ &zxdg_output_manager_v1_interface, 2);
} else if(strcmp(interface, zwlr_screencopy_manager_v1_interface.name) == 0) {
state->copy_manager = wl_registry_bind(registry, name,
- &zwlr_screencopy_manager_v1_interface, version);
+ &zwlr_screencopy_manager_v1_interface, 1);
} else if(strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
state->layer_shell = wl_registry_bind(registry, name,
- &zwlr_layer_shell_v1_interface, version);
+ &zwlr_layer_shell_v1_interface, 1);
} else if(strcmp(interface, wl_shm_interface.name) == 0) {
- state->shm = wl_registry_bind(registry, name, &wl_shm_interface, version);
+ state->shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment