diff options
author | Ross Burton <ross.burton@intel.com> | 2014-12-19 19:52:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 08:14:25 +0000 |
commit | 9e64b6d96c0434d91150c3b4829046e6d70b0e00 (patch) | |
tree | 7f47b0697fcff0c2244841308df33f7d6ce73159 /meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch | |
parent | db8bf52277c1596e0703cee21ff52cad04365eb7 (diff) | |
download | poky-9e64b6d96c0434d91150c3b4829046e6d70b0e00.tar.gz |
gtk+: upgrade to 2.24.25
Remove patches that are no longer needed:
* GtkButton-do-no-prelight: merged upstream
* Duplicate-the-exec-string: upstream decided this behaviour is incorrect
* cellrenderer-cairo: Cairo isn't the performance bottleneck it once was, drop
* configure-nm: resolved upstrea
* configurefix.patch: not applied
* run-iconcache: not needed when building tarballs, and if gtk-update-icon-cache
is needed at build time (e.g. user is customising default icon theme) then
they can add a dependency on gtk-update-icon-cache-native.
Also remove mention of patches that have been commented out for a long time.
(From OE-Core rev: 9299b5d2e5f82cf0e3f66ca49dedbe2c8b18bb44)
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+-2.24.24/hardcoded_libtool.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch deleted file mode 100644 index 1ae728e70d..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Updated to apply to gtk+-2.24.15 | ||
4 | |||
5 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
6 | diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac | ||
7 | --- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200 | ||
8 | +++ gtk+-2.24.15/configure.ac 2013-02-12 21:33:30.689925967 +0200 | ||
9 | @@ -415,7 +415,7 @@ | ||
10 | case $enable_explicit_deps in | ||
11 | auto) | ||
12 | export SED | ||
13 | - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
14 | + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
15 | if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then | ||
16 | enable_explicit_deps=yes | ||
17 | else | ||
18 | @@ -774,7 +774,7 @@ | ||
19 | dnl Now we check to see if our libtool supports shared lib deps | ||
20 | dnl (in a rather ugly way even) | ||
21 | if $dynworks; then | ||
22 | - module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" | ||
23 | + module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" | ||
24 | module_deplibs_check=`$module_libtool_config | \ | ||
25 | grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ | ||
26 | sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` | ||
27 | @@ -1574,7 +1574,7 @@ | ||
28 | # We are using gmodule-no-export now, but I'm leaving the stripping | ||
29 | # code in place for now, since pango and atk still require gmodule. | ||
30 | export SED | ||
31 | -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
32 | +export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
33 | if test -n "$export_dynamic"; then | ||
34 | GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` | ||
35 | GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` | ||