diff --git a/0001-meson-dep-fix-for-compositor.h-needing-xkbcommon.h.patch b/0001-meson-dep-fix-for-compositor.h-needing-xkbcommon.h.patch deleted file mode 100644 index c757ea3..0000000 --- a/0001-meson-dep-fix-for-compositor.h-needing-xkbcommon.h.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 779db046b91f28458b6bd79e07818ae20b49ba8b Mon Sep 17 00:00:00 2001 -From: Pekka Paalanen -Date: Thu, 28 Mar 2019 12:26:47 +0200 -Subject: [PATCH] meson: dep fix for compositor.h needing xkbcommon.h - -This fixes: - -[ 5s] cc -Ilibweston/2b98b6d@@session-helper@sta -Ilibweston -I../libweston -Ilibweston/.. -I../libweston/.. -Ilibwes -ton/../shared -I../libweston/../shared -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/dbus-1.0 -I/usr/lib6 -4/dbus-1.0/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu99 -Wno-unused-parameter -Wno-shift-n -egative-value -Wno-missing-field-initializers -fvisibility=hidden -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong - -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fPIC -MD -MQ 'libweston/2b98b6d@@session-hel -per@sta/launcher-util.c.o' -MF 'libweston/2b98b6d@@session-helper@sta/launcher-util.c.o.d' -o 'libweston/2b98b6d@@sessio -n-helper@sta/launcher-util.c.o' -c ../libweston/launcher-util.c -[ 5s] In file included from ../libweston/launcher-util.c:29: -[ 5s] ../libweston/compositor.h:39:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory -[ 5s] #include - -For completeness, also add the same for wayland-server.h. - -Reported-by: Jan Engelhardt -Signed-off-by: Pekka Paalanen ---- - libweston/meson.build | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libweston/meson.build b/libweston/meson.build -index 5d7bfa27..8b887afb 100644 ---- a/libweston/meson.build -+++ b/libweston/meson.build -@@ -121,7 +121,11 @@ srcs_session_helper = [ - ] - deps_session_helper = [ - # for compositor.h needing pixman.h -- dep_pixman.partial_dependency(compile_args: true) -+ dep_pixman.partial_dependency(compile_args: true), -+ # for compositor.h needing xkbcommon.h -+ dep_xkbcommon.partial_dependency(compile_args: true), -+ # for compositor.h needing wayland-server.h -+ dep_wayland_server.partial_dependency(compile_args: true) - ] - - if get_option('backend-drm') --- -2.21.0 - diff --git a/weston-6.0.0.tar.xz b/weston-6.0.0.tar.xz deleted file mode 100644 index f1c5a51..0000000 --- a/weston-6.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:546323a90607b3bd7f48809ea9d76e64cd09718102f2deca6d95aa59a882e612 -size 1517032 diff --git a/weston-6.0.1.tar.xz b/weston-6.0.1.tar.xz new file mode 100644 index 0000000..a8d955e --- /dev/null +++ b/weston-6.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf2f6d5aae2e11cabb6bd69a76bcf9edb084f8c3e14ca769bea7234a513155b4 +size 1522600 diff --git a/weston.changes b/weston.changes index 1726a8c..0e84869 100644 --- a/weston.changes +++ b/weston.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Jun 24 21:50:05 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 6.0.1 + * clients: close unused keymap fd + * compositor: Fix invalid view numbering in scene-graph + * weston-terminal: Fix weston-terminal crash on mutter + * cairo-util: Don't set title string to Pango layout if the + title is NULL +- Remove 0001-meson-dep-fix-for-compositor.h-needing-xkbcommon.h.patch, + 0001-build-add-missing-dep-to-x11-backend.patch. + ------------------------------------------------------------------- Thu Mar 28 09:20:31 UTC 2019 - Jan Engelhardt diff --git a/weston.spec b/weston.spec index 2c2f425..9b51473 100644 --- a/weston.spec +++ b/weston.spec @@ -19,7 +19,7 @@ Name: weston %define lname libweston0 %define major 6 -%define realver 6.0.0 +%define realver 6.0.1 Version: 6 Release: 0 Summary: Wayland Reference Compositor @@ -31,8 +31,6 @@ Url: http://wayland.freedesktop.org/ #Git-Web: http://cgit.freedesktop.org/wayland/weston/ Source: http://wayland.freedesktop.org/releases/%name-%realver.tar.xz Source3: %name.keyring -Patch1: 0001-meson-dep-fix-for-compositor.h-needing-xkbcommon.h.patch -Patch2: 0001-build-add-missing-dep-to-x11-backend.patch BuildRequires: autoconf >= 2.64 BuildRequires: automake >= 1.11 BuildRequires: libjpeg-devel @@ -172,6 +170,7 @@ popd %_libdir/%name/ %_datadir/%name/ %_datadir/wayland-sessions/ +%_datadir/libweston/ %_mandir/man?/*.* %files -n libweston-%major-0