* [PR PATCH] wdisplays: fix for wlroots update.
@ 2020-07-21 1:44 ericonr
2020-07-21 3:43 ` [PR PATCH] [Merged]: " ahesford
0 siblings, 1 reply; 2+ messages in thread
From: ericonr @ 2020-07-21 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages wdisplays
https://github.com/void-linux/void-packages/pull/23677
wdisplays: fix for wlroots update.
A patch file from https://github.com/void-linux/void-packages/pull/23677.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wdisplays-23677.patch --]
[-- Type: text/x-diff, Size: 3480 bytes --]
From e67062c8a6d7892c6d8523997cde768f5f0dcd74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 20 Jul 2020 22:36:52 -0300
Subject: [PATCH] wdisplays: fix for wlroots update.
---
.../patches/correct-protocol-version.patch | 48 +++++++++++++++++++
srcpkgs/wdisplays/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/wdisplays/patches/correct-protocol-version.patch
diff --git a/srcpkgs/wdisplays/patches/correct-protocol-version.patch b/srcpkgs/wdisplays/patches/correct-protocol-version.patch
new file mode 100644
index 00000000000..b0c6cd819e1
--- /dev/null
+++ b/srcpkgs/wdisplays/patches/correct-protocol-version.patch
@@ -0,0 +1,48 @@
+From 657e2966e556c78f121075c69fe1ba8d2b4dcb73 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..40410ec 100644
+--- src/outputs.c
++++ 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, 3);
+ } 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);
+ }
+ }
+
diff --git a/srcpkgs/wdisplays/template b/srcpkgs/wdisplays/template
index fce6fc20ea2..6378c2a118c 100644
--- a/srcpkgs/wdisplays/template
+++ b/srcpkgs/wdisplays/template
@@ -1,7 +1,7 @@
# Template file for 'wdisplays'
pkgname=wdisplays
version=1.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config wayland-devel glib-devel python3-scour"
makedepends="wayland-devel libepoxy-devel gtk+3-devel"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: wdisplays: fix for wlroots update.
2020-07-21 1:44 [PR PATCH] wdisplays: fix for wlroots update ericonr
@ 2020-07-21 3:43 ` ahesford
0 siblings, 0 replies; 2+ messages in thread
From: ahesford @ 2020-07-21 3:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
There's a merged pull request on the void-packages repository
wdisplays: fix for wlroots update.
https://github.com/void-linux/void-packages/pull/23677
Description:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-21 3:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-21 1:44 [PR PATCH] wdisplays: fix for wlroots update ericonr
2020-07-21 3:43 ` [PR PATCH] [Merged]: " ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).