forked from pool/wayland
Accepting request 533856 from X11:Wayland
- Update to new upstream release 1.14 -add COPYING OBS-URL: https://build.opensuse.org/request/show/533856 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wayland?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
6485b4726f
@ -1,53 +0,0 @@
|
||||
From 680a6b32de49896dc290968f83a1e4cce315888e Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 23 Feb 2017 13:47:41 +0100
|
||||
Subject: [PATCH] tests: Fix "new ID" type handling in argument_from_va_list
|
||||
test
|
||||
|
||||
New IDs are internally dealt with as objects, however this test
|
||||
expected to deal with 'n' as the uint32_t type that's just seen
|
||||
through the wire. We should give it an object instead, and
|
||||
expect an object from it.
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=99899
|
||||
|
||||
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
|
||||
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
|
||||
Tested-by: Kalev Lember <kalevlember@gmail.com>
|
||||
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
|
||||
---
|
||||
tests/connection-test.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tests/connection-test.c b/tests/connection-test.c
|
||||
index 1c688f1..8be6c38 100644
|
||||
--- a/tests/connection-test.c
|
||||
+++ b/tests/connection-test.c
|
||||
@@ -142,7 +142,7 @@ va_list_wrapper(const char *signature, union wl_argument *args, int count, ...)
|
||||
TEST(argument_from_va_list)
|
||||
{
|
||||
union wl_argument args[WL_CLOSURE_MAX_ARGS];
|
||||
- struct wl_object fake_object;
|
||||
+ struct wl_object fake_object, fake_new_object;
|
||||
struct wl_array fake_array;
|
||||
|
||||
va_list_wrapper("i", args, 1, 100);
|
||||
@@ -154,13 +154,13 @@ TEST(argument_from_va_list)
|
||||
|
||||
va_list_wrapper("?iuf?sonah", args, 8,
|
||||
102, 103, wl_fixed_from_int(104), "value",
|
||||
- &fake_object, 105, &fake_array, 106);
|
||||
+ &fake_object, &fake_new_object, &fake_array, 106);
|
||||
assert(args[0].i == 102);
|
||||
assert(args[1].u == 103);
|
||||
assert(args[2].f == wl_fixed_from_int(104));
|
||||
assert(strcmp(args[3].s, "value") == 0);
|
||||
assert(args[4].o == &fake_object);
|
||||
- assert(args[5].n == 105);
|
||||
+ assert(args[5].o == &fake_new_object);
|
||||
assert(args[6].a == &fake_array);
|
||||
assert(args[7].h == 106);
|
||||
}
|
||||
--
|
||||
2.12.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:69b052c031a61e89af7cc8780893d0da1e301492352aa449dee9345043e6fe51
|
||||
size 414508
|
||||
Binary file not shown.
3
wayland-1.14.0.tar.xz
Normal file
3
wayland-1.14.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8
|
||||
size 413960
|
||||
BIN
wayland-1.14.0.tar.xz.sig
Normal file
BIN
wayland-1.14.0.tar.xz.sig
Normal file
Binary file not shown.
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 13 09:06:18 UTC 2017 - jengelh@inai.de
|
||||
|
||||
- Add COPYING
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 9 08:11:16 UTC 2017 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 1.14
|
||||
* wayland-util: do not export the wl_map_* API
|
||||
* wayland-server: Remove unused members from struct wl_client
|
||||
- Drop 0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch
|
||||
(integrated)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 10 11:00:59 UTC 2017 - sndirsch@suse.com
|
||||
|
||||
|
||||
10
wayland.spec
10
wayland.spec
@ -18,7 +18,7 @@
|
||||
|
||||
%define lname libwayland0
|
||||
Name: wayland
|
||||
Version: 1.13.0
|
||||
Version: 1.14.0
|
||||
Release: 0
|
||||
Summary: Wayland Compositor Infrastructure
|
||||
License: MIT
|
||||
@ -31,7 +31,6 @@ Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz
|
||||
Source2: http://wayland.freedesktop.org/releases/%name-%version.tar.xz.sig
|
||||
Source3: %name.keyring
|
||||
Source4: baselibs.conf
|
||||
Patch1: 0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch
|
||||
#git#BuildRequires: autoconf >= 2.64
|
||||
#git#BuildRequires: automake >= 1.11
|
||||
#git#BuildRequires: libtool >= 2.2
|
||||
@ -121,7 +120,6 @@ This subpackage contains the documentation to Wayland.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P 1 -p1
|
||||
|
||||
%build
|
||||
if [ ! -e configure ]; then
|
||||
@ -136,14 +134,14 @@ fi
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make DESTDIR="%buildroot" install %{?_smp_mflags}
|
||||
%make_install %{?_smp_mflags}
|
||||
find "%buildroot" -type f -name "*.la" -delete -print
|
||||
%fdupes %buildroot/%_prefix
|
||||
|
||||
%check
|
||||
%if !0%{?qemu_user_space_build}
|
||||
mkdir -p xdg/wayland-tests
|
||||
chmod 700 xdg xdg/wayland-tests
|
||||
chmod a+x xdg xdg/wayland-tests
|
||||
export XDG_RUNTIME_DIR="$PWD/xdg"
|
||||
if ! make check V=1; then
|
||||
cat test-suite.log
|
||||
@ -161,6 +159,7 @@ fi
|
||||
%files -n libwayland-client0
|
||||
%defattr(-,root,root)
|
||||
%_libdir/libwayland-client.so.0*
|
||||
%doc COPYING
|
||||
|
||||
%files -n libwayland-cursor0
|
||||
%defattr(-,root,root)
|
||||
@ -177,7 +176,6 @@ fi
|
||||
%_libdir/libwayland-*.so
|
||||
%_libdir/pkgconfig/wayland-*.pc
|
||||
%_datadir/aclocal/
|
||||
#%_datadir/pkgconfig/wayland-*.pc
|
||||
%_datadir/wayland/
|
||||
|
||||
%if %with_doc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user