From a63e0367620bb5fe2a92a14e6ada34955601f096afad8804f5543832f7e0c7cc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 9 Aug 2017 08:11:38 +0000 Subject: [PATCH 1/2] wayland-1.14 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=78 --- ...-type-handling-in-argument_from_va_l.patch | 53 ------------------ wayland-1.13.0.tar.xz | 3 - wayland-1.13.0.tar.xz.sig | Bin 72 -> 0 bytes wayland-1.14.0.tar.xz | 3 + wayland-1.14.0.tar.xz.sig | Bin 0 -> 72 bytes wayland.changes | 9 +++ wayland.spec | 7 +-- 7 files changed, 14 insertions(+), 61 deletions(-) delete mode 100644 0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch delete mode 100644 wayland-1.13.0.tar.xz delete mode 100644 wayland-1.13.0.tar.xz.sig create mode 100644 wayland-1.14.0.tar.xz create mode 100644 wayland-1.14.0.tar.xz.sig diff --git a/0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch b/0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch deleted file mode 100644 index 4299b69..0000000 --- a/0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 680a6b32de49896dc290968f83a1e4cce315888e Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -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 -Reviewed-by: Pekka Paalanen -Tested-by: Kalev Lember -Reviewed-by: Yong Bakos ---- - 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 - diff --git a/wayland-1.13.0.tar.xz b/wayland-1.13.0.tar.xz deleted file mode 100644 index db06549..0000000 --- a/wayland-1.13.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69b052c031a61e89af7cc8780893d0da1e301492352aa449dee9345043e6fe51 -size 414508 diff --git a/wayland-1.13.0.tar.xz.sig b/wayland-1.13.0.tar.xz.sig deleted file mode 100644 index f3d4830ab13902a63dd0131e302c9d112e6a6cdd2a517706ee7ea9b7250e5dba..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0$8lD;{XZ?5D}vRR^aA#5pEO!prjJK6-1Z(2GsLU>ZTKA eGj3;4JpiD)DnB&El53kPiTa`?V`wWoW_Jo$Ga4TN diff --git a/wayland-1.14.0.tar.xz b/wayland-1.14.0.tar.xz new file mode 100644 index 0000000..87f7c8d --- /dev/null +++ b/wayland-1.14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8 +size 413960 diff --git a/wayland-1.14.0.tar.xz.sig b/wayland-1.14.0.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..17f56039e21d6952edd944498ab1701866a8e60b85cfda58283c06636ed91dde GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0$GXyCjbfw5D}vRR^aA#5%ebjpx;0dROGQaBOqIOEw8-G evrjRLxB#DKavhmdIL@= 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 @@ -143,7 +141,7 @@ find "%buildroot" -type f -name "*.la" -delete -print %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 @@ -177,7 +175,6 @@ fi %_libdir/libwayland-*.so %_libdir/pkgconfig/wayland-*.pc %_datadir/aclocal/ -#%_datadir/pkgconfig/wayland-*.pc %_datadir/wayland/ %if %with_doc From 9b92b2c1b78c85bfb5d82b73f2eebfb73b4f9bfc1bfc7d2e56bd8766141e0e29 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 13 Oct 2017 09:06:29 +0000 Subject: [PATCH 2/2] - Add COPYING OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=79 --- wayland.changes | 5 +++++ wayland.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/wayland.changes b/wayland.changes index f61a346..d4dad7c 100644 --- a/wayland.changes +++ b/wayland.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 13 09:06:18 UTC 2017 - jengelh@inai.de + +- Add COPYING + ------------------------------------------------------------------- Wed Aug 9 08:11:16 UTC 2017 - jengelh@inai.de diff --git a/wayland.spec b/wayland.spec index f4cf68a..e112b6f 100644 --- a/wayland.spec +++ b/wayland.spec @@ -134,7 +134,7 @@ 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 @@ -159,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)