Thanks, applied as c92068cf2cd57a9881a438883ca4289df07f7327. Michael
[sent from post-receive hook] On Fri, 07 Mar 2025 10:49:49 +0100, Philipp Zabel <[email protected]> wrote: > Backport a trivial upstream patch to allow updating Neat VNC. > > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/weston-14.0.1/0001-vnc-Allow-neatvnc-in-version-0.9.0.patch > b/patches/weston-14.0.1/0001-vnc-Allow-neatvnc-in-version-0.9.0.patch > new file mode 100644 > index 000000000000..3c801bf73f7f > --- /dev/null > +++ b/patches/weston-14.0.1/0001-vnc-Allow-neatvnc-in-version-0.9.0.patch > @@ -0,0 +1,25 @@ > +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. > + > +Signed-off-by: Philipp Zabel <[email protected]> > +(cherry picked from commit b4386289d614f26e89e1c6eb17e048826e925ed1) > +--- > + 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 39b15cf90201..cf67c51cbf77 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 > diff --git a/patches/weston-14.0.1/series b/patches/weston-14.0.1/series > new file mode 100644 > index 000000000000..14304df22d00 > --- /dev/null > +++ b/patches/weston-14.0.1/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-vnc-Allow-neatvnc-in-version-0.9.0.patch > +# 5bc17d516893a37a9676e6c86003022f - git-ptx-patches magic
