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/0001-Hardcoded-libtool.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/0001-Hardcoded-libtool.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch index 0bda1f1074..c210bbc7d5 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5a73a5b92566e314bbc8a1bd40f1ec204837c111 Mon Sep 17 00:00:00 2001 | 1 | From 0ecaa5bab162abf0cb2057d77beeb7b89d5873b4 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: Tue, 21 Jun 2016 14:53:56 +0300 | 3 | Date: Tue, 21 Jun 2016 14:53:56 +0300 |
4 | Subject: [PATCH 1/4] Hardcoded libtool | 4 | Subject: [PATCH 1/4] Hardcoded libtool |
@@ -12,10 +12,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
12 | 1 file changed, 3 insertions(+), 3 deletions(-) | 12 | 1 file changed, 3 insertions(+), 3 deletions(-) |
13 | 13 | ||
14 | diff --git a/configure.ac b/configure.ac | 14 | diff --git a/configure.ac b/configure.ac |
15 | index 23d3077..b6931d6 100644 | 15 | index 6628e21..f43ac09 100644 |
16 | --- a/configure.ac | 16 | --- a/configure.ac |
17 | +++ b/configure.ac | 17 | +++ b/configure.ac |
18 | @@ -610,7 +610,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc files]) | 18 | @@ -617,7 +617,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc files]) |
19 | case $enable_explicit_deps in | 19 | case $enable_explicit_deps in |
20 | auto) | 20 | auto) |
21 | export SED | 21 | export SED |
@@ -24,7 +24,7 @@ index 23d3077..b6931d6 100644 | |||
24 | if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then | 24 | if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then |
25 | enable_explicit_deps=yes | 25 | enable_explicit_deps=yes |
26 | else | 26 | else |
27 | @@ -876,7 +876,7 @@ else | 27 | @@ -895,7 +895,7 @@ else |
28 | dnl Now we check to see if our libtool supports shared lib deps | 28 | dnl Now we check to see if our libtool supports shared lib deps |
29 | dnl (in a rather ugly way even) | 29 | dnl (in a rather ugly way even) |
30 | if $dynworks; then | 30 | if $dynworks; then |
@@ -33,7 +33,7 @@ index 23d3077..b6931d6 100644 | |||
33 | module_deplibs_check=`$module_libtool_config | \ | 33 | module_deplibs_check=`$module_libtool_config | \ |
34 | grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ | 34 | grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ |
35 | sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` | 35 | sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` |
36 | @@ -1630,7 +1630,7 @@ AC_SUBST(GTK_PRINT_BACKENDS) | 36 | @@ -1649,7 +1649,7 @@ AC_SUBST(GTK_PRINT_BACKENDS) |
37 | # We are using gmodule-no-export now, but I'm leaving the stripping | 37 | # We are using gmodule-no-export now, but I'm leaving the stripping |
38 | # code in place for now, since pango and atk still require gmodule. | 38 | # code in place for now, since pango and atk still require gmodule. |
39 | export SED | 39 | export SED |
@@ -43,5 +43,5 @@ index 23d3077..b6931d6 100644 | |||
43 | GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` | 43 | GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` |
44 | GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` | 44 | GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` |
45 | -- | 45 | -- |
46 | 2.1.4 | 46 | 2.12.0 |
47 | 47 | ||