From 98c3afc5293e7aaf415e50940b2ddf5a235330f0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 21 Mar 2019 22:05:51 -0700 Subject: wayland: Remove bbappend and patch This is already there in 1.17 release Signed-off-by: Khem Raj --- .../wayland/files/fix_duplicate_main.patch | 54 ---------------------- recipes-graphics/wayland/wayland_1.16.%.bbappend | 3 -- 2 files changed, 57 deletions(-) delete mode 100644 recipes-graphics/wayland/files/fix_duplicate_main.patch delete mode 100644 recipes-graphics/wayland/wayland_1.16.%.bbappend diff --git a/recipes-graphics/wayland/files/fix_duplicate_main.patch b/recipes-graphics/wayland/files/fix_duplicate_main.patch deleted file mode 100644 index 9b9ec99..0000000 --- a/recipes-graphics/wayland/files/fix_duplicate_main.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- wayland-1.16.0/Makefile.am 2019-03-14 10:29:31.103099516 +0100 -+++ wayland-1.16.0/Makefile.am 2019-03-14 10:33:07.987977505 +0100 -@@ -210,12 +210,15 @@ - exec-fd-leak-checker \ - fixed-benchmark - --noinst_LTLIBRARIES += libtest-runner.la -+noinst_LTLIBRARIES += \ -+ libtest-runner.la \ -+ libtest-helpers.la -+ -+libtest_helpers_la_SOURCES = tests/test-helpers.c - - libtest_runner_la_SOURCES = \ - tests/test-runner.c \ - tests/test-runner.h \ -- tests/test-helpers.c \ - tests/test-compositor.h \ - tests/test-compositor.c - libtest_runner_la_LIBADD = \ -@@ -223,9 +226,9 @@ - libwayland-util.la \ - libwayland-client.la \ - libwayland-server.la \ -+ libtest-helpers.la \ - -lrt -ldl $(FFI_LIBS) - -- - array_test_SOURCES = tests/array-test.c - array_test_LDADD = libtest-runner.la - client_test_SOURCES = tests/client-test.c -@@ -270,7 +273,6 @@ - headers_test_SOURCES = tests/headers-test.c \ - tests/headers-protocol-test.c \ - tests/headers-protocol-core-test.c --headers_test_LDADD = libtest-runner.la - nodist_headers_test_SOURCES = \ - protocol/wayland-server-protocol-core.h \ - protocol/wayland-client-protocol-core.h -@@ -280,13 +282,12 @@ - endif - - fixed_benchmark_SOURCES = tests/fixed-benchmark.c --fixed_benchmark_LDADD = libtest-runner.la - - os_wrappers_test_SOURCES = tests/os-wrappers-test.c - os_wrappers_test_LDADD = libtest-runner.la - - exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c --exec_fd_leak_checker_LDADD = libtest-runner.la -+exec_fd_leak_checker_LDADD = libtest-helpers.la - - EXTRA_DIST += tests/scanner-test.sh \ - protocol/tests.xml \ diff --git a/recipes-graphics/wayland/wayland_1.16.%.bbappend b/recipes-graphics/wayland/wayland_1.16.%.bbappend deleted file mode 100644 index 6d9a72d..0000000 --- a/recipes-graphics/wayland/wayland_1.16.%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI_append = " file://fix_duplicate_main.patch " -- cgit v1.2.3-54-g00ecf