Dylan Aïssi pushed to branch debian-unstable at X Strike Force / wayland / weston
Commits: f16055ed by Dylan Aïssi at 2024-11-23T09:40:00+01:00 Cherry pick upstream patch allowing to build against neatvnc 0.9.0 Signed-off-by: Dylan Aïssi <[email protected]> - - - - - 3 changed files: - debian/changelog - + debian/patches/series - + debian/patches/vnc_Allow_neatvnc_in_version_0.9.0.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +weston (14.0.1-3) UNRELEASED; urgency=medium + + * Cherry pick upstream patch allowing to build against neatvnc 0.9.0 + + -- Dylan Aïssi <[email protected]> Sat, 23 Nov 2024 09:39:40 +0100 + weston (14.0.1-2) unstable; urgency=medium [ Carlos Henrique Lima Melara ] ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +vnc_Allow_neatvnc_in_version_0.9.0.patch ===================================== debian/patches/vnc_Allow_neatvnc_in_version_0.9.0.patch ===================================== @@ -0,0 +1,30 @@ +From b4386289d614f26e89e1c6eb17e048826e925ed1 Mon Sep 17 00:00:00 2001 +From: Philipp Zabel <[email protected]> +Date: Tue, 19 Nov 2024 17:06:19 +0100 +Subject: [PATCH] vnc: Allow neatvnc in version 0.9.0 + +Neat VNC 0.9.0 is backwards compatible. + +Origin: upstream, https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1649 + +Signed-off-by: Philipp Zabel <[email protected]> +--- + libweston/backend-vnc/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build +index 39b15cf902..cf67c51cbf 100644 +--- a/libweston/backend-vnc/meson.build ++++ b/libweston/backend-vnc/meson.build +@@ -3,7 +3,7 @@ if not get_option('backend-vnc') + endif + + config_h.set('BUILD_VNC_COMPOSITOR', '1') +-dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) ++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.10.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) + if not dep_neatvnc.found() + error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.') + endif +-- +GitLab + View it on GitLab: https://salsa.debian.org/xorg-team/wayland/weston/-/commit/f16055ed67d00bb430a38f0ca410ee1e704fa7f9 -- View it on GitLab: https://salsa.debian.org/xorg-team/wayland/weston/-/commit/f16055ed67d00bb430a38f0ca410ee1e704fa7f9 You're receiving this email because of your account on salsa.debian.org.
