mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
wayland: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 320f03b8492e5259c45e7c59b62571d5a827ee59) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
b2998df084
commit
07dd613a66
@@ -21,8 +21,7 @@ Index: wayland-1.14.0/src/wayland-scanner.pc.in
|
||||
===================================================================
|
||||
--- wayland-1.14.0.orig/src/wayland-scanner.pc.in
|
||||
+++ wayland-1.14.0/src/wayland-scanner.pc.in
|
||||
@@ -1,8 +1,8 @@
|
||||
prefix=@prefix@
|
||||
@@ -2,7 +2,7 @@ prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
datarootdir=@datarootdir@
|
||||
pkgdatadir=@datadir@/@PACKAGE@
|
||||
|
||||
@@ -16,9 +16,11 @@ Upstream-Status: Submitted
|
||||
3 files changed, 23 insertions(+), 1 deletion(-)
|
||||
create mode 100644 src/weston-error.h
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -60,6 +60,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
|
||||
Index: weston-3.0.0/configure.ac
|
||||
===================================================================
|
||||
--- weston-3.0.0.orig/configure.ac
|
||||
+++ weston-3.0.0/configure.ac
|
||||
@@ -103,6 +103,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
|
||||
[[#include <time.h>]])
|
||||
AC_CHECK_HEADERS([execinfo.h])
|
||||
|
||||
@@ -26,9 +28,11 @@ Upstream-Status: Submitted
|
||||
+
|
||||
AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
|
||||
|
||||
COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2"
|
||||
# check for libdrm as a build-time dependency only
|
||||
Index: weston-3.0.0/libweston/weston-error.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ b/libweston/weston-error.h
|
||||
+++ weston-3.0.0/libweston/weston-error.h
|
||||
@@ -0,0 +1,20 @@
|
||||
+#ifndef _WESTON_ERROR_H
|
||||
+#define _WESTON_ERROR_H
|
||||
@@ -50,8 +54,10 @@ Upstream-Status: Submitted
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
--- a/libweston/weston-launch.c
|
||||
+++ b/libweston/weston-launch.c
|
||||
Index: weston-3.0.0/libweston/weston-launch.c
|
||||
===================================================================
|
||||
--- weston-3.0.0.orig/libweston/weston-launch.c
|
||||
+++ weston-3.0.0/libweston/weston-launch.c
|
||||
@@ -33,7 +33,6 @@
|
||||
#include <poll.h>
|
||||
#include <errno.h>
|
||||
@@ -60,7 +66,7 @@ Upstream-Status: Submitted
|
||||
#include <getopt.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
@@ -59,6 +58,7 @@
|
||||
@@ -60,6 +59,7 @@
|
||||
#endif
|
||||
|
||||
#include "weston-launch.h"
|
||||
|
||||
Reference in New Issue
Block a user