Thanks, applied as d3558a9ac5980ebf1f73b1f79c610b40a6d95ff6. Michael
[sent from post-receive hook] On Wed, 14 May 2025 08:07:38 +0200, Christian Melki <[email protected]> wrote: > Bugfix release. > > https://lists.freedesktop.org/archives/wayland-devel/2025-April/044158.html > > * Remove patchset, included in the release. > > Signed-off-by: Christian Melki <[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 > deleted file mode 100644 > index 3c801bf73f7f..000000000000 > --- a/patches/weston-14.0.1/0001-vnc-Allow-neatvnc-in-version-0.9.0.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -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 > deleted file mode 100644 > index 14304df22d00..000000000000 > --- a/patches/weston-14.0.1/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# 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 > diff --git a/rules/weston.make b/rules/weston.make > index 702fc9ea46b8..774e8de4bc54 100644 > --- a/rules/weston.make > +++ b/rules/weston.make > @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston > # > # Paths and names > # > -WESTON_VERSION := 14.0.1 > +WESTON_VERSION := 14.0.2 > LIBWESTON_MAJOR := 14 > -WESTON_MD5 := d07a8f4dfb7cb81035052928ba1a8c71 > +WESTON_MD5 := ff6cb69bd4ddd07d3076d5fc4fcbad91 > WESTON := weston-$(WESTON_VERSION) > WESTON_SUFFIX := tar.gz > WESTON_URL := > https://gitlab.freedesktop.org/wayland/weston/-/archive/$(WESTON_VERSION)/$(WESTON).$(WESTON_SUFFIX)
