- Update to new upstream release 6.0.1
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=81
This commit is contained in:
Git OBS Bridge
parent
7233eca600
commit
3aabe428a6
@ -1,46 +0,0 @@
|
|||||||
From 779db046b91f28458b6bd79e07818ae20b49ba8b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Pekka Paalanen <pekka.paalanen@collabora.com>
|
|
||||||
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 <xkbcommon/xkbcommon.h>
|
|
||||||
|
|
||||||
For completeness, also add the same for wayland-server.h.
|
|
||||||
|
|
||||||
Reported-by: Jan Engelhardt <jengelh@inai.de>
|
|
||||||
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:546323a90607b3bd7f48809ea9d76e64cd09718102f2deca6d95aa59a882e612
|
|
||||||
size 1517032
|
|
||||||
3
weston-6.0.1.tar.xz
Normal file
3
weston-6.0.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:bf2f6d5aae2e11cabb6bd69a76bcf9edb084f8c3e14ca769bea7234a513155b4
|
||||||
|
size 1522600
|
||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 24 21:50:05 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- 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 <jengelh@inai.de>
|
Thu Mar 28 09:20:31 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
Name: weston
|
Name: weston
|
||||||
%define lname libweston0
|
%define lname libweston0
|
||||||
%define major 6
|
%define major 6
|
||||||
%define realver 6.0.0
|
%define realver 6.0.1
|
||||||
Version: 6
|
Version: 6
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Wayland Reference Compositor
|
Summary: Wayland Reference Compositor
|
||||||
@ -31,8 +31,6 @@ Url: http://wayland.freedesktop.org/
|
|||||||
#Git-Web: http://cgit.freedesktop.org/wayland/weston/
|
#Git-Web: http://cgit.freedesktop.org/wayland/weston/
|
||||||
Source: http://wayland.freedesktop.org/releases/%name-%realver.tar.xz
|
Source: http://wayland.freedesktop.org/releases/%name-%realver.tar.xz
|
||||||
Source3: %name.keyring
|
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: autoconf >= 2.64
|
||||||
BuildRequires: automake >= 1.11
|
BuildRequires: automake >= 1.11
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
@ -172,6 +170,7 @@ popd
|
|||||||
%_libdir/%name/
|
%_libdir/%name/
|
||||||
%_datadir/%name/
|
%_datadir/%name/
|
||||||
%_datadir/wayland-sessions/
|
%_datadir/wayland-sessions/
|
||||||
|
%_datadir/libweston/
|
||||||
%_mandir/man?/*.*
|
%_mandir/man?/*.*
|
||||||
|
|
||||||
%files -n libweston-%major-0
|
%files -n libweston-%major-0
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user