diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-07-04 02:06:46 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-06 14:38:13 +0100 |
commit | cad6482662e2a257b609bbc76435af7356567298 (patch) | |
tree | 08009631bd2c6cdb909014261d00cf3bda41b463 /meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch | |
parent | 10356fefcd2aee781cc659ce9e3ea82c479fff21 (diff) | |
download | poky-cad6482662e2a257b609bbc76435af7356567298.tar.gz |
gtk+3: Update the patches to work with old versions of patch
The patch "0003-Add-disable-opengl-configure-option.patch" used Git
rename syntax, which is not supported by patch 2.6.x and older.
(From OE-Core rev: 43e640ddcf32c718b3e0bb3f3654ed60eb497058)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch index 634b3a46ff..aca55ceaf4 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 97b78e566634579bbae51be914aeaaa921137a8b Mon Sep 17 00:00:00 2001 | 1 | From 34f4d3928e8206a89b0a601bdf79d6194b3cc77e Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Thu, 9 Jun 2016 11:21:36 +0300 | 3 | Date: Thu, 9 Jun 2016 11:21:36 +0300 |
4 | Subject: [PATCH 4/4] configure.ac: Fix wayland-protocols path | 4 | Subject: [PATCH 4/4] configure.ac: Fix wayland-protocols path |
@@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/configure.ac b/configure.ac | 21 | diff --git a/configure.ac b/configure.ac |
22 | index a3e9beb..dde9dc5 100644 | 22 | index 00bf544..5515915 100644 |
23 | --- a/configure.ac | 23 | --- a/configure.ac |
24 | +++ b/configure.ac | 24 | +++ b/configure.ac |
25 | @@ -461,7 +461,7 @@ fi | 25 | @@ -465,7 +465,7 @@ fi |
26 | if test "$enable_wayland_backend" = "yes"; then | 26 | if test "$enable_wayland_backend" = "yes"; then |
27 | # For the cairo image backend | 27 | # For the cairo image backend |
28 | cairo_backends="$cairo_backends cairo" | 28 | cairo_backends="$cairo_backends cairo" |
@@ -32,5 +32,5 @@ index a3e9beb..dde9dc5 100644 | |||
32 | GDK_WINDOWING="$GDK_WINDOWING | 32 | GDK_WINDOWING="$GDK_WINDOWING |
33 | #define GDK_WINDOWING_WAYLAND" | 33 | #define GDK_WINDOWING_WAYLAND" |
34 | -- | 34 | -- |
35 | 2.1.4 | 35 | 2.12.0 |
36 | 36 | ||